diff --git a/.hgignore b/.hgignore index 530c92512..829f8812b 100644 --- a/.hgignore +++ b/.hgignore @@ -160,6 +160,7 @@ code/build/* code/build-2010/* build/* install/* +build_vc* code/nel/tools/build_gamedata/configuration/buildsite.py # Linux nel compile diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 4f0439dfd..34b33859b 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -2,7 +2,7 @@ # # NeL # Authors: Nevrax and the NeL Community -# Version: 0.9.0 +# Version: 0.9.1 # # Notes: # * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path @@ -48,7 +48,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(RyzomCore CXX C) SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MINOR 9) -SET(NL_VERSION_PATCH 0) +SET(NL_VERSION_PATCH 1) SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}") #----------------------------------------------------------------------------- @@ -131,6 +131,13 @@ IF(FINAL_VERSION) ADD_DEFINITIONS(-DFINAL_VERSION=1) ENDIF(FINAL_VERSION) +IF(WITH_SSE2) + ADD_DEFINITIONS(-DNL_HAS_SSE2) + IF(WITH_SSE3) + ADD_DEFINITIONS(-DNL_HAS_SSE3) + ENDIF(WITH_SSE3) +ENDIF(WITH_SSE2) + IF(WITH_QT) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL REQUIRED) ENDIF(WITH_QT) diff --git a/code/CMakeModules/Find3dsMaxSDK.cmake b/code/CMakeModules/Find3dsMaxSDK.cmake index ddec22f90..0510d3a6e 100644 --- a/code/CMakeModules/Find3dsMaxSDK.cmake +++ b/code/CMakeModules/Find3dsMaxSDK.cmake @@ -1,46 +1,52 @@ # - Find DirectInput # Find the DirectSound includes and libraries # +# MAXSDK_DIR - 3DSMAX SDK root directory # MAXSDK_INCLUDE_DIR - where to find baseinterface.h # MAXSDK_LIBRARIES - List of libraries when using 3DSMAX. # MAXSDK_FOUND - True if MAX SDK found. if(MAXSDK_INCLUDE_DIR) - # Already in cache, be silent - set(MAXSDK_FIND_QUIETLY TRUE) + # Already in cache, be silent + SET(MAXSDK_FIND_QUIETLY TRUE) endif(MAXSDK_INCLUDE_DIR) -find_path(MAXSDK_INCLUDE_DIR max.h +FIND_PATH(MAXSDK_DIR + "include/maxversion.h" + HINTS + "$ENV{MAXSDK_DIR}" PATHS - "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include" - "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/include" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/include" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include" -) - -find_path(MAXSDK_CS_INCLUDE_DIR bipexp.h - PATHS - "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include/CS" - "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include/CS" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/include/CS" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/include/CS" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include/CS" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include/CS" + "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk" + "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk" + "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk" + "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk" + "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk" + "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk" ) +FIND_PATH(MAXSDK_INCLUDE_DIR + max.h + HINTS + ${MAXSDK_DIR}/include +) + +FIND_PATH(MAXSDK_CS_INCLUDE_DIR bipexp.h + HINTS + ${MAXSDK_DIR}/include/CS +) + +IF(TARGET_X64) + SET(MAXSDK_LIBRARY_DIRS ${MAXSDK_DIR}/x64/lib) +ELSE(TARGET_X64) + SET(MAXSDK_LIBRARY_DIRS ${MAXSDK_DIR}/lib) +ENDIF(TARGET_X64) + MACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME) FIND_LIBRARY(${MYLIBRARY} - NAMES ${MYLIBRARYNAME} - PATHS - "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/lib" - "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/lib" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/lib" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/lib" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/lib" - "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/lib" - ) + NAMES ${MYLIBRARYNAME} + HINTS + ${MAXSDK_LIBRARY_DIRS} + ) ENDMACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME) FIND_3DS_LIBRARY(MAXSDK_CORE_LIBRARY core) diff --git a/code/CMakeModules/FindFMOD.cmake b/code/CMakeModules/FindFMOD.cmake index c9237f695..f85795142 100644 --- a/code/CMakeModules/FindFMOD.cmake +++ b/code/CMakeModules/FindFMOD.cmake @@ -23,8 +23,15 @@ FIND_PATH(FMOD_INCLUDE_DIR PATH_SUFFIXES fmod fmod3 ) +IF(TARGET_X64) + SET(FMOD_LIBRARY_NAMES fmod64 fmod) +ELSE(TARGET_X64) + SET(FMOD_LIBRARY_NAMES fmodvc fmod) +ENDIF(TARGET_X64) + FIND_LIBRARY(FMOD_LIBRARY - NAMES fmod fmodvc libfmod fmod64 + NAMES + ${FMOD_LIBRARY_NAMES} PATHS $ENV{FMOD_DIR}/lib /usr/local/lib diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index b194b5ff9..dd8dee49f 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -118,13 +118,13 @@ MACRO(NL_DEFAULT_PROPS name label) ENDIF(NL_LIB_PREFIX) ENDIF(${type} STREQUAL SHARED_LIBRARY) - IF(${type} STREQUAL EXECUTABLE AND WIN32) + IF(${type} STREQUAL EXECUTABLE AND WIN32 AND NOT MINGW) SET_TARGET_PROPERTIES(${name} PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} COMPILE_FLAGS "/GA" LINK_FLAGS "/VERSION:${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}") - ENDIF(${type} STREQUAL EXECUTABLE AND WIN32) + ENDIF(${type} STREQUAL EXECUTABLE AND WIN32 AND NOT MINGW) ENDMACRO(NL_DEFAULT_PROPS) ### @@ -324,6 +324,13 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) OPTION(WITH_LIBOVR "With LibOVR support" OFF) OPTION(WITH_LIBVR "With LibVR support" OFF) OPTION(WITH_PERFHUD "With NVIDIA PerfHUD support" OFF) + + OPTION(WITH_SSE2 "With SSE2" ON ) + OPTION(WITH_SSE3 "With SSE3" ON ) + + IF(NOT MSVC) + OPTION(WITH_GCC_FPMATH_BOTH "With GCC -mfpmath=both" OFF) + ENDIF(NOT MSVC) ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS) @@ -614,6 +621,14 @@ MACRO(NL_SETUP_BUILD) ENDIF(CLANG) ENDIF(WIN32) + IF(WITH_SSE3) + ADD_PLATFORM_FLAGS("-msse3") + ENDIF(WITH_SSE3) + + IF(WITH_GCC_FPMATH_BOTH) + ADD_PLATFORM_FLAGS("-mfpmath=both") + ENDIF(WITH_GCC_FPMATH_BOTH) + IF(APPLE) IF(NOT XCODE) IF(CMAKE_OSX_ARCHITECTURES) @@ -875,9 +890,9 @@ MACRO(NL_SETUP_BUILD) ENDIF(APPLE) # Fix "relocation R_X86_64_32 against.." error on x64 platforms - IF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS) + IF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS AND NOT MINGW) ADD_PLATFORM_FLAGS("-fPIC") - ENDIF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS) + ENDIF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS AND NOT MINGW) SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -ftemplate-depth-48") diff --git a/code/nel/include/nel/3d/computed_string.h b/code/nel/include/nel/3d/computed_string.h index fcb758da4..517200383 100644 --- a/code/nel/include/nel/3d/computed_string.h +++ b/code/nel/include/nel/3d/computed_string.h @@ -290,7 +290,7 @@ public: * \param matrix transformation matrix * \param hotspot position of string origine */ - void render3D (IDriver& driver,CMatrix matrix,THotSpot hotspot = MiddleMiddle); + void render3D (IDriver& driver, const CMatrix &matrix, THotSpot hotspot = MiddleMiddle); }; diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h index 3eb5823ca..022246838 100644 --- a/code/nel/include/nel/3d/driver.h +++ b/code/nel/include/nel/3d/driver.h @@ -182,7 +182,7 @@ public: IDriver(); virtual ~IDriver(); - virtual bool init(uint windowIcon = 0, emptyProc exitFunc = 0) = 0; + virtual bool init(uintptr_t windowIcon = 0, emptyProc exitFunc = 0) = 0; /// Deriver should calls IDriver::release() first, to destroy all driver components (textures, shaders, VBuffers). virtual bool release(); @@ -1341,7 +1341,7 @@ public: * NB: if implementation does not support it, 0 may be returned. OpenGL ones return the Texture ID. * NB: unlike isTextureExist(), this method is not thread safe. */ - virtual uint getTextureHandle(const ITexture&tex) = 0; + virtual uintptr_t getTextureHandle(const ITexture&tex) = 0; // see if the Multiply-Add Tex Env operator is supported (see CMaterial::Mad) virtual bool supportMADOperator() const = 0; diff --git a/code/nel/include/nel/3d/driver_user.h b/code/nel/include/nel/3d/driver_user.h index 30ea98c65..ff9ba8973 100644 --- a/code/nel/include/nel/3d/driver_user.h +++ b/code/nel/include/nel/3d/driver_user.h @@ -123,7 +123,7 @@ public: /// \name Object // @{ - CDriverUser (uint windowIcon, UDriver::TDriver driver, emptyProc exitFunc = 0); + CDriverUser (uintptr_t windowIcon, UDriver::TDriver driver, emptyProc exitFunc = 0); virtual ~CDriverUser(); // @} diff --git a/code/nel/include/nel/3d/dru.h b/code/nel/include/nel/3d/dru.h index 115f86432..fda543ecd 100644 --- a/code/nel/include/nel/3d/dru.h +++ b/code/nel/include/nel/3d/dru.h @@ -24,8 +24,11 @@ #include "nel/misc/geom_ext.h" #include "nel/misc/line.h" - -#ifdef NL_OS_WINDOWS +#if defined (NL_COMP_MINGW) +# define NL3D_GL_DLL_NAME "libnel_drv_opengl_win" +# define NL3D_GLES_DLL_NAME "libnel_drv_opengles_win" +# define NL3D_D3D_DLL_NAME "libnel_drv_direct3d_win" +#elif defined (NL_OS_WINDOWS) # define NL3D_GL_DLL_NAME "nel_drv_opengl_win" # define NL3D_GLES_DLL_NAME "nel_drv_opengles_win" # define NL3D_D3D_DLL_NAME "nel_drv_direct3d_win" diff --git a/code/nel/include/nel/3d/matrix_3x4.h b/code/nel/include/nel/3d/matrix_3x4.h index d7ed660fc..45901c20e 100644 --- a/code/nel/include/nel/3d/matrix_3x4.h +++ b/code/nel/include/nel/3d/matrix_3x4.h @@ -108,281 +108,6 @@ public: }; -// *************************************************************************** -// *************************************************************************** -// SSE Matrix -// *************************************************************************** -// *************************************************************************** - - -// *************************************************************************** -#if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) - - -/** For fast vector/point multiplication. Special usage for Skinning. - * NB: SSE is no more used (no speed gain, some memory problem), but keep it for possible future usage. - */ -class CMatrix3x4SSE -{ -public: - // Order them in memory column first, for SSE column multiplication. - float a11, a21, a31, a41; - float a12, a22, a32, a42; - float a13, a23, a33, a43; - float a14, a24, a34, a44; - - // Copy from a matrix. - void set(const CMatrix &mat) - { - const float *m =mat.get(); - a11= m[0]; a12= m[4]; a13= m[8] ; a14= m[12]; - a21= m[1]; a22= m[5]; a23= m[9] ; a24= m[13]; - a31= m[2]; a32= m[6]; a33= m[10]; a34= m[14]; - // not used. - a41= 0 ; a42= 0 ; a43= 0 ; a44= 1; - } - - - // mulSetvector. NB: in should be different as v!! (else don't work). - void mulSetVector(const CVector &vin, CVector &vout) - { - __asm - { - mov eax, vin - mov ebx, this - mov edi, vout - // Load in vector in op[0] - movss xmm0, [eax]vin.x - movss xmm1, [eax]vin.y - movss xmm2, [eax]vin.z - // Expand op[0] to op[1], op[2], op[3] - shufps xmm0, xmm0, 0 - shufps xmm1, xmm1, 0 - shufps xmm2, xmm2, 0 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - - // write the result. - movss [edi]vout.x, xmm0 - shufps xmm0, xmm0, 33 - movss [edi]vout.y, xmm0 - movhlps xmm0, xmm0 - movss [edi]vout.z, xmm0 - } - } - // mulSetpoint. NB: in should be different as v!! (else don't work). - void mulSetPoint(const CVector &vin, CVector &vout) - { - __asm - { - mov eax, vin - mov ebx, this - mov edi, vout - // Load in vector in op[0] - movss xmm0, [eax]vin.x - movss xmm1, [eax]vin.y - movss xmm2, [eax]vin.z - // Expand op[0] to op[1], op[2], op[3] - shufps xmm0, xmm0, 0 - shufps xmm1, xmm1, 0 - shufps xmm2, xmm2, 0 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - // Add Matrix translate column vector - addps xmm0, [ebx]this.a14 - - // write the result. - movss [edi]vout.x, xmm0 - shufps xmm0, xmm0, 33 - movss [edi]vout.y, xmm0 - movhlps xmm0, xmm0 - movss [edi]vout.z, xmm0 - } - } - - - // mulSetvector. NB: vin should be different as v!! (else don't work). - void mulSetVector(const CVector &vin, float scale, CVector &vout) - { - __asm - { - mov eax, vin - mov ebx, this - mov edi, vout - // Load in vector in op[0] - movss xmm0, [eax]vin.x - movss xmm1, [eax]vin.y - movss xmm2, [eax]vin.z - // Load scale in op[0] - movss xmm3, scale - // Expand op[0] to op[1], op[2], op[3] - shufps xmm0, xmm0, 0 - shufps xmm1, xmm1, 0 - shufps xmm2, xmm2, 0 - shufps xmm3, xmm3, 0 - // Store vertex column in other regs. - movaps xmm5, xmm0 - movaps xmm6, xmm1 - movaps xmm7, xmm2 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - - // mul final result with scale - mulps xmm0, xmm3 - - // store it in xmm4 for future use. - movaps xmm4, xmm0 - } - } - // mulSetpoint. NB: vin should be different as v!! (else don't work). - void mulSetPoint(const CVector &vin, float scale, CVector &vout) - { - __asm - { - mov eax, vin - mov ebx, this - mov edi, vout - // Load in vector in op[0] - movss xmm0, [eax]vin.x - movss xmm1, [eax]vin.y - movss xmm2, [eax]vin.z - // Load scale in op[0] - movss xmm3, scale - // Expand op[0] to op[1], op[2], op[3] - shufps xmm0, xmm0, 0 - shufps xmm1, xmm1, 0 - shufps xmm2, xmm2, 0 - shufps xmm3, xmm3, 0 - // Store vertex column in other regs. - movaps xmm5, xmm0 - movaps xmm6, xmm1 - movaps xmm7, xmm2 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - // Add Matrix translate column vector - addps xmm0, [ebx]this.a14 - - // mul final result with scale - mulps xmm0, xmm3 - - // store it in xmm4 for future use. - movaps xmm4, xmm0 - } - } - - - // mulAddvector. NB: vin should be different as v!! (else don't work). - void mulAddVector(const CVector &/* vin */, float scale, CVector &vout) - { - __asm - { - mov ebx, this - mov edi, vout - // Load vin vector loaded in mulSetVector - movaps xmm0, xmm5 - movaps xmm1, xmm6 - movaps xmm2, xmm7 - // Load scale in op[0] - movss xmm3, scale - // Expand op[0] to op[1], op[2], op[3] - shufps xmm3, xmm3, 0 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - - // mul final result with scale - mulps xmm0, xmm3 - - // Add result, with prec sum. - addps xmm0, xmm4 - - // store it in xmm4 for future use. - movaps xmm4, xmm0 - - // write the result. - movss [edi]vout.x, xmm0 - shufps xmm0, xmm0, 33 - movss [edi]vout.y, xmm0 - movhlps xmm0, xmm0 - movss [edi]vout.z, xmm0 - } - } - // mulAddpoint. NB: vin should be different as v!! (else don't work). - void mulAddPoint(const CVector &/* vin */, float scale, CVector &vout) - { - __asm - { - mov ebx, this - mov edi, vout - // Load vin vector loaded in mulSetPoint - movaps xmm0, xmm5 - movaps xmm1, xmm6 - movaps xmm2, xmm7 - // Load scale in op[0] - movss xmm3, scale - // Expand op[0] to op[1], op[2], op[3] - shufps xmm3, xmm3, 0 - // Mul each vector with 3 Matrix column - mulps xmm0, [ebx]this.a11 - mulps xmm1, [ebx]this.a12 - mulps xmm2, [ebx]this.a13 - // Add each column vector. - addps xmm0, xmm1 - addps xmm0, xmm2 - // Add Matrix translate column vector - addps xmm0, [ebx]this.a14 - - // mul final result with scale - mulps xmm0, xmm3 - - // Add result, with prec sum. - addps xmm0, xmm4 - - // store it in xmm4 for future use. - movaps xmm4, xmm0 - - // write the result. - movss [edi]vout.x, xmm0 - shufps xmm0, xmm0, 33 - movss [edi]vout.y, xmm0 - movhlps xmm0, xmm0 - movss [edi]vout.z, xmm0 - } - } - -}; - -#else // NL_OS_WINDOWS -/// dummy CMatrix3x4SSE for non windows platform -class CMatrix3x4SSE : public CMatrix3x4 { }; -#endif - - - } // NL3D diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index c1139d070..68f67ae6d 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -1178,9 +1178,6 @@ private: CPSMultiMap::M TLBMap; TLBMap _LBMap; - float _AutoLODStartDistPercent; - uint8 _AutoLODDegradationExponent; - CPSAttribMaker *_ColorAttenuationScheme; NLMISC::CRGBA _GlobalColor; NLMISC::CRGBA _GlobalColorLighted; @@ -1206,6 +1203,11 @@ private: bool _HiddenAtCurrentFrame : 1; bool _HiddenAtPreviousFrame : 1; + // The two following members have been moved after the bitfield to workaround a MSVC 64-bit compiler bug (fixed in VS2013) + // For more info, see: http://connect.microsoft.com/VisualStudio/feedback/details/777184/c-compiler-bug-vtable-pointer-put-at-wrong-offset-in-64-bit-mode + float _AutoLODStartDistPercent; + uint8 _AutoLODDegradationExponent; + static bool _SerialIdentifiers; static bool _ForceDisplayBBox; diff --git a/code/nel/include/nel/3d/skeleton_model.h b/code/nel/include/nel/3d/skeleton_model.h index ed4f8aadc..dccafd1f1 100644 --- a/code/nel/include/nel/3d/skeleton_model.h +++ b/code/nel/include/nel/3d/skeleton_model.h @@ -54,7 +54,7 @@ public: // The index of the skin rdrPass uint16 RdrPassIndex; // The texture id of the specular texture. This is the sort Key. - uint32 SpecId; + uintptr_t SpecId; bool operator<(const CSkinSpecularRdrPass &o) const { diff --git a/code/nel/include/nel/3d/u_driver.h b/code/nel/include/nel/3d/u_driver.h index 2e74ae3fe..67e0c30fd 100644 --- a/code/nel/include/nel/3d/u_driver.h +++ b/code/nel/include/nel/3d/u_driver.h @@ -845,8 +845,8 @@ public: /** * This is the static function which build a UDriver, the root for all 3D functions. */ - static UDriver *createDriver(uint windowIcon = 0, bool direct3d = false, emptyProc exitFunc = 0); - static UDriver *createDriver(uint windowIcon, TDriver driver, emptyProc exitFunc = 0); + static UDriver *createDriver(uintptr_t windowIcon = 0, bool direct3d = false, emptyProc exitFunc = 0); + static UDriver *createDriver(uintptr_t windowIcon, TDriver driver, emptyProc exitFunc = 0); /** * Purge static memory diff --git a/code/nel/include/nel/gui/view_pointer_base.h b/code/nel/include/nel/gui/view_pointer_base.h index f18f29239..e772d934f 100644 --- a/code/nel/include/nel/gui/view_pointer_base.h +++ b/code/nel/include/nel/gui/view_pointer_base.h @@ -53,12 +53,14 @@ namespace NLGUI bool show() const {return _PointerVisible;} void draw(){} - + /// set button state void setButtonState(NLMISC::TMouseButton state) { _Buttons = state; } /// get buttons state NLMISC::TMouseButton getButtonState() const { return _Buttons; } + static const sint32 InvalidCoord = 0x80000000; + protected: // (x,y) is from the TopLeft corner of the window sint32 _PointerX; // Current pointer position (raw, before snapping) diff --git a/code/nel/include/nel/misc/di_event_emitter.h b/code/nel/include/nel/misc/di_event_emitter.h index a2592e565..41c7bbf47 100644 --- a/code/nel/include/nel/misc/di_event_emitter.h +++ b/code/nel/include/nel/misc/di_event_emitter.h @@ -34,7 +34,9 @@ #include "events.h" #include "rect.h" #include "game_device.h" -#define NOMINMAX +#ifndef NL_COMP_MINGW +# define NOMINMAX +#endif #include #include @@ -101,7 +103,7 @@ public: * \param we A windows eventsemitter. Can be NULL. Needed if you want to mix WIN32 events and Direct Input events * (for example, a Direct Input Mouse and a Win32 Keyboard) */ - static CDIEventEmitter *create(HINSTANCE hinst, HWND hwnd, CWinEventEmitter *we); + static CDIEventEmitter *create(HINSTANCE hinst, HWND hwnd, CWinEventEmitter *we) throw(EDirectInput); ~CDIEventEmitter(); public: diff --git a/code/nel/include/nel/misc/fixed_size_allocator.h b/code/nel/include/nel/misc/fixed_size_allocator.h index 9eb1d8a10..079c54bc0 100644 --- a/code/nel/include/nel/misc/fixed_size_allocator.h +++ b/code/nel/include/nel/misc/fixed_size_allocator.h @@ -53,7 +53,8 @@ public: uint getNumAllocatedBlocks() const { return _NumAlloc; } private: class CChunk; - class CNode + + class NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT) CNode { public: CChunk *Chunk; // the Chunk this node belongs to. diff --git a/code/nel/include/nel/misc/hierarchical_timer.h b/code/nel/include/nel/misc/hierarchical_timer.h index 10f9b461e..1c1818c69 100644 --- a/code/nel/include/nel/misc/hierarchical_timer.h +++ b/code/nel/include/nel/misc/hierarchical_timer.h @@ -74,7 +74,7 @@ namespace NLMISC { -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC // Visual C++ warning : ebp maybe modified # pragma warning(disable:4731) #endif diff --git a/code/nel/include/nel/misc/inter_window_msg_queue.h b/code/nel/include/nel/misc/inter_window_msg_queue.h index f65767bce..02867f8b4 100644 --- a/code/nel/include/nel/misc/inter_window_msg_queue.h +++ b/code/nel/include/nel/misc/inter_window_msg_queue.h @@ -220,7 +220,7 @@ private: static TOldWinProcMap _OldWinProcMap; - bool initInternal(HINSTANCE hInstance, HWND ownerWindow, uint32 localId, uint32 foreignId = NULL); + bool initInternal(HINSTANCE hInstance, HWND ownerWindow, uint32 localId, uint32 foreignId = 0); private: static LRESULT CALLBACK listenerProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/code/nel/include/nel/misc/matrix.h b/code/nel/include/nel/misc/matrix.h index 700eb4a14..649d53324 100644 --- a/code/nel/include/nel/misc/matrix.h +++ b/code/nel/include/nel/misc/matrix.h @@ -53,7 +53,8 @@ class CPlane; * \author Nevrax France * \date 2000 */ -class CMatrix + +class NL_ALIGN_SSE2 CMatrix { public: /// Rotation Order. diff --git a/code/nel/include/nel/misc/o_xml.h b/code/nel/include/nel/misc/o_xml.h index 5933b7ebc..a532f0342 100644 --- a/code/nel/include/nel/misc/o_xml.h +++ b/code/nel/include/nel/misc/o_xml.h @@ -178,6 +178,9 @@ private: // Error message std::string _ErrorString; + + // System dependant structure for locale + void* _Locale; }; diff --git a/code/nel/include/nel/misc/object_vector.h b/code/nel/include/nel/misc/object_vector.h index a544a62b5..ea9be81e2 100644 --- a/code/nel/include/nel/misc/object_vector.h +++ b/code/nel/include/nel/misc/object_vector.h @@ -29,6 +29,12 @@ # endif // NLMISC_HEAP_ALLOCATION_NDEBUG #endif // NL_USE_DEFAULT_MEMORY_MANAGER +#ifndef NL_OV_USE_NEW_ALLOCATOR +# ifdef NL_HAS_SSE2 +# define NL_OV_USE_NEW_ALLOCATOR +# endif // NL_HAS_SSE2 +#endif // NL_OV_USE_NEW_ALLOCATOR + namespace NLMISC { diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h index 5c3b80475..d27fc4b48 100644 --- a/code/nel/include/nel/misc/types_nl.h +++ b/code/nel/include/nel/misc/types_nl.h @@ -86,6 +86,10 @@ # define NL_COMP_VC_VERSION 60 # define NL_COMP_NEED_PARAM_ON_METHOD # endif +# elif defined(__MINGW32__) +# define NL_COMP_MINGW +# define NL_COMP_GCC +# define NL_NO_ASM # endif # if defined(_HAS_TR1) && (_HAS_TR1 + 0) // VC9 TR1 feature pack or later # define NL_ISO_STDTR1_AVAILABLE @@ -93,9 +97,13 @@ # define NL_ISO_STDTR1_NAMESPACE std::tr1 # endif # ifdef _DEBUG -# define NL_DEBUG +# ifndef NL_DEBUG +# define NL_DEBUG +# endif # elif defined (NDEBUG) -# define NL_RELEASE +# ifndef NL_RELEASE +# define NL_RELEASE +# endif # else # error "Don't know the compilation mode" # endif @@ -109,7 +117,9 @@ # define _WIN32_WINNT 0x0600 // force VISTA minimal version in 64 bits # endif // define NOMINMAX to be sure that windows includes will not define min max macros, but instead, use the stl template -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif #else # ifdef __APPLE__ # define NL_OS_MAC @@ -142,7 +152,7 @@ // // NL_ISO_TEMPLATE_SPEC can be used in front of an instanciated class-template member data definition, // because sometimes MSVC++ 6 produces an error C2908 with a definition with template <>. -#if defined(NL_OS_WINDOWS) || (defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3))) +#if defined(NL_COMP_VC) || (defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3))) # define NL_ISO_SYNTAX 0 # define NL_ISO_TEMPLATE_SPEC #else @@ -328,6 +338,57 @@ typedef unsigned int uint; // at least 32bits (depend of processor) #endif // NL_OS_UNIX + +// #ifdef NL_ENABLE_FORCE_INLINE +# ifdef NL_COMP_VC +# define NL_FORCE_INLINE __forceinline +# elif defined(NL_COMP_GCC) +# define NL_FORCE_INLINE inline __attribute__((always_inline)) +# else +# define NL_FORCE_INLINE inline +# endif +// #else +// # define NL_FORCE_INLINE inline +// #endif + + +#ifdef NL_COMP_VC +#define NL_ALIGN(nb) __declspec(align(nb)) +#else +#define NL_ALIGN(nb) __attribute__((aligned(nb))) +#endif + +#ifdef NL_OS_WINDOWS +#include +#include +#include +inline void *aligned_malloc(size_t size, size_t alignment) { return _aligned_malloc(size, alignment); } +inline void aligned_free(void *ptr) { _aligned_free(ptr); } +#else +#include +inline void *aligned_malloc(size_t size, size_t alignment) { return memalign(alignment, size); } +inline void aligned_free(void *ptr) { free(ptr); } +#endif /* NL_COMP_ */ + + +#ifdef NL_HAS_SSE2 + +#define NL_DEFAULT_MEMORY_ALIGNMENT 16 +#define NL_ALIGN_SSE2 NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT) + +extern void *operator new(size_t size) throw(std::bad_alloc); +extern void *operator new[](size_t size) throw(std::bad_alloc); +extern void operator delete(void *p) throw(); +extern void operator delete[](void *p) throw(); + +#else /* NL_HAS_SSE2 */ + +#define NL_DEFAULT_MEMORY_ALIGNMENT 4 +#define NL_ALIGN_SSE2 + +#endif /* NL_HAS_SSE2 */ + + // CHashMap, CHashSet and CHashMultiMap definitions #if defined(_STLPORT_VERSION) // STLport detected # include @@ -388,8 +449,8 @@ typedef uint16 ucchar; // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234) -#ifdef NL_OS_WINDOWS -# if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 80) +#ifdef NL_COMP_VC +# if (NL_COMP_VC_VERSION >= 80) # define INT64_CONSTANT(c) (c##LL) # define SINT64_CONSTANT(c) (c##LL) # define UINT64_CONSTANT(c) (c##LL) diff --git a/code/nel/include/nel/misc/win_displayer.h b/code/nel/include/nel/misc/win_displayer.h index 0bd16fa40..934a6e990 100644 --- a/code/nel/include/nel/misc/win_displayer.h +++ b/code/nel/include/nel/misc/win_displayer.h @@ -22,7 +22,9 @@ #ifdef NL_OS_WINDOWS #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX +#ifndef NL_COMP_MINGW +# define NOMINMAX +#endif #include #include "displayer.h" diff --git a/code/nel/include/nel/net/buf_sock.h b/code/nel/include/nel/net/buf_sock.h index 947f6bff6..5a2f3c074 100644 --- a/code/nel/include/nel/net/buf_sock.h +++ b/code/nel/include/nel/net/buf_sock.h @@ -50,10 +50,10 @@ public: virtual ~CBufSock(); /// Sets the application identifier - void setAppId( uint64 id ) { _AppId = id; } + void setAppId( uintptr_t id ) { _AppId = id; } /// Returns the application identifier - uint64 appId() const { return _AppId; } + uintptr_t appId() const { return _AppId; } /// Returns a string with the characteristics of the object std::string asString() const; @@ -256,7 +256,7 @@ private: NLMISC::CObjectVector _ReadyToSendBuffer; TBlockSize _RTSBIndex; - uint64 _AppId; + uintptr_t _AppId; // Connected state (from the user's point of view, i.e. changed when the connection/disconnection event is at the front of the receive queue) bool _ConnectedState; diff --git a/code/nel/samples/3d/cegui/NeLDriver.h b/code/nel/samples/3d/cegui/NeLDriver.h index 7f73d0cd0..1dd867536 100644 --- a/code/nel/samples/3d/cegui/NeLDriver.h +++ b/code/nel/samples/3d/cegui/NeLDriver.h @@ -34,8 +34,8 @@ extern uint16 gScreenHeight; class NeLDriver { public: - NeLDriver(NL3D::UDriver *driver) { m_Driver=driver; } - virtual ~NeLDriver() { ; } + NeLDriver(NL3D::UDriver *driver):m_Driver(driver), m_TextContext(NULL), m_Scene(NULL) { } + virtual ~NeLDriver() { } void init(); void update(); diff --git a/code/nel/samples/3d/cluster_viewer/main.cpp b/code/nel/samples/3d/cluster_viewer/main.cpp index e48ad3528..d7956adbe 100644 --- a/code/nel/samples/3d/cluster_viewer/main.cpp +++ b/code/nel/samples/3d/cluster_viewer/main.cpp @@ -38,7 +38,9 @@ #include "nel/3d/event_mouse_listener.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS @@ -360,7 +362,7 @@ int main() } ++itAcc; } - if ((vCluster.size() == 0) && (DispCS[0].pIG == pCurIG)) + if (vCluster.empty() && (DispCS[0].pIG == pCurIG)) { vCluster.push_back (pClipTrav->RootCluster); } diff --git a/code/nel/samples/3d/font/main.cpp b/code/nel/samples/3d/font/main.cpp index df6cebdde..b4b5cc3c9 100644 --- a/code/nel/samples/3d/font/main.cpp +++ b/code/nel/samples/3d/font/main.cpp @@ -30,7 +30,9 @@ #include "nel/3d/driver_user.h" #ifdef NL_OS_WINDOWS - #define NOMINMAX + #ifndef NL_COMP_MINGW + #define NOMINMAX + #endif #include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/3d/nel_qt/configuration.cpp b/code/nel/samples/3d/nel_qt/configuration.cpp index f35502a67..9bbe62736 100644 --- a/code/nel/samples/3d/nel_qt/configuration.cpp +++ b/code/nel/samples/3d/nel_qt/configuration.cpp @@ -47,7 +47,7 @@ CConfiguration::~CConfiguration() void CConfiguration::init() { // verify data - nlassert(!m_ConfigCallbacks.size()); + nlassert(m_ConfigCallbacks.empty()); // load config m_ConfigFile.load(NLQT_CONFIG_FILE); diff --git a/code/nel/samples/3d/shape_viewer/main.cpp b/code/nel/samples/3d/shape_viewer/main.cpp index 6127b7207..d1bd4825f 100644 --- a/code/nel/samples/3d/shape_viewer/main.cpp +++ b/code/nel/samples/3d/shape_viewer/main.cpp @@ -29,7 +29,9 @@ #include #ifdef NL_OS_WINDOWS - #define NOMINMAX + #ifndef NL_COMP_MINGW + #define NOMINMAX + #endif #include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/chat/kbhit.cpp b/code/nel/samples/net/chat/kbhit.cpp index b463d4566..177fd1d29 100644 --- a/code/nel/samples/net/chat/kbhit.cpp +++ b/code/nel/samples/net/chat/kbhit.cpp @@ -14,7 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifdef __GNUC__ +#include "nel/misc/types_nl.h" + +#ifndef NL_OS_WINDOWS #include "kbhit.h" #include #include // for read() diff --git a/code/nel/samples/net/chat/server.cpp b/code/nel/samples/net/chat/server.cpp index c3976d857..9b85b65e5 100644 --- a/code/nel/samples/net/chat/server.cpp +++ b/code/nel/samples/net/chat/server.cpp @@ -24,7 +24,9 @@ #include "nel/net/callback_server.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/class_transport/ai_service.cpp b/code/nel/samples/net/class_transport/ai_service.cpp index 9be3a7080..371c8ff1b 100644 --- a/code/nel/samples/net/class_transport/ai_service.cpp +++ b/code/nel/samples/net/class_transport/ai_service.cpp @@ -37,7 +37,9 @@ #include "nel/net/transport_class.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/class_transport/gd_service.cpp b/code/nel/samples/net/class_transport/gd_service.cpp index 0df811488..7d6eff3e2 100644 --- a/code/nel/samples/net/class_transport/gd_service.cpp +++ b/code/nel/samples/net/class_transport/gd_service.cpp @@ -37,7 +37,9 @@ #include "nel/net/transport_class.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/login_system/frontend_service.cpp b/code/nel/samples/net/login_system/frontend_service.cpp index 18f525076..351282a8a 100644 --- a/code/nel/samples/net/login_system/frontend_service.cpp +++ b/code/nel/samples/net/login_system/frontend_service.cpp @@ -34,7 +34,9 @@ #include "nel/net/login_server.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/udp/bench_service.cpp b/code/nel/samples/net/udp/bench_service.cpp index d7da69516..981a0dd0a 100644 --- a/code/nel/samples/net/udp/bench_service.cpp +++ b/code/nel/samples/net/udp/bench_service.cpp @@ -43,7 +43,9 @@ #include "receive_task.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/samples/net/udp/receive_task.cpp b/code/nel/samples/net/udp/receive_task.cpp index 5e50869d3..4ca68fd4e 100644 --- a/code/nel/samples/net/udp/receive_task.cpp +++ b/code/nel/samples/net/udp/receive_task.cpp @@ -18,7 +18,9 @@ #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined NL_OS_UNIX diff --git a/code/nel/src/3d/computed_string.cpp b/code/nel/src/3d/computed_string.cpp index a57191cc0..1a9fefba5 100644 --- a/code/nel/src/3d/computed_string.cpp +++ b/code/nel/src/3d/computed_string.cpp @@ -143,11 +143,13 @@ void CComputedString::render2D (IDriver& driver, /*------------------------------------------------------------------*\ render3D() \*------------------------------------------------------------------*/ -void CComputedString::render3D (IDriver& driver,CMatrix matrix,THotSpot hotspot) +void CComputedString::render3D (IDriver& driver, const CMatrix &matrixp, THotSpot hotspot) { if (Vertices.getNumVertices() == 0) return; + CMatrix matrix = matrixp; + // get window size uint32 wndWidth, wndHeight; driver.getWindowSize(wndWidth, wndHeight); diff --git a/code/nel/src/3d/deform_2d.cpp b/code/nel/src/3d/deform_2d.cpp index 988d43ff9..7a4ffb507 100644 --- a/code/nel/src/3d/deform_2d.cpp +++ b/code/nel/src/3d/deform_2d.cpp @@ -103,7 +103,6 @@ void CDeform2d::doDeform(const TPoint2DVect &surf, IDriver *drv, IPerturbUV *uvp static CVertexBuffer vb; vb.setName("CDeform2d"); vb.setVertexFormat(CVertexBuffer::PositionFlag | CVertexBuffer::TexCoord0Flag); - vb.setPreferredMemory(CVertexBuffer::RAMVolatile, false); diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt index ede76f06c..ccdb8cb10 100644 --- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt +++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt @@ -10,7 +10,7 @@ NL_DEFAULT_PROPS(nel_drv_direct3d_win "NeL, Driver, Video: Direct3D") NL_ADD_RUNTIME_FLAGS(nel_drv_direct3d_win) NL_ADD_LIB_SUFFIX(nel_drv_direct3d_win) -ADD_DEFINITIONS(/Ddriver_direct3d_EXPORTS) +ADD_DEFINITIONS(-DRIVER_DIRECT3D_EXPORTS) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_direct3d_win ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.h ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.cpp) diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp index 864406205..2316119a2 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp @@ -110,6 +110,10 @@ IDriver* createD3DDriverInstance () #else +#ifdef NL_COMP_MINGW +extern "C" +{ +#endif __declspec(dllexport) IDriver* NL3D_createIDriverInstance () { return new CDriverD3D; @@ -119,7 +123,9 @@ __declspec(dllexport) uint32 NL3D_interfaceVersion () { return IDriver::InterfaceVersion; } - +#ifdef NL_COMP_MINGW +} +#endif #endif /*static*/ bool CDriverD3D::_CacheTest[CacheTest_Count] = @@ -379,7 +385,7 @@ void CDriverD3D::resetRenderVariables() } for (i=0; iCreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_PUREDEVICE, ¶meters, &_DeviceInterface); if (result != D3D_OK) diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.def b/code/nel/src/3d/driver/direct3d/driver_direct3d.def index 2e32d9601..7e6b29b2e 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.def +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.def @@ -1,2 +1,4 @@ -EXPORTS NL3D_createIDriverInstance -EXPORTS NL3D_interfaceVersion \ No newline at end of file +LIBRARY nel_drv_direct3d_win_r +EXPORTS + NL3D_createIDriverInstance + NL3D_interfaceVersion \ No newline at end of file diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/code/nel/src/3d/driver/direct3d/driver_direct3d.h index 1055e105c..254b21871 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.h +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.h @@ -839,7 +839,7 @@ public: // *************************************************************************** // Mode initialisation, requests - virtual bool init (uint windowIcon = 0, emptyProc exitFunc = 0); + virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0); virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay); virtual bool release(); virtual bool setMode(const GfxMode& mode); @@ -953,7 +953,7 @@ public: virtual void setSwapVBLInterval(uint interval); virtual uint getSwapVBLInterval(); virtual void swapTextureHandle(ITexture &tex0, ITexture &tex1); - virtual uint getTextureHandle(const ITexture&tex); + virtual uintptr_t getTextureHandle(const ITexture&tex); // Matrix, viewport and frustum virtual void setFrustum(float left, float right, float bottom, float top, float znear, float zfar, bool perspective = true); @@ -1893,7 +1893,7 @@ public: H_AUTO_D3D(CDriverD3D_setSamplerState); nlassert (_DeviceInterface); nlassert (samplerTexture); + return (uintptr_t)(d3dtext->Texture); } // *************************************************************************** diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp index 9882a5ce1..b798acb26 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_vertex.cpp @@ -59,7 +59,7 @@ CVBDrvInfosD3D::CVBDrvInfosD3D(CDriverD3D *drv, ItVBDrvInfoPtrList it, CVertexBu // *************************************************************************** -extern uint vertexCount=0; +uint vertexCount=0; CVBDrvInfosD3D::~CVBDrvInfosD3D() { @@ -173,7 +173,7 @@ uint8 *CVBDrvInfosD3D::lock (uint begin, uint end, bool readOnly) void *pbData; if (VertexBuffer->Lock ( begin, end-begin, &pbData, readOnly?D3DLOCK_READONLY:0) != D3D_OK) - return false; + return NULL; // Lock Profile? if(driver->_VBHardProfiling /*&& Hardware*/) diff --git a/code/nel/src/3d/driver/direct3d/stddirect3d.h b/code/nel/src/3d/driver/direct3d/stddirect3d.h index a243bf816..c7b6f7f3e 100644 --- a/code/nel/src/3d/driver/direct3d/stddirect3d.h +++ b/code/nel/src/3d/driver/direct3d/stddirect3d.h @@ -19,7 +19,9 @@ #ifdef NL_OS_WINDOWS # define WIN32_LEAN_AND_MEAN -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index aea202e8b..9e9e05918 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -37,7 +37,7 @@ NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB}) IF(WIN32) INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) - ADD_DEFINITIONS(/DDRIVER_OPENGL_EXPORTS) + ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS) ENDIF(WIN32) IF(APPLE) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index e8cb57a22..6dae9f4fe 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -108,7 +108,10 @@ IDriver* createGlDriverInstance () #else #ifdef NL_OS_WINDOWS - +#ifdef NL_COMP_MINGW +extern "C" +{ +#endif __declspec(dllexport) IDriver* NL3D_createIDriverInstance () { return new CDriverGL; @@ -118,7 +121,9 @@ __declspec(dllexport) uint32 NL3D_interfaceVersion () { return IDriver::InterfaceVersion; } - +#ifdef NL_COMP_MINGW +} +#endif #elif defined (NL_OS_UNIX) extern "C" @@ -478,6 +483,11 @@ bool CDriverGL::setupDisplay() glLightModeli((GLenum)GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SEPARATE_SPECULAR_COLOR_EXT); #endif } + + if (_Extensions.ARBFragmentShader) + { + _ForceNativeFragmentPrograms = false; + } _VertexProgramEnabled= false; _PixelProgramEnabled= false; @@ -2652,7 +2662,7 @@ void CDriverGL::checkTextureOn() const bool CDriverGL::supportOcclusionQuery() const { H_AUTO_OGL(CDriverGL_supportOcclusionQuery) - return _Extensions.NVOcclusionQuery; + return _Extensions.NVOcclusionQuery || _Extensions.ARBOcclusionQuery; } // *************************************************************************** @@ -2683,11 +2693,14 @@ bool CDriverGL::supportFrameBufferObject() const IOcclusionQuery *CDriverGL::createOcclusionQuery() { H_AUTO_OGL(CDriverGL_createOcclusionQuery) - nlassert(_Extensions.NVOcclusionQuery); + nlassert(_Extensions.NVOcclusionQuery || _Extensions.ARBOcclusionQuery); #ifndef USE_OPENGLES GLuint id; - nglGenOcclusionQueriesNV(1, &id); + if (_Extensions.NVOcclusionQuery) + nglGenOcclusionQueriesNV(1, &id); + else + nglGenQueriesARB(1, &id); if (id == 0) return NULL; COcclusionQueryGL *oqgl = new COcclusionQueryGL; oqgl->Driver = this; @@ -2714,7 +2727,10 @@ void CDriverGL::deleteOcclusionQuery(IOcclusionQuery *oq) oqgl->Driver = NULL; nlassert(oqgl->ID != 0); GLuint id = oqgl->ID; - nglDeleteOcclusionQueriesNV(1, &id); + if (_Extensions.NVOcclusionQuery) + nglDeleteOcclusionQueriesNV(1, &id); + else + nglDeleteQueriesARB(1, &id); _OcclusionQueryList.erase(oqgl->Iterator); if (oqgl == _CurrentOcclusionQuery) { @@ -2733,7 +2749,10 @@ void COcclusionQueryGL::begin() nlassert(Driver); nlassert(Driver->_CurrentOcclusionQuery == NULL); // only one query at a time nlassert(ID); - nglBeginOcclusionQueryNV(ID); + if (Driver->_Extensions.NVOcclusionQuery) + nglBeginOcclusionQueryNV(ID); + else + nglBeginQueryARB(GL_SAMPLES_PASSED, ID); Driver->_CurrentOcclusionQuery = this; OcclusionType = NotAvailable; VisibleCount = 0; @@ -2749,7 +2768,10 @@ void COcclusionQueryGL::end() nlassert(Driver); nlassert(Driver->_CurrentOcclusionQuery == this); // only one query at a time nlassert(ID); - nglEndOcclusionQueryNV(); + if (Driver->_Extensions.NVOcclusionQuery) + nglEndOcclusionQueryNV(); + else + nglEndQueryARB(GL_SAMPLES_PASSED); Driver->_CurrentOcclusionQuery = NULL; #endif } @@ -2765,15 +2787,29 @@ IOcclusionQuery::TOcclusionType COcclusionQueryGL::getOcclusionType() nlassert(Driver->_CurrentOcclusionQuery != this); // can't query result between a begin/end pair! if (OcclusionType == NotAvailable) { - GLuint result; - // retrieve result - nglGetOcclusionQueryuivNV(ID, GL_PIXEL_COUNT_AVAILABLE_NV, &result); - if (result != GL_FALSE) + if (Driver->_Extensions.NVOcclusionQuery) { - nglGetOcclusionQueryuivNV(ID, GL_PIXEL_COUNT_NV, &result); - OcclusionType = result != 0 ? NotOccluded : Occluded; - VisibleCount = (uint) result; - // Note : we could return the exact number of pixels that passed the z-test, but this value is not supported by all implementation (Direct3D ...) + GLuint result; + // retrieve result + nglGetOcclusionQueryuivNV(ID, GL_PIXEL_COUNT_AVAILABLE_NV, &result); + if (result != GL_FALSE) + { + nglGetOcclusionQueryuivNV(ID, GL_PIXEL_COUNT_NV, &result); + OcclusionType = result != 0 ? NotOccluded : Occluded; + VisibleCount = (uint) result; + // Note : we could return the exact number of pixels that passed the z-test, but this value is not supported by all implementation (Direct3D ...) + } + } + else + { + GLuint result; + nglGetQueryObjectuivARB(ID, GL_QUERY_RESULT_AVAILABLE, &result); + if (result != GL_FALSE) + { + nglGetQueryObjectuivARB(ID, GL_QUERY_RESULT, &result); + OcclusionType = result != 0 ? NotOccluded : Occluded; + VisibleCount = (uint) result; + } } } #endif diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.def b/code/nel/src/3d/driver/opengl/driver_opengl.def index bfe648552..369389fa9 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.def +++ b/code/nel/src/3d/driver/opengl/driver_opengl.def @@ -1,2 +1,4 @@ -EXPORTS NL3D_createIDriverInstance -EXPORTS NL3D_interfaceVersion +LIBRARY nel_drv_opengl_win_r +EXPORTS + NL3D_createIDriverInstance + NL3D_interfaceVersion \ No newline at end of file diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/code/nel/src/3d/driver/opengl/driver_opengl.h index 57f73b0b6..241b3bb95 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl.h @@ -304,7 +304,7 @@ public: virtual bool isLost() const { return false; } // there's no notion of 'lost device" in OpenGL - virtual bool init (uint windowIcon = 0, emptyProc exitFunc = 0); + virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0); virtual void disableHardwareVertexProgram(); virtual void disableHardwarePixelProgram(); @@ -632,7 +632,7 @@ public: virtual void swapTextureHandle(ITexture &tex0, ITexture &tex1); - virtual uint getTextureHandle(const ITexture&tex); + virtual uintptr_t getTextureHandle(const ITexture&tex); /// \name Material multipass. /** NB: setupMaterial() must be called before thoses methods. @@ -1591,6 +1591,7 @@ private: // @} // misc public: + friend class COcclusionQueryGL; static GLenum NLCubeFaceToGLCubeFace[6]; static CMaterial::CTexEnv _TexEnvReplace; // occlusion query diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index f24855ea8..aee3e74bb 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -449,6 +449,16 @@ PFNGLENDOCCLUSIONQUERYNVPROC nglEndOcclusionQueryNV; PFNGLGETOCCLUSIONQUERYIVNVPROC nglGetOcclusionQueryivNV; PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV; +// ARB_occlusion_query +PFNGLGENQUERIESPROC nglGenQueriesARB; +PFNGLDELETEQUERIESPROC nglDeleteQueriesARB; +PFNGLISQUERYPROC nglIsQueryARB; +PFNGLBEGINQUERYPROC nglBeginQueryARB; +PFNGLENDQUERYPROC nglEndQueryARB; +PFNGLGETQUERYIVPROC nglGetQueryivARB; +PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB; +PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB; + // GL_EXT_framebuffer_object PFNGLISRENDERBUFFEREXTPROC nglIsRenderbufferEXT; PFNGLISFRAMEBUFFEREXTPROC nglIsFramebufferEXT; @@ -1239,6 +1249,15 @@ static bool setupNVFragmentProgram2(const char *glext) return true; } +// ********************************* +static bool setupARBFragmentShader(const char *glext) +{ + H_AUTO_OGL(setupNVFragmentProgram2); + CHECK_EXT("GL_ARB_fragment_shader"); + + return true; +} + // *************************************************************************** static bool setupARBVertexBufferObject(const char *glext) { @@ -1371,6 +1390,26 @@ static bool setupNVOcclusionQuery(const char *glext) return true; } +// *************************************************************************** +static bool setupARBOcclusionQuery(const char *glext) +{ + H_AUTO_OGL(setupARBOcclusionQuery); + CHECK_EXT("ARB_occlusion_query"); + +#ifndef USE_OPENGLES + CHECK_ADDRESS(PFNGLGENQUERIESPROC, glGenQueriesARB); + CHECK_ADDRESS(PFNGLDELETEQUERIESPROC, glDeleteQueriesARB); + CHECK_ADDRESS(PFNGLISQUERYPROC, glIsQueryARB); + CHECK_ADDRESS(PFNGLBEGINQUERYPROC, glBeginQueryARB); + CHECK_ADDRESS(PFNGLENDQUERYPROC, glEndQueryARB); + CHECK_ADDRESS(PFNGLGETQUERYIVPROC, glGetQueryivARB); + CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectivARB); + CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuivARB); +#endif + + return true; +} + // *************************************************************************** static bool setupNVTextureRectangle(const char *glext) @@ -1597,7 +1636,7 @@ void registerGlExtensions(CGlExtensions &ext) { ext.NVVertexProgram = setupNVVertexProgram(glext); ext.EXTVertexShader = setupEXTVertexShader(glext); - ext.ARBVertexProgram= setupARBVertexProgram(glext); + ext.ARBVertexProgram = setupARBVertexProgram(glext); } else { @@ -1612,6 +1651,7 @@ void registerGlExtensions(CGlExtensions &ext) { ext.ARBFragmentProgram = setupARBFragmentProgram(glext); ext.NVFragmentProgram2 = setupNVFragmentProgram2(glext); + ext.ARBFragmentShader = setupARBFragmentShader(glext); } else { @@ -1663,6 +1703,9 @@ void registerGlExtensions(CGlExtensions &ext) // Check NV_occlusion_query ext.NVOcclusionQuery = setupNVOcclusionQuery(glext); + // Check ARB_occlusion_query + ext.ARBOcclusionQuery = setupARBOcclusionQuery(glext); + // Check GL_NV_texture_rectangle ext.NVTextureRectangle = setupNVTextureRectangle(glext); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h index 83d2d529f..dba5facfb 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h @@ -58,6 +58,7 @@ struct CGlExtensions bool EXTVertexShader; bool NVTextureShader; bool NVOcclusionQuery; + bool ARBOcclusionQuery; bool NVTextureRectangle; bool EXTTextureRectangle; bool ARBTextureRectangle; @@ -103,6 +104,7 @@ struct CGlExtensions bool ARBVertexProgram; bool ARBTextureNonPowerOfTwo; bool ARBMultisample; + bool ARBFragmentShader; // NV Pixel Programs bool NVFragmentProgram2; @@ -177,7 +179,9 @@ public: ARBTextureRectangle = false; ARBTextureNonPowerOfTwo = false; ARBMultisample = false; + ARBFragmentShader = false; NVOcclusionQuery = false; + ARBOcclusionQuery = false; FrameBufferObject = false; FrameBufferBlit = false; FrameBufferMultisample = false; @@ -239,6 +243,7 @@ public: result += EXTSecondaryColor ? "EXTSecondaryColor " : ""; result += EXTBlendColor ? "EXTBlendColor " : ""; result += NVOcclusionQuery ? "NVOcclusionQuery " : ""; + result += ARBOcclusionQuery ? "ARBOcclusionQuery " : ""; result += NVStateVARWithoutFlush ? "NVStateVARWithoutFlush " : ""; result += ARBMultisample ? "ARBMultisample " : ""; result += NVXGPUMemoryInfo ? "NVXGPUMemoryInfo " : ""; @@ -737,7 +742,16 @@ extern PFNGLENDOCCLUSIONQUERYNVPROC nglEndOcclusionQueryNV; extern PFNGLGETOCCLUSIONQUERYIVNVPROC nglGetOcclusionQueryivNV; extern PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV; - +// ARB_occlusion_query +//================================== +extern PFNGLGENQUERIESPROC nglGenQueriesARB; +extern PFNGLDELETEQUERIESPROC nglDeleteQueriesARB; +extern PFNGLISQUERYPROC nglIsQueryARB; +extern PFNGLBEGINQUERYPROC nglBeginQueryARB; +extern PFNGLENDQUERYPROC nglEndQueryARB; +extern PFNGLGETQUERYIVPROC nglGetQueryivARB; +extern PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB; +extern PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB; #ifdef NL_OS_WINDOWS diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp index 96d95bd5d..f26b53254 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp @@ -2269,7 +2269,7 @@ void CDriverGL::swapTextureHandle(ITexture &tex0, ITexture &tex1) // *************************************************************************** -uint CDriverGL::getTextureHandle(const ITexture &tex) +uintptr_t CDriverGL::getTextureHandle(const ITexture &tex) { H_AUTO_OGL(CDriverGL_getTextureHandle) // If DrvShare not setuped diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index 07c800cdc..2fea530cf 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -296,7 +296,7 @@ bool GlWndProc(CDriverGL *driver, XEvent &e) #endif // NL_OS_UNIX // *************************************************************************** -bool CDriverGL::init (uint windowIcon, emptyProc exitFunc) +bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc) { H_AUTO_OGL(CDriverGL_init) diff --git a/code/nel/src/3d/driver/opengl/stdopengl.h b/code/nel/src/3d/driver/opengl/stdopengl.h index 544829b19..9773b0048 100644 --- a/code/nel/src/3d/driver/opengl/stdopengl.h +++ b/code/nel/src/3d/driver/opengl/stdopengl.h @@ -37,7 +37,9 @@ #ifdef NL_OS_WINDOWS # define WIN32_LEAN_AND_MEAN -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include #endif diff --git a/code/nel/src/3d/driver_user.cpp b/code/nel/src/3d/driver_user.cpp index e5d814755..7ccf4cfce 100644 --- a/code/nel/src/3d/driver_user.cpp +++ b/code/nel/src/3d/driver_user.cpp @@ -82,13 +82,13 @@ void UDriver::setMatrixMode2D43() } // *************************************************************************** -UDriver *UDriver::createDriver(uint windowIcon, bool direct3d, emptyProc exitFunc) +UDriver *UDriver::createDriver(uintptr_t windowIcon, bool direct3d, emptyProc exitFunc) { return new CDriverUser (windowIcon, direct3d ? CDriverUser::Direct3d:CDriverUser::OpenGl, exitFunc); } // *************************************************************************** -UDriver *UDriver::createDriver(uint windowIcon, TDriver driver, emptyProc exitFunc) +UDriver *UDriver::createDriver(uintptr_t windowIcon, TDriver driver, emptyProc exitFunc) { return new CDriverUser (windowIcon, (CDriverUser::TDriver)driver, exitFunc); } @@ -114,7 +114,7 @@ bool CDriverUser::_StaticInit= false; // *************************************************************************** -CDriverUser::CDriverUser (uint windowIcon, TDriver driver, emptyProc exitFunc) +CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFunc) { // The enum of IDriver and UDriver MUST be the same!!! nlassert((uint)IDriver::idCount == (uint)UDriver::idCount); diff --git a/code/nel/src/3d/dru.cpp b/code/nel/src/3d/dru.cpp index 503ebdc0f..22d207682 100644 --- a/code/nel/src/3d/dru.cpp +++ b/code/nel/src/3d/dru.cpp @@ -35,7 +35,9 @@ #endif // HAVE_CONFIG_H #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #else // NL_OS_WINDOWS # include diff --git a/code/nel/src/3d/fasthls_modifier.cpp b/code/nel/src/3d/fasthls_modifier.cpp index 5195ddb5a..2790e1442 100644 --- a/code/nel/src/3d/fasthls_modifier.cpp +++ b/code/nel/src/3d/fasthls_modifier.cpp @@ -109,7 +109,7 @@ CRGBA CFastHLSModifier::convert(uint H, uint L, uint S) return col; } -#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71 +#if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 71) # pragma warning( push ) # pragma warning( disable : 4799 ) #endif @@ -124,7 +124,6 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin static uint64 mmBlank = 0; static uint64 mmOne = INT64_CONSTANT(0x00FF00FF00FF00FF); static uint64 mmGray = INT64_CONSTANT(0x0080008000800080); - static uint64 mmInterpBufer[4]= {0,0,0,INT64_CONSTANT(0x00FF00FF00FF00FF)}; /* dLum is actually 0xFFFFFF00 + realDLum @@ -136,6 +135,8 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin #if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) if(CSystemInfo::hasMMX()) { + static uint64 mmInterpBufer[4]= {0,0,0,INT64_CONSTANT(0x00FF00FF00FF00FF)}; + __asm { mov edi, offset mmInterpBufer @@ -262,7 +263,7 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin #pragma managed(pop) #endif -#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71 +#if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 71) # pragma warning( pop ) #endif diff --git a/code/nel/src/3d/flare_model.cpp b/code/nel/src/3d/flare_model.cpp index 6c422aac9..f964a9102 100644 --- a/code/nel/src/3d/flare_model.cpp +++ b/code/nel/src/3d/flare_model.cpp @@ -271,7 +271,7 @@ void CFlareModel::traverseRender() float depthRangeNear, depthRangeFar; drv->getDepthRange(depthRangeNear, depthRangeFar); z = (depthRangeFar - depthRangeNear) * z + depthRangeNear; - if (!v.size() || z > v[0]) // test against z-buffer + if (v.empty() || z > v[0]) // test against z-buffer { visibilityRatio = 0.f; } diff --git a/code/nel/src/3d/lod_character_shape.cpp b/code/nel/src/3d/lod_character_shape.cpp index 6250f2fb5..02d15ce03 100644 --- a/code/nel/src/3d/lod_character_shape.cpp +++ b/code/nel/src/3d/lod_character_shape.cpp @@ -354,7 +354,7 @@ void CLodCharacterShape::buildMesh(const std::string &name, const CLodCharacte const vector &normals= lodBuild.Normals; nlassert(numVertices>0); - nlassert(triangleIndices.size()>0); + nlassert(!triangleIndices.empty()); nlassert((triangleIndices.size()%3)==0); nlassert(skinWeights.size() == numVertices); nlassert(uvs.size() == numVertices); diff --git a/code/nel/src/3d/mesh_mrm_skin.cpp b/code/nel/src/3d/mesh_mrm_skin.cpp index 13e8bdd21..23ff04fee 100644 --- a/code/nel/src/3d/mesh_mrm_skin.cpp +++ b/code/nel/src/3d/mesh_mrm_skin.cpp @@ -16,6 +16,10 @@ #include "std3d.h" +#ifdef NL_HAS_SSE2 +# include +#endif + #include "nel/misc/bsphere.h" #include "nel/misc/fast_mem.h" #include "nel/misc/system_info.h" @@ -39,124 +43,6 @@ namespace NL3D { -// *************************************************************************** -// *************************************************************************** -// CMatrix3x4SSE array correctly aligned -// *************************************************************************** -// *************************************************************************** - - - -// *************************************************************************** -#define NL3D_SSE_ALIGNEMENT 16 -/** - * A CMatrix3x4SSE array correctly aligned - * NB: SSE is no more used (no speed gain, some memory problem), but keep it for possible future usage. - */ -class CMatrix3x4SSEArray -{ -private: - void *_AllocData; - void *_Data; - uint _Size; - uint _Capacity; - -public: - CMatrix3x4SSEArray() - { - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - } - ~CMatrix3x4SSEArray() - { - clear(); - } - CMatrix3x4SSEArray(const CMatrix3x4SSEArray &other) - { - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - *this= other; - } - CMatrix3x4SSEArray &operator=(const CMatrix3x4SSEArray &other) - { - if( this == &other) - return *this; - resize(other.size()); - // copy data from aligned pointers to aligned pointers. - memcpy(_Data, other._Data, size() * sizeof(CMatrix3x4SSE) ); - - return *this; - } - - - CMatrix3x4SSE *getPtr() - { - return (CMatrix3x4SSE*)_Data; - } - - void clear() - { - delete [] ((uint8 *)_AllocData); - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - } - - void resize(uint n) - { - // reserve ?? - if(n>_Capacity) - reserve( max(2*_Capacity, n)); - _Size= n; - } - - void reserve(uint n) - { - if(n==0) - clear(); - else if(n>_Capacity) - { - // Alloc new data. - void *newAllocData; - void *newData; - - // Alloc for alignement. - newAllocData= new uint8 [n * sizeof(CMatrix3x4SSE) + NL3D_SSE_ALIGNEMENT-1]; - if(newAllocData==NULL) - throw Exception("SSE Allocation Failed"); - - // Align ptr - newData= (void*) ( ((ptrdiff_t)newAllocData+NL3D_SSE_ALIGNEMENT-1) & (~(NL3D_SSE_ALIGNEMENT-1)) ); - - // copy valid data from old to new. - memcpy(newData, _Data, size() * sizeof(CMatrix3x4SSE) ); - - // release old. - if(_AllocData) - delete [] ((uint8*)_AllocData); - - // change ptrs and capacity. - _Data= newData; - _AllocData= newAllocData; - _Capacity= n; - - // TestYoyo - //nlwarning("YOYO Tst SSE P4: %X, %d", _Data, n); - } - } - - uint size() const {return _Size;} - - - CMatrix3x4SSE &operator[](uint i) {return ((CMatrix3x4SSE*)_Data)[i];} -}; - - // *************************************************************************** // *************************************************************************** diff --git a/code/nel/src/3d/mesh_mrm_skin_template.cpp b/code/nel/src/3d/mesh_mrm_skin_template.cpp index 1958cae90..4a9e11106 100644 --- a/code/nel/src/3d/mesh_mrm_skin_template.cpp +++ b/code/nel/src/3d/mesh_mrm_skin_template.cpp @@ -39,7 +39,23 @@ static void applyArraySkinNormalT(uint numMatrixes, uint32 *infPtr, CMesh::CSkin { /* Prefetch all vertex/normal before, it is to be faster. */ -#if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) +#ifdef NL_HAS_SSE2 + { + uint nInfTmp= nInf; + uint32 *infTmpPtr= infPtr; + for(;nInfTmp>0;nInfTmp--, infTmpPtr++) + { + uint index= *infTmpPtr; + CMesh::CSkinWeight *srcSkin= srcSkinPtr + index; + CVector *srcVertex= srcVertexPtr + index; + CVector *srcNormal= srcNormalPtr + index; + + _mm_prefetch((const char *)(void *)srcSkin, _MM_HINT_T1); + _mm_prefetch((const char *)(void *)srcVertex, _MM_HINT_T1); + _mm_prefetch((const char *)(void *)srcNormal, _MM_HINT_T1); + } + } +#elif defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) { uint nInfTmp= nInf; uint32 *infTmpPtr= infPtr; @@ -176,7 +192,25 @@ static void applyArraySkinTangentSpaceT(uint numMatrixes, uint32 *infPtr, CMesh: { /* Prefetch all vertex/normal/tgSpace before, it is faster. */ -#if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) +#ifdef NL_HAS_SSE2 + { + uint nInfTmp= nInf; + uint32 *infTmpPtr= infPtr; + for(;nInfTmp>0;nInfTmp--, infTmpPtr++) + { + uint index= *infTmpPtr; + CMesh::CSkinWeight *srcSkin= srcSkinPtr + index; + CVector *srcVertex= srcVertexPtr + index; + CVector *srcNormal= srcNormalPtr + index; + CVector *srcTgSpace= tgSpacePtr + index; + + _mm_prefetch((const char *)(void *)srcSkin, _MM_HINT_T1); + _mm_prefetch((const char *)(void *)srcVertex, _MM_HINT_T1); + _mm_prefetch((const char *)(void *)srcNormal, _MM_HINT_T1); + _mm_prefetch((const char *)(void *)srcTgSpace, _MM_HINT_T1); + } + } +#elif defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) { uint nInfTmp= nInf; uint32 *infTmpPtr= infPtr; diff --git a/code/nel/src/3d/mesh_mrm_skinned.cpp b/code/nel/src/3d/mesh_mrm_skinned.cpp index 2b1c3beb6..6af29bf73 100644 --- a/code/nel/src/3d/mesh_mrm_skinned.cpp +++ b/code/nel/src/3d/mesh_mrm_skinned.cpp @@ -2247,123 +2247,6 @@ void CMeshMRMSkinnedGeom::getSkinWeights (std::vector &skinW } } -// *************************************************************************** -// *************************************************************************** -// CMatrix3x4SSE array correctly aligned -// *************************************************************************** -// *************************************************************************** - - - -// *************************************************************************** -#define NL3D_SSE_ALIGNEMENT 16 -/** - * A CMatrix3x4SSEArray array correctly aligned - * NB: SSE is no more used (no speed gain, some memory problem), but keep it for possible future usage. - */ -class CMatrix3x4SSEArray -{ -private: - void *_AllocData; - void *_Data; - uint _Size; - uint _Capacity; - -public: - CMatrix3x4SSEArray() - { - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - } - ~CMatrix3x4SSEArray() - { - clear(); - } - CMatrix3x4SSEArray(const CMatrix3x4SSEArray &other) - { - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - *this= other; - } - CMatrix3x4SSEArray &operator=(const CMatrix3x4SSEArray &other) - { - if( this == &other) - return *this; - resize(other.size()); - // copy data from aligned pointers to aligned pointers. - memcpy(_Data, other._Data, size() * sizeof(CMatrix3x4SSE) ); - - return *this; - } - - - CMatrix3x4SSE *getPtr() - { - return (CMatrix3x4SSE*)_Data; - } - - void clear() - { - delete [] ((uint8 *) _AllocData); - _AllocData= NULL; - _Data= NULL; - _Size= 0; - _Capacity= 0; - } - - void resize(uint n) - { - // reserve ?? - if(n>_Capacity) - reserve( max(2*_Capacity, n)); - _Size= n; - } - - void reserve(uint n) - { - if(n==0) - clear(); - else if(n>_Capacity) - { - // Alloc new data. - void *newAllocData; - void *newData; - - // Alloc for alignement. - newAllocData= new uint8 [n * sizeof(CMatrix3x4SSE) + NL3D_SSE_ALIGNEMENT-1]; - if(newAllocData==NULL) - throw Exception("SSE Allocation Failed"); - - // Align ptr - newData= (void*) ( ((ptrdiff_t)newAllocData+NL3D_SSE_ALIGNEMENT-1) & (~(NL3D_SSE_ALIGNEMENT-1)) ); - - // copy valid data from old to new. - memcpy(newData, _Data, size() * sizeof(CMatrix3x4SSE) ); - - // release old. - if(_AllocData) - delete [] ((uint8*)_AllocData); - - // change ptrs and capacity. - _Data= newData; - _AllocData= newAllocData; - _Capacity= n; - - // TestYoyo - //nlwarning("YOYO Tst SSE P4: %X, %d", _Data, n); - } - } - - uint size() const {return _Size;} - - - CMatrix3x4SSE &operator[](uint i) {return ((CMatrix3x4SSE*)_Data)[i];} -}; - // *************************************************************************** // *************************************************************************** diff --git a/code/nel/src/3d/motion_blur.cpp b/code/nel/src/3d/motion_blur.cpp index 2b158062d..e9fe1fdab 100644 --- a/code/nel/src/3d/motion_blur.cpp +++ b/code/nel/src/3d/motion_blur.cpp @@ -59,7 +59,6 @@ void CMotionBlur::performMotionBlur(IDriver *driver, float motionBlurAmount) static CVertexBuffer vb ; vb.setVertexFormat(CVertexBuffer::PositionFlag | CVertexBuffer::TexCoord0Flag ) ; vb.setNumVertices(4) ; - vb.setPreferredMemory(CVertexBuffer::RAMVolatile, false); uint32 width, height ; driver->getWindowSize(width, height) ; diff --git a/code/nel/src/3d/program.cpp b/code/nel/src/3d/program.cpp index facf877fc..390fdf314 100644 --- a/code/nel/src/3d/program.cpp +++ b/code/nel/src/3d/program.cpp @@ -94,7 +94,7 @@ const char *CProgramIndex::Names[NUM_UNIFORMS] = void IProgram::buildInfo(CSource *source) { - nlassert(!m_Source); + // nlassert(!m_Source); // VALID: When deleting driver and creating new one. m_Source = source; diff --git a/code/nel/src/3d/ps_fan_light.cpp b/code/nel/src/3d/ps_fan_light.cpp index cb33fcd20..055826749 100644 --- a/code/nel/src/3d/ps_fan_light.cpp +++ b/code/nel/src/3d/ps_fan_light.cpp @@ -519,7 +519,6 @@ void CPSFanLight::getVBnIB(CVertexBuffer *&retVb, CIndexBuffer *&retIb) vb.setName("CPSFanLight"); ib.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); ib.setNumIndexes(size * _NbFans * 3); - ib.setPreferredMemory(CIndexBuffer::AGPVolatile, false); // pointer on the current index to fill CIndexBufferReadWrite iba; ib.lock (iba); diff --git a/code/nel/src/3d/ps_force.cpp b/code/nel/src/3d/ps_force.cpp index cb3445619..bbef28663 100644 --- a/code/nel/src/3d/ps_force.cpp +++ b/code/nel/src/3d/ps_force.cpp @@ -421,7 +421,6 @@ void CPSGravity::show() vb.setVertexFormat(CVertexBuffer::PositionFlag); vb.setNumVertices(6); - vb.setPreferredMemory(CVertexBuffer::RAMVolatile, false); { CVertexBufferReadWrite vba; vb.lock (vba); @@ -434,7 +433,6 @@ void CPSGravity::show() } pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); pb.setNumIndexes(2*4); - pb.setPreferredMemory(CIndexBuffer::RAMVolatile, false); { CIndexBufferReadWrite ibaWrite; pb.lock (ibaWrite); diff --git a/code/nel/src/3d/ps_ribbon.cpp b/code/nel/src/3d/ps_ribbon.cpp index cc7d0bcd7..af907313f 100644 --- a/code/nel/src/3d/ps_ribbon.cpp +++ b/code/nel/src/3d/ps_ribbon.cpp @@ -971,7 +971,6 @@ CPSRibbon::CVBnPB &CPSRibbon::getVBnPB() ); vb.setNumVertices((_UsedNbSegs + 1) * numRibbonInVB * numVerticesInSlice); // 1 seg = 1 line + terminal vertices pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); - pb.setPreferredMemory(CIndexBuffer::AGPVolatile, false); // set the primitive block size if (_BraceMode) { diff --git a/code/nel/src/3d/ps_ribbon_look_at.cpp b/code/nel/src/3d/ps_ribbon_look_at.cpp index 3b22f561e..966e5a5b1 100644 --- a/code/nel/src/3d/ps_ribbon_look_at.cpp +++ b/code/nel/src/3d/ps_ribbon_look_at.cpp @@ -582,7 +582,6 @@ CPSRibbonLookAt::CVBnPB &CPSRibbonLookAt::getVBnPB() CIndexBuffer &pb = VBnPB.PB; pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); pb.setNumIndexes((_UsedNbSegs << 1) * numRibbonInVB * 3); - pb.setPreferredMemory(CIndexBuffer::AGPVolatile, false); CIndexBufferReadWrite iba; pb.lock (iba); /// Setup the pb and vb parts. Not very fast but executed only once diff --git a/code/nel/src/3d/ps_shockwave.cpp b/code/nel/src/3d/ps_shockwave.cpp index 607b2d03e..20069e175 100644 --- a/code/nel/src/3d/ps_shockwave.cpp +++ b/code/nel/src/3d/ps_shockwave.cpp @@ -530,7 +530,6 @@ void CPSShockWave::getVBnPB(CVertexBuffer *&retVb, CIndexBuffer *&retPb) vb.lock (vba); pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); pb.setNumIndexes(2 * 3 * size * _NbSeg); - pb.setPreferredMemory(CIndexBuffer::AGPVolatile, false); CIndexBufferReadWrite ibaWrite; pb.lock (ibaWrite); uint finalIndex = 0; diff --git a/code/nel/src/3d/ps_tail_dot.cpp b/code/nel/src/3d/ps_tail_dot.cpp index 623b8e7f7..075c9a598 100644 --- a/code/nel/src/3d/ps_tail_dot.cpp +++ b/code/nel/src/3d/ps_tail_dot.cpp @@ -422,7 +422,6 @@ CPSTailDot::CVBnPB &CPSTailDot::getVBnPB() CIndexBuffer &pb = VBnPB.PB; pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); pb.setNumIndexes(2 * _UsedNbSegs * numRibbonInVB); - pb.setPreferredMemory(CIndexBuffer::AGPVolatile, false); /// Setup the pb and vb parts. Not very fast but executed only once uint vbIndex = 0; uint pbIndex = 0; diff --git a/code/nel/src/3d/ps_util.cpp b/code/nel/src/3d/ps_util.cpp index 0f7600d0e..84e8c096a 100644 --- a/code/nel/src/3d/ps_util.cpp +++ b/code/nel/src/3d/ps_util.cpp @@ -117,7 +117,6 @@ void CPSUtil::displayBBox(NL3D::IDriver *driver, const NLMISC::CAABBox &box, NLM CVertexBuffer vb; vb.setVertexFormat(CVertexBuffer::PositionFlag); vb.setNumVertices(8); - vb.setPreferredMemory(CVertexBuffer::AGPVolatile, false); { CVertexBufferReadWrite vba; @@ -146,7 +145,6 @@ void CPSUtil::displayBBox(NL3D::IDriver *driver, const NLMISC::CAABBox &box, NLM CIndexBuffer pb; pb.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); pb.setNumIndexes(2*12); - pb.setPreferredMemory(CIndexBuffer::RAMVolatile, false); { CIndexBufferReadWrite ibaWrite; pb.lock (ibaWrite); @@ -208,7 +206,6 @@ void CPSUtil::displayArrow(IDriver *driver, const CVector &start, const CVector CVertexBuffer vb; vb.setVertexFormat(CVertexBuffer::PositionFlag); vb.setNumVertices(5); - vb.setPreferredMemory(CVertexBuffer::AGPVolatile, false); { diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp index 7bd50e79b..fa67230d4 100644 --- a/code/nel/src/3d/scene_group.cpp +++ b/code/nel/src/3d/scene_group.cpp @@ -753,7 +753,13 @@ bool CInstanceGroup::addToSceneWhenAllShapesLoaded (CScene& scene, IDriver *driv { _Instances[i]->clipUnlinkFromAll(); for (j = 0; j < _InstancesInfos[i].Clusters.size(); ++j) - _ClusterInstances[_InstancesInfos[i].Clusters[j]]->clipAddChild( _Instances[i] ); + { + uint32 clusterInst = _InstancesInfos[i].Clusters[j]; + if (clusterInst < _ClusterInstances.size()) + _ClusterInstances[clusterInst]->clipAddChild( _Instances[i] ); + else + nlwarning("IG: BUG: Cluster infos size %u, indexing %u", (uint32)_ClusterInstances.size(), clusterInst); + } // For the first time we have to set all the instances to NOT move (and not be rebinded) _Instances[i]->freeze(); _Instances[i]->setClusterSystem (this); @@ -1307,7 +1313,6 @@ void CInstanceGroup::displayDebugClusters(IDriver *drv, class CTextContext *tx const uint maxVertices= 10000; vb.setVertexFormat(CVertexBuffer::PositionFlag); vb.setNumVertices(maxVertices); - vb.setPreferredMemory(CVertexBuffer::RAMVolatile, false); CIndexBuffer clusterTriangles; CIndexBuffer clusterLines; CIndexBuffer portalTriangles; diff --git a/code/nel/src/3d/zone_lighter.cpp b/code/nel/src/3d/zone_lighter.cpp index 1d7ec5a66..f5549e66a 100644 --- a/code/nel/src/3d/zone_lighter.cpp +++ b/code/nel/src/3d/zone_lighter.cpp @@ -37,7 +37,9 @@ #ifdef NL_OS_WINDOWS # define WIN32_LEAN_AND_MEAN -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include #endif // NL_OS_WINDOWS diff --git a/code/nel/src/gui/interface_parser.cpp b/code/nel/src/gui/interface_parser.cpp index 3d7a1c849..b26a403c4 100644 --- a/code/nel/src/gui/interface_parser.cpp +++ b/code/nel/src/gui/interface_parser.cpp @@ -647,8 +647,7 @@ namespace NLGUI { if(!parseLUAScript(root)) { - nlwarning ("could not parse 'lua'"); - exit( EXIT_FAILURE ); + nlerror ("could not parse 'lua'"); } } else diff --git a/code/nel/src/gui/lua_object.cpp b/code/nel/src/gui/lua_object.cpp index 3f8924517..a50569858 100644 --- a/code/nel/src/gui/lua_object.cpp +++ b/code/nel/src/gui/lua_object.cpp @@ -362,7 +362,7 @@ namespace NLGUI { nlassert(key); nlassert(isValid()); - if (!isTable()) throw ELuaNotATable(NLMISC::toString("Trying to set a function value '%p' at key %s on object '%s' of type %s (not a table).", value, key, getId().c_str(), getTypename())); + if (!isTable()) throw ELuaNotATable(NLMISC::toString("Trying to set a function value '%p' at key %s on object '%s' of type %s (not a table).", (void *)value, key, getId().c_str(), getTypename())); CLuaStackChecker lsc(_LuaState); push(); _LuaState->push(key); diff --git a/code/nel/src/gui/stdpch.h b/code/nel/src/gui/stdpch.h index 8ab2a3595..bb983f77c 100644 --- a/code/nel/src/gui/stdpch.h +++ b/code/nel/src/gui/stdpch.h @@ -30,7 +30,9 @@ #include "nel/misc/hierarchical_timer.h" #ifdef NL_OS_WINDOWS - #define NOMINMAX + #ifndef NL_COMP_MINGW + # define NOMINMAX + #endif #include #include #endif diff --git a/code/nel/src/gui/view_pointer_base.cpp b/code/nel/src/gui/view_pointer_base.cpp index 045329d35..e29af7858 100644 --- a/code/nel/src/gui/view_pointer_base.cpp +++ b/code/nel/src/gui/view_pointer_base.cpp @@ -25,7 +25,7 @@ namespace NLGUI CViewBase( param ), _Buttons( NLMISC::noButton ) { - _PointerX = _PointerY = _PointerOldX = _PointerOldY = _PointerDownX = _PointerDownY = 0; + _PointerX = _PointerY = _PointerOldX = _PointerOldY = _PointerDownX = _PointerDownY = InvalidCoord; _PointerDown = false; _PointerVisible = true; } diff --git a/code/nel/src/ligo/stdligo.h b/code/nel/src/ligo/stdligo.h index 3c86f25e6..c8f4e2a9a 100644 --- a/code/nel/src/ligo/stdligo.h +++ b/code/nel/src/ligo/stdligo.h @@ -63,6 +63,8 @@ #include "nel/misc/file.h" #ifdef NL_OS_WINDOWS - #define NOMINMAX + #ifndef NL_COMP_MINGW + #define NOMINMAX + #endif #include #endif diff --git a/code/nel/src/ligo/zone_bank.cpp b/code/nel/src/ligo/zone_bank.cpp index ff24821af..a099168f8 100644 --- a/code/nel/src/ligo/zone_bank.cpp +++ b/code/nel/src/ligo/zone_bank.cpp @@ -25,7 +25,9 @@ #include "nel/misc/o_xml.h" #ifdef NL_OS_WINDOWS +#ifndef NL_COMP_MINGW #define NOMINMAX +#endif #include #endif // NL_OS_WINDOWS diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index dc5b87e2c..2d3ef9066 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -27,7 +27,7 @@ ENDIF(WITH_STATIC OR WIN32) # For DirectInput (di_event_emitter) IF(WIN32) INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(nelmisc ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) + TARGET_LINK_LIBRARIES(nelmisc ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY} winmm dbghelp) ENDIF(WIN32) IF(UNIX) @@ -39,7 +39,7 @@ ENDIF(UNIX) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) -TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES}) +TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY}) SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc") NL_ADD_RUNTIME_FLAGS(nelmisc) diff --git a/code/nel/src/misc/bitmap_jpeg.cpp b/code/nel/src/misc/bitmap_jpeg.cpp index 799d659d6..a43c707e7 100644 --- a/code/nel/src/misc/bitmap_jpeg.cpp +++ b/code/nel/src/misc/bitmap_jpeg.cpp @@ -26,6 +26,9 @@ #include extern "C" { + #ifdef NL_COMP_MINGW + # define HAVE_BOOLEAN + #endif #include } #endif diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp index 91b0132a9..d238b4853 100644 --- a/code/nel/src/misc/co_task.cpp +++ b/code/nel/src/misc/co_task.cpp @@ -53,7 +53,9 @@ # define _WIN32_WINNT 0x0400 # endif -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined (NL_OS_UNIX) # define NL_WIN_CALLBACK diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 36e167260..31ad7edb0 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -20,7 +20,9 @@ #include "nel/misc/common.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # include @@ -37,6 +39,7 @@ using namespace std; +#ifndef NL_COMP_MINGW #ifdef NL_OS_WINDOWS # pragma message( " " ) @@ -69,6 +72,36 @@ extern "C" long _ftol2( double dblSource ) { return _ftol( dblSource ); } #endif // NL_OS_WINDOWS +#endif // !NL_COMP_MINGW + + +#ifdef NL_HAS_SSE2 + +void *operator new(size_t size) throw(std::bad_alloc) +{ + void *p = aligned_malloc(size, NL_DEFAULT_MEMORY_ALIGNMENT); + if (p == NULL) throw std::bad_alloc(); + return p; +} + +void *operator new[](size_t size) throw(std::bad_alloc) +{ + void *p = aligned_malloc(size, NL_DEFAULT_MEMORY_ALIGNMENT); + if (p == NULL) throw std::bad_alloc(); + return p; +} + +void operator delete(void *p) throw() +{ + aligned_free(p); +} + +void operator delete[](void *p) throw() +{ + aligned_free(p); +} + +#endif /* NL_HAS_SSE2 */ #ifdef DEBUG_NEW @@ -1040,7 +1073,7 @@ bool openDoc (const char *document) HINSTANCE result = ShellExecuteA(NULL, "open", document, NULL,NULL, SW_SHOWDEFAULT); // If it failed, get the .htm regkey and lookup the program - if ((UINT)result <= HINSTANCE_ERROR) + if ((uintptr_t)result <= HINSTANCE_ERROR) { if (GetRegKey(HKEY_CLASSES_ROOT, ext.c_str(), key) == ERROR_SUCCESS) { diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index 28f40f641..c7667acc2 100644 --- a/code/nel/src/misc/debug.cpp +++ b/code/nel/src/misc/debug.cpp @@ -34,8 +34,10 @@ #ifdef NL_OS_WINDOWS # define _WIN32_WINDOWS 0x0410 +# ifndef NL_COMP_MINGW # define WINVER 0x0400 -# define NOMINMAX +# define NOMINMAX +# endif # include # include # include @@ -445,7 +447,7 @@ public: EDebug() { _Reason = "Nothing about EDebug"; } - ~EDebug () { } + virtual ~EDebug() throw() {} EDebug(EXCEPTION_POINTERS * pexp) : m_pexp(pexp) { nlassert(pexp != 0); createWhat(); } EDebug(const EDebug& se) : m_pexp(se.m_pexp) { createWhat(); } @@ -755,7 +757,7 @@ public: HANDLE getProcessHandle() { - return CSystemInfo::isNT()?GetCurrentProcess():(HANDLE)GetCurrentProcessId(); + return CSystemInfo::isNT()?GetCurrentProcess():(HANDLE)(uintptr_t)GetCurrentProcessId(); } // return true if found @@ -797,7 +799,7 @@ public: while (findAndErase(rawType, "classvector,class allocator >", "string")) ; } - string getFuncInfo (DWORD funcAddr, DWORD stackAddr) + string getFuncInfo (uintptr_t funcAddr, uintptr_t stackAddr) { string str ("NoSymbol"); @@ -853,7 +855,7 @@ public: if (stop==0 && (parse[i] == ',' || parse[i] == ')')) { - ULONG *addr = (ULONG*)(stackAddr) + 2 + pos2++; + uintptr_t *addr = (uintptr_t*)(stackAddr) + 2 + pos2++; string displayType = type; cleanType (type, displayType); @@ -882,7 +884,7 @@ public: } else if (type == "char*") { - if (!IsBadReadPtr(addr,sizeof(char*)) && *addr != NULL) + if (!IsBadReadPtr(addr,sizeof(char*)) && *addr != 0) { if (!IsBadStringPtrA((char*)*addr,32)) { @@ -920,7 +922,7 @@ public: { if (!IsBadReadPtr(addr,sizeof(string*))) { - if (*addr != NULL) + if (*addr != 0) { if (!IsBadReadPtr((void*)*addr,sizeof(string))) sprintf (tmp, "\"%s\"", ((string*)*addr)->c_str()); @@ -929,9 +931,9 @@ public: } else { - if (!IsBadReadPtr(addr,sizeof(ULONG*))) + if (!IsBadReadPtr(addr,sizeof(uintptr_t*))) { - if(*addr == NULL) + if(*addr == 0) sprintf (tmp, ""); else sprintf (tmp, "0x%p", *addr); @@ -956,7 +958,7 @@ public: if (disp != 0) { str += " + "; - str += toString ((uint32)disp); + str += toString ((uintptr_t)disp); str += " bytes"; } } @@ -1166,7 +1168,8 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog) initAcquireTimeMap(); #endif -#ifdef NL_OS_WINDOWS +#ifndef NL_COMP_MINGW +# ifdef NL_OS_WINDOWS // if (!IsDebuggerPresent ()) { // Use an environment variable to share the value among the EXE and its child DLLs @@ -1180,7 +1183,8 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog) SetEnvironmentVariable( SE_TRANSLATOR_IN_MAIN_MODULE, _T("1") ); } } -#endif // NL_OS_WINDOWS +# endif // NL_OS_WINDOWS +#endif //!NL_COMP_MINGW INelContext::getInstance().setErrorLog(new CLog (CLog::LOG_ERROR)); INelContext::getInstance().setWarningLog(new CLog (CLog::LOG_WARNING)); diff --git a/code/nel/src/misc/di_game_device.cpp b/code/nel/src/misc/di_game_device.cpp index 6574b5cde..5adfb4b9b 100644 --- a/code/nel/src/misc/di_game_device.cpp +++ b/code/nel/src/misc/di_game_device.cpp @@ -217,7 +217,7 @@ static void BuildCtrlName(LPCDIDEVICEOBJECTINSTANCE lpddoi, //============================================================================ // A callback to enumerate the controls of a device -static BOOL CALLBACK DIEnumDeviceObjectsCallback +BOOL CALLBACK DIEnumDeviceObjectsCallback ( LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef diff --git a/code/nel/src/misc/di_keyboard_device.cpp b/code/nel/src/misc/di_keyboard_device.cpp index 0802019a4..8b5d9c6e1 100644 --- a/code/nel/src/misc/di_keyboard_device.cpp +++ b/code/nel/src/misc/di_keyboard_device.cpp @@ -113,8 +113,8 @@ static const CKeyConv DIToNel[] = {DIK_CONVERT, KeyCONVERT, "CONVERT", false}, {DIK_NOCONVERT, KeyNONCONVERT, "NOCONVERT", true}, // - {DIK_KANA, KeyKANA, false}, - {DIK_KANJI, KeyKANJI, false}, + {DIK_KANA, KeyKANA, "KANA", false}, + {DIK_KANJI, KeyKANJI, "KANJI", false}, }; @@ -164,7 +164,7 @@ CDIKeyboard::CDIKeyboard(CWinEventEmitter *we, HWND hwnd) _RepeatPeriod = (uint) (1000.f / (keybSpeed * (27.5f / 31.f) + 2.5f)); } // get keyboard layout - _KBLayout = ::GetKeyboardLayout(NULL); + _KBLayout = ::GetKeyboardLayout(0); _RepetitionDisabled.resize(NumKeys); _RepetitionDisabled.clearAll(); diff --git a/code/nel/src/misc/di_mouse_device.cpp b/code/nel/src/misc/di_mouse_device.cpp index 2dfcf95f0..273725c5c 100644 --- a/code/nel/src/misc/di_mouse_device.cpp +++ b/code/nel/src/misc/di_mouse_device.cpp @@ -27,6 +27,12 @@ #define new DEBUG_NEW #endif +#ifdef NL_COMP_MINGW +# undef FIELD_OFFSET +# define FIELD_OFFSET(t,f) offsetof(t,f) +#endif + + namespace NLMISC { @@ -78,7 +84,7 @@ void CDIMouse::setMouseMode(TAxis axis, TAxisMode axisMode) //====================================================== CDIMouse::TAxisMode CDIMouse::getMouseMode(TAxis axis) const { - nlassert(axis < NumMouseAxis); + nlassert((int)axis < (int)NumMouseAxis); return _MouseAxisMode[axis]; } diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index a1b1c7de8..d48c44d02 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -39,8 +39,10 @@ // these defines is for IsDebuggerPresent(). it'll not compile on windows 95 // just comment this and the IsDebuggerPresent to compile on windows 95 # define _WIN32_WINDOWS 0x0410 -# define WINVER 0x0400 -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define WINVER 0x0400 +# define NOMINMAX +# endif # include #else # define IsDebuggerPresent() false diff --git a/code/nel/src/misc/dynloadlib.cpp b/code/nel/src/misc/dynloadlib.cpp index 6dcb7e4cf..25f28286e 100644 --- a/code/nel/src/misc/dynloadlib.cpp +++ b/code/nel/src/misc/dynloadlib.cpp @@ -57,7 +57,7 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName) { void *res = 0; #ifdef NL_OS_WINDOWS - res = GetProcAddress(libHandle, procName.c_str()); + res = (void *)GetProcAddress(libHandle, procName.c_str()); #elif defined(NL_OS_UNIX) res = dlsym(libHandle, procName.c_str()); #else diff --git a/code/nel/src/misc/fixed_size_allocator.cpp b/code/nel/src/misc/fixed_size_allocator.cpp index 790275ec6..30693ddfd 100644 --- a/code/nel/src/misc/fixed_size_allocator.cpp +++ b/code/nel/src/misc/fixed_size_allocator.cpp @@ -33,6 +33,9 @@ CFixedSizeAllocator::CFixedSizeAllocator(uint numBytesPerBlock, uint numBlockPer _NumChunks = 0; nlassert(numBytesPerBlock > 1); _NumBytesPerBlock = numBytesPerBlock; + const uint mask = NL_DEFAULT_MEMORY_ALIGNMENT - 1; + _NumBytesPerBlock = (_NumBytesPerBlock + mask) & ~mask; + nlassert(_NumBytesPerBlock >= numBytesPerBlock); _NumBlockPerChunk = std::max(numBlockPerChunk, (uint) 3); _NumAlloc = 0; } @@ -67,12 +70,14 @@ void *CFixedSizeAllocator::alloc() return _FreeSpace->unlink(); } +#define aligned_offsetof(s, m) ((offsetof(s, m) + (NL_DEFAULT_MEMORY_ALIGNMENT - 1)) & ~(NL_DEFAULT_MEMORY_ALIGNMENT - 1)) + // ***************************************************************************************************************** void CFixedSizeAllocator::free(void *block) { if (!block) return; /// get the node from the object - CNode *node = (CNode *) ((uint8 *) block - offsetof(CNode, Next)); + CNode *node = (CNode *) ((uint8 *) block - aligned_offsetof(CNode, Next)); // nlassert(node->Chunk != NULL); nlassert(node->Chunk->Allocator == this); @@ -84,7 +89,9 @@ void CFixedSizeAllocator::free(void *block) // ***************************************************************************************************************** uint CFixedSizeAllocator::CChunk::getBlockSizeWithOverhead() const { - return std::max((uint)(sizeof(CNode) - offsetof(CNode, Next)),(uint)(Allocator->getNumBytesPerBlock())) + offsetof(CNode, Next); + nlctassert((sizeof(CNode) % NL_DEFAULT_MEMORY_ALIGNMENT) == 0); + return std::max((uint)(sizeof(CNode) - aligned_offsetof(CNode, Next)), + (uint)(Allocator->getNumBytesPerBlock())) + aligned_offsetof(CNode, Next); } // ***************************************************************************************************************** @@ -105,7 +112,7 @@ CFixedSizeAllocator::CChunk::~CChunk() nlassert(NumFreeObjs == 0); nlassert(Allocator->_NumChunks > 0); -- (Allocator->_NumChunks); - delete[] Mem; + aligned_free(Mem); //delete[] Mem; } // ***************************************************************************************************************** @@ -115,7 +122,7 @@ void CFixedSizeAllocator::CChunk::init(CFixedSizeAllocator *alloc) nlassert(alloc != NULL); Allocator = alloc; // - Mem = new uint8[getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk()]; + Mem = (uint8 *)aligned_malloc(getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk(), NL_DEFAULT_MEMORY_ALIGNMENT); // new uint8[getBlockSizeWithOverhead() * alloc->getNumBlockPerChunk()]; // getNode(0).Chunk = this; getNode(0).Next = &getNode(1); @@ -179,7 +186,7 @@ void *CFixedSizeAllocator::CNode::unlink() *Prev = Next; nlassert(Chunk->NumFreeObjs > 0); Chunk->grab(); // tells the containing chunk that a node has been allocated - return (void *) &Next; + return (void *)((uintptr_t)(this) + aligned_offsetof(CNode, Next)); //(void *) &Next; } // ***************************************************************************************************************** diff --git a/code/nel/src/misc/log.cpp b/code/nel/src/misc/log.cpp index 85ec59e04..478a5e338 100644 --- a/code/nel/src/misc/log.cpp +++ b/code/nel/src/misc/log.cpp @@ -19,7 +19,9 @@ #include "nel/misc/log.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include #else diff --git a/code/nel/src/misc/matrix.cpp b/code/nel/src/misc/matrix.cpp index dd884f4d5..e907fb2e0 100644 --- a/code/nel/src/misc/matrix.cpp +++ b/code/nel/src/misc/matrix.cpp @@ -140,6 +140,7 @@ inline void CMatrix::testExpandRot() const self->Scale33= 1; } } + inline void CMatrix::testExpandProj() const { if(hasProj()) diff --git a/code/nel/src/misc/mem_displayer.cpp b/code/nel/src/misc/mem_displayer.cpp index 52d399350..49431097d 100644 --- a/code/nel/src/misc/mem_displayer.cpp +++ b/code/nel/src/misc/mem_displayer.cpp @@ -24,7 +24,9 @@ #include "nel/misc/debug.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # pragma comment(lib, "imagehlp.lib") @@ -148,7 +150,11 @@ static string getSourceInfo (DWORD_TYPE addr) return str; } -static DWORD_TYPE __stdcall GetModuleBase(HANDLE hProcess, DWORD_TYPE dwReturnAddress) +#ifdef NL_OS_WIN64 +static DWORD64 __stdcall GetModuleBase(HANDLE hProcess, DWORD64 dwReturnAddress) +#else +static DWORD __stdcall GetModuleBase(HANDLE hProcess, DWORD dwReturnAddress) +#endif { IMAGEHLP_MODULE moduleInfo; @@ -169,9 +175,15 @@ static DWORD_TYPE __stdcall GetModuleBase(HANDLE hProcess, DWORD_TYPE dwReturnAd if (cch && (lstrcmp(szFile, "DBFN")== 0)) { - if (!SymLoadModule(hProcess, - NULL, "MN", - NULL, (DWORD) memoryBasicInfo.AllocationBase, 0)) + char mn[] = { 'M', 'N', 0x00 }; +#ifdef NL_OS_WIN64 + if (!SymLoadModule64( +#else + if (!SymLoadModule( +#endif + hProcess, + NULL, mn, + NULL, (uintptr_t)memoryBasicInfo.AllocationBase, 0)) { // DWORD dwError = GetLastError(); // nlinfo("Error: %d", dwError); @@ -179,17 +191,23 @@ static DWORD_TYPE __stdcall GetModuleBase(HANDLE hProcess, DWORD_TYPE dwReturnAd } else { - if (!SymLoadModule(hProcess, - NULL, ((cch) ? szFile : NULL), - NULL, (DWORD) memoryBasicInfo.AllocationBase, 0)) +#ifdef NL_OS_WIN64 + if (!SymLoadModule64( +#else + if (!SymLoadModule( +#endif + hProcess, + NULL, ((cch) ? szFile : NULL), + NULL, (uintptr_t)memoryBasicInfo.AllocationBase, 0)) { // DWORD dwError = GetLastError(); // nlinfo("Error: %d", dwError); } + } - return (DWORD) memoryBasicInfo.AllocationBase; + return (uintptr_t)memoryBasicInfo.AllocationBase; } // else // nlinfo("Error is %d", GetLastError()); @@ -250,19 +268,13 @@ static void displayCallStack (CLog *log) return; } -#ifdef NL_OS_WIN64 - WOW64_CONTEXT context; -#else + // FIXME: Implement this for MinGW +#ifndef NL_COMP_MINGW CONTEXT context; -#endif ::ZeroMemory (&context, sizeof(context)); context.ContextFlags = CONTEXT_FULL; -#ifdef NL_OS_WIN64 - if (Wow64GetThreadContext (GetCurrentThread(), &context) == FALSE) -#else if (GetThreadContext (GetCurrentThread(), &context) == FALSE) -#endif { nlwarning ("DISP: GetThreadContext(%p) failed", GetCurrentThread()); return; @@ -270,12 +282,20 @@ static void displayCallStack (CLog *log) STACKFRAME callStack; ::ZeroMemory (&callStack, sizeof(callStack)); - callStack.AddrPC.Mode = AddrModeFlat; + +#ifdef NL_OS_WIN64 + callStack.AddrPC.Offset = context.Rip; + callStack.AddrStack.Offset = context.Rsp; + callStack.AddrFrame.Offset = context.Rbp; +#else callStack.AddrPC.Offset = context.Eip; - callStack.AddrStack.Mode = AddrModeFlat; callStack.AddrStack.Offset = context.Esp; - callStack.AddrFrame.Mode = AddrModeFlat; callStack.AddrFrame.Offset = context.Ebp; +#endif + + callStack.AddrPC.Mode = AddrModeFlat; + callStack.AddrStack.Mode = AddrModeFlat; + callStack.AddrFrame.Mode = AddrModeFlat; for (uint32 i = 0; ; i++) { @@ -283,12 +303,13 @@ static void displayCallStack (CLog *log) #ifdef NL_OS_WIN64 MachineType = IMAGE_FILE_MACHINE_AMD64; + BOOL res = StackWalk64(MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack, + NULL, NULL, SymFunctionTableAccess, GetModuleBase, NULL); #else MachineType = IMAGE_FILE_MACHINE_I386; -#endif - - BOOL res = StackWalk (MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack, + BOOL res = StackWalk(MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack, NULL, NULL, SymFunctionTableAccess, GetModuleBase, NULL); +#endif /* if (res == FALSE) { @@ -309,6 +330,7 @@ static void displayCallStack (CLog *log) log->displayNL (" %s : %s", srcInfo.c_str(), symInfo.c_str()); } +#endif } #else // NL_OS_WINDOWS diff --git a/code/nel/src/misc/mutex.cpp b/code/nel/src/misc/mutex.cpp index f8a75d2ea..3c86e2b29 100644 --- a/code/nel/src/misc/mutex.cpp +++ b/code/nel/src/misc/mutex.cpp @@ -44,8 +44,10 @@ using namespace std; // these defines are for IsDebuggerPresent(). It'll not compile on windows 95 // just comment this and the IsDebuggerPresent to compile on windows 95 #define _WIN32_WINDOWS 0x0410 -#define WINVER 0x0400 -#define NOMINMAX +#ifndef NL_COMP_MINGW +# define WINVER 0x0400 +# define NOMINMAX +#endif #include #ifdef DEBUG_NEW diff --git a/code/nel/src/misc/o_xml.cpp b/code/nel/src/misc/o_xml.cpp index 005ef8000..0fbe3dade 100644 --- a/code/nel/src/misc/o_xml.cpp +++ b/code/nel/src/misc/o_xml.cpp @@ -23,6 +23,11 @@ // Include from libxml2 #include +#if defined(NL_OS_WINDOWS) && defined(NL_COMP_VC_VERSION) && NL_COMP_VC_VERSION >= 80 +#define USE_LOCALE_SPRINTF +#include +#endif + using namespace std; #ifdef DEBUG_NEW @@ -38,11 +43,22 @@ const char SEPARATOR = ' '; // *************************************************************************** +#ifdef USE_LOCALE_SPRINTF + +#define writenumber(src,format,digits) \ + char number_as_cstring [digits+1]; \ + _sprintf_l( number_as_cstring, format, (_locale_t)_Locale, src ); \ + serialSeparatedBufferOut( number_as_cstring ); + +#else + #define writenumber(src,format,digits) \ char number_as_cstring [digits+1]; \ sprintf( number_as_cstring, format, src ); \ serialSeparatedBufferOut( number_as_cstring ); +#endif + // *************************************************************************** // XML callbacks // *************************************************************************** @@ -133,6 +149,13 @@ COXml::COXml () : IStream (false /* Output mode */) // Push begin _PushBegin = false; + +#ifdef USE_LOCALE_SPRINTF + // create C numeric locale + _Locale = _create_locale(LC_NUMERIC, "C"); +#else + _Locale = NULL; +#endif } // *************************************************************************** @@ -192,6 +215,10 @@ COXml::~COXml () { // Flush document to the internal stream flush (); + +#ifdef USE_LOCALE_SPRINTF + if (_Locale) _free_locale((_locale_t)_Locale); +#endif } // *************************************************************************** diff --git a/code/nel/src/misc/object_arena_allocator.cpp b/code/nel/src/misc/object_arena_allocator.cpp index 9c73f5059..5fba66005 100644 --- a/code/nel/src/misc/object_arena_allocator.cpp +++ b/code/nel/src/misc/object_arena_allocator.cpp @@ -68,21 +68,23 @@ void *CObjectArenaAllocator::alloc(uint size) if (size >= _MaxAllocSize) { // use standard allocator - uint8 *block = new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block + nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT >= sizeof(uint)); + uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block if (!block) return NULL; #ifdef NL_DEBUG _MemBlockToAllocID[block] = _AllocID; #endif *(uint *) block = size; - return block + sizeof(uint); + return block + NL_DEFAULT_MEMORY_ALIGNMENT; } uint entry = ((size + (_Granularity - 1)) / _Granularity) ; nlassert(entry < _ObjectSizeToAllocator.size()); if (!_ObjectSizeToAllocator[entry]) { - _ObjectSizeToAllocator[entry] = new CFixedSizeAllocator(entry * _Granularity + sizeof(uint), _MaxAllocSize / size); // an additionnal uint is needed to store size of block + _ObjectSizeToAllocator[entry] = new CFixedSizeAllocator(entry * _Granularity + NL_DEFAULT_MEMORY_ALIGNMENT, _MaxAllocSize / size); // an additionnal uint is needed to store size of block } void *block = _ObjectSizeToAllocator[entry]->alloc(); + nlassert(((uintptr_t)block % NL_DEFAULT_MEMORY_ALIGNMENT) == 0); #ifdef NL_DEBUG if (block) { @@ -91,14 +93,14 @@ void *CObjectArenaAllocator::alloc(uint size) ++_AllocID; #endif *(uint *) block = size; - return (void *) ((uint8 *) block + sizeof(uint)); + return (void *) ((uint8 *) block + NL_DEFAULT_MEMORY_ALIGNMENT); } // ***************************************************************************************************************** void CObjectArenaAllocator::free(void *block) { if (!block) return; - uint8 *realBlock = (uint8 *) block - sizeof(uint); // a uint is used at start of block to give its size + uint8 *realBlock = (uint8 *) block - NL_DEFAULT_MEMORY_ALIGNMENT; // sizeof(uint); // a uint is used at start of block to give its size uint size = *(uint *) realBlock; if (size >= _MaxAllocSize) { @@ -107,7 +109,7 @@ void CObjectArenaAllocator::free(void *block) nlassert(it != _MemBlockToAllocID.end()); _MemBlockToAllocID.erase(it); #endif - delete realBlock; + aligned_free(realBlock); return; } uint entry = ((size + (_Granularity - 1)) / _Granularity); diff --git a/code/nel/src/misc/path.cpp b/code/nel/src/misc/path.cpp index f92b0bda7..743f8f514 100644 --- a/code/nel/src/misc/path.cpp +++ b/code/nel/src/misc/path.cpp @@ -25,7 +25,9 @@ #include "nel/misc/xml_pack.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # include diff --git a/code/nel/src/misc/report.cpp b/code/nel/src/misc/report.cpp index 64871e6a3..20b2b1c11 100644 --- a/code/nel/src/misc/report.cpp +++ b/code/nel/src/misc/report.cpp @@ -23,7 +23,9 @@ #include "nel/misc/path.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # include @@ -157,8 +159,10 @@ static LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM // if the dtor call order is not good. //exit(EXIT_SUCCESS); #ifdef NL_OS_WINDOWS +#ifndef NL_COMP_MINGW // disable the Windows popup telling that the application aborted and disable the dr watson report. _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); +#endif #endif // quit without calling atexit or static object dtors. abort(); @@ -232,7 +236,7 @@ TReportResult report (const std::string &title, const std::string &header, const // create the edit control HWND edit = CreateWindowW (L"EDIT", NULL, WS_BORDER | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | ES_READONLY | ES_LEFT | ES_MULTILINE, 7, 70, 429, 212, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (edit, WM_SETFONT, (LONG) font, TRUE); + SendMessage (edit, WM_SETFONT, (WPARAM) font, TRUE); // set the edit text limit to lot of :) SendMessage (edit, EM_LIMITTEXT, ~0U, 0); @@ -246,7 +250,7 @@ TReportResult report (const std::string &title, const std::string &header, const { // create the combo box control checkIgnore = CreateWindowW (L"BUTTON", L"Don't display this report again", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_CHECKBOX, 7, 290, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (checkIgnore, WM_SETFONT, (LONG) font, TRUE); + SendMessage (checkIgnore, WM_SETFONT, (WPARAM) font, TRUE); if(ignoreNextTime) { @@ -256,28 +260,28 @@ TReportResult report (const std::string &title, const std::string &header, const // create the debug button control debug = CreateWindowW (L"BUTTON", L"Debug", WS_CHILD | WS_VISIBLE, 7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (debug, WM_SETFONT, (LONG) font, TRUE); + SendMessage (debug, WM_SETFONT, (WPARAM) font, TRUE); if (debugButton == 0) EnableWindow(debug, FALSE); // create the ignore button control ignore = CreateWindowW (L"BUTTON", L"Ignore", WS_CHILD | WS_VISIBLE, 75+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (ignore, WM_SETFONT, (LONG) font, TRUE); + SendMessage (ignore, WM_SETFONT, (WPARAM) font, TRUE); if (ignoreButton == 0) EnableWindow(ignore, FALSE); // create the quit button control quit = CreateWindowW (L"BUTTON", L"Quit", WS_CHILD | WS_VISIBLE, 75+75+7+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (quit, WM_SETFONT, (LONG) font, TRUE); + SendMessage (quit, WM_SETFONT, (WPARAM) font, TRUE); if (quitButton == 0) EnableWindow(quit, FALSE); // create the debug button control sendReport = CreateWindowW (L"BUTTON", L"Don't send the report", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 7, 315+32, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (sendReport, WM_SETFONT, (LONG) font, TRUE); + SendMessage (sendReport, WM_SETFONT, (WPARAM) font, TRUE); string formatedHeader; if (header.empty()) @@ -302,7 +306,7 @@ TReportResult report (const std::string &title, const std::string &header, const // create the label control HWND label = CreateWindowW (L"STATIC", (LPCWSTR)uc.c_str(), WS_CHILD | WS_VISIBLE /*| SS_WHITERECT*/, 7, 7, 429, 51, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL); - SendMessage (label, WM_SETFONT, (LONG) font, TRUE); + SendMessage (label, WM_SETFONT, (WPARAM) font, TRUE); DebugDefaultBehavior = debugButton==1; diff --git a/code/nel/src/misc/shared_memory.cpp b/code/nel/src/misc/shared_memory.cpp index 2a7f85a8b..7b11fea52 100644 --- a/code/nel/src/misc/shared_memory.cpp +++ b/code/nel/src/misc/shared_memory.cpp @@ -20,7 +20,9 @@ #include "nel/misc/debug.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #else # include diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h index 432ec02b0..b98d92d2a 100644 --- a/code/nel/src/misc/stdmisc.h +++ b/code/nel/src/misc/stdmisc.h @@ -43,9 +43,11 @@ #include #ifdef _WIN32 - #define NOMINMAX - #include - #include +# ifndef __MINGW32__ + #define NOMINMAX +# endif +# include +# include #endif #endif // NL_STDMISC_H diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp index 1fa91db6c..31cde5283 100644 --- a/code/nel/src/misc/system_info.cpp +++ b/code/nel/src/misc/system_info.cpp @@ -19,7 +19,9 @@ #include "nel/misc/system_info.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # include @@ -1484,7 +1486,8 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion) { VS_FIXEDFILEINFO *info; UINT len; - if (_VerQueryValue(&buffer[0], "\\", (VOID**)&info, &len)) + char bslash[] = { '\\', 0x00 }; + if (_VerQueryValue(&buffer[0], bslash, (VOID**)&info, &len)) { driverVersion = (((uint64)info->dwFileVersionMS)<<32)|info->dwFileVersionLS; return true; diff --git a/code/nel/src/misc/system_utils.cpp b/code/nel/src/misc/system_utils.cpp index c60364741..a66eed02f 100644 --- a/code/nel/src/misc/system_utils.cpp +++ b/code/nel/src/misc/system_utils.cpp @@ -18,7 +18,9 @@ #include "nel/misc/system_utils.h" #ifdef NL_OS_WINDOWS - #define NOMINMAX + #ifndef NL_COMP_MINGW + #define NOMINMAX + #endif #include #ifdef _WIN32_WINNT_WIN7 @@ -222,7 +224,7 @@ bool CSystemUtils::supportUnicode() bool CSystemUtils::isAzertyKeyboard() { #ifdef NL_OS_WINDOWS - uint16 klId = uint16((uint32)GetKeyboardLayout(0) & 0xFFFF); + uint16 klId = uint16((uintptr_t)GetKeyboardLayout(0) & 0xFFFF); // 0x040c is French, 0x080c is Belgian if (klId == 0x040c || klId == 0x080c) return true; @@ -312,7 +314,8 @@ bool CSystemUtils::setRegKey(const string &ValueName, const string &Value) HKEY hkey; DWORD dwDisp; - if (RegCreateKeyExA(HKEY_CURRENT_USER, RootKey.c_str(), 0, "", REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &dwDisp) == ERROR_SUCCESS) + char nstr[] = { 0x00 }; + if (RegCreateKeyExA(HKEY_CURRENT_USER, RootKey.c_str(), 0, nstr, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &dwDisp) == ERROR_SUCCESS) { if (RegSetValueExA(hkey, ValueName.c_str(), 0L, REG_SZ, (const BYTE *)Value.c_str(), (DWORD)(Value.size())+1) == ERROR_SUCCESS) res = true; diff --git a/code/nel/src/misc/tds.cpp b/code/nel/src/misc/tds.cpp index 13105f98d..170cda97d 100644 --- a/code/nel/src/misc/tds.cpp +++ b/code/nel/src/misc/tds.cpp @@ -20,7 +20,9 @@ #include "nel/misc/debug.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/src/misc/time_nl.cpp b/code/nel/src/misc/time_nl.cpp index 0ba60c8e2..8aacbd002 100644 --- a/code/nel/src/misc/time_nl.cpp +++ b/code/nel/src/misc/time_nl.cpp @@ -21,7 +21,9 @@ #include "nel/misc/thread.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined (NL_OS_UNIX) # include diff --git a/code/nel/src/misc/win_displayer.cpp b/code/nel/src/misc/win_displayer.cpp index f5c0d9545..95b6b34cf 100644 --- a/code/nel/src/misc/win_displayer.cpp +++ b/code/nel/src/misc/win_displayer.cpp @@ -18,8 +18,9 @@ #include "nel/misc/win_displayer.h" #ifdef NL_OS_WINDOWS - -#define NOMINMAX +#ifndef NL_COMP_MINGW +# define NOMINMAX +#endif #include #include #include @@ -263,7 +264,7 @@ void CWinDisplayer::updateLabels () { access.value()[i].Hwnd = CreateWindowW (L"STATIC", L"", WS_CHILD | WS_VISIBLE | SS_SIMPLE, 0, 0, 0, 0, _HWnd, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(_HWnd, GWLP_HINSTANCE), NULL); } - SendMessage ((HWND)access.value()[i].Hwnd, WM_SETFONT, (LONG) _HFont, TRUE); + SendMessage ((HWND)access.value()[i].Hwnd, WM_SETFONT, (WPARAM)_HFont, TRUE); needResize = true; } @@ -285,7 +286,7 @@ void CWinDisplayer::updateLabels () } } - SendMessage ((HWND)access.value()[i].Hwnd, WM_SETTEXT, 0, (LONG) n.c_str()); + SendMessage ((HWND)access.value()[i].Hwnd, WM_SETTEXT, 0, (LPARAM) n.c_str()); access.value()[i].NeedUpdate = false; } } @@ -422,7 +423,7 @@ void CWinDisplayer::open (string titleBar, bool iconified, sint x, sint y, sint dwStyle |= WS_HSCROLL; _HEdit = CreateWindowExW(WS_EX_OVERLAPPEDWINDOW, RICHEDIT_CLASSW, L"", dwStyle, 0, _ToolBarHeight, w, h-_ToolBarHeight-_InputEditHeight, _HWnd, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(_HWnd, GWLP_HINSTANCE), NULL); - SendMessage (_HEdit, WM_SETFONT, (LONG) _HFont, TRUE); + SendMessage (_HEdit, WM_SETFONT, (WPARAM)_HFont, TRUE); // set the edit text limit to lot of :) SendMessage (_HEdit, EM_LIMITTEXT, -1, 0); @@ -436,7 +437,7 @@ void CWinDisplayer::open (string titleBar, bool iconified, sint x, sint y, sint _HInputEdit = CreateWindowExW(WS_EX_OVERLAPPEDWINDOW, RICHEDIT_CLASSW, L"", WS_CHILD | WS_VISIBLE /*| ES_MULTILINE*/ | ES_WANTRETURN | ES_NOHIDESEL | ES_AUTOHSCROLL, 0, h-_InputEditHeight, w, _InputEditHeight, _HWnd, NULL, (HINSTANCE) GetWindowLongPtr(_HWnd, GWLP_HINSTANCE), NULL); - SendMessageW (_HInputEdit, WM_SETFONT, (LONG) _HFont, TRUE); + SendMessageW (_HInputEdit, WM_SETFONT, (WPARAM)_HFont, TRUE); LRESULT dwEvent = SendMessageW(_HInputEdit, EM_GETEVENTMASK, (WPARAM)0, (LPARAM)0); dwEvent |= ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE; @@ -486,7 +487,7 @@ void CWinDisplayer::clear () SendMessageW (_HEdit, EM_SETSEL, 0, nIndex); // clear all the text - SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LONG) ""); + SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) ""); SendMessageW(_HEdit,EM_SETMODIFY,(WPARAM)TRUE,(LPARAM)0); @@ -535,7 +536,7 @@ void CWinDisplayer::display_main () // store old selection DWORD startSel, endSel; - SendMessage (_HEdit, EM_GETSEL, (LONG)&startSel, (LONG)&endSel); + SendMessage (_HEdit, EM_GETSEL, (WPARAM)&startSel, (LPARAM)&endSel); // find how many lines we have to remove in the current output to add new lines @@ -549,7 +550,7 @@ void CWinDisplayer::display_main () if (nblineremove == _HistorySize) { - SendMessage (_HEdit, WM_SETTEXT, 0, (LONG) ""); + SendMessage (_HEdit, WM_SETTEXT, 0, (LPARAM) ""); startSel = endSel = -1; } else @@ -559,7 +560,7 @@ void CWinDisplayer::display_main () LRESULT oldIndex2 = SendMessageW (_HEdit, EM_LINEINDEX, nblineremove, 0); //nlassert (oldIndex2 != -1); SendMessageW (_HEdit, EM_SETSEL, oldIndex1, oldIndex2); - SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LONG) ""); + SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) ""); // update the selection due to the erasing sint dt = (sint)(oldIndex2 - oldIndex1); @@ -599,7 +600,7 @@ void CWinDisplayer::display_main () } // add the string to the edit control - SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LONG) str.c_str()); + SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) str.c_str()); } // restore old selection diff --git a/code/nel/src/misc/win_event_emitter.cpp b/code/nel/src/misc/win_event_emitter.cpp index bb43e290b..3c74d9241 100644 --- a/code/nel/src/misc/win_event_emitter.cpp +++ b/code/nel/src/misc/win_event_emitter.cpp @@ -22,7 +22,9 @@ #include "nel/misc/event_server.h" #ifdef NL_OS_WINDOWS +#ifndef NL_COMP_MINGW #define NOMINMAX +#endif #include #include diff --git a/code/nel/src/misc/win_thread.cpp b/code/nel/src/misc/win_thread.cpp index d90d081ff..f556779ba 100644 --- a/code/nel/src/misc/win_thread.cpp +++ b/code/nel/src/misc/win_thread.cpp @@ -20,7 +20,9 @@ #ifdef NL_OS_WINDOWS #include "nel/misc/path.h" +#ifndef NL_COMP_MINGW #define NOMINMAX +#endif #include #include diff --git a/code/nel/src/net/buf_client.cpp b/code/nel/src/net/buf_client.cpp index 939dbc89a..350b2d6db 100644 --- a/code/nel/src/net/buf_client.cpp +++ b/code/nel/src/net/buf_client.cpp @@ -24,7 +24,9 @@ #include "nel/net/net_log.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined NL_OS_UNIX # include diff --git a/code/nel/src/net/buf_server.cpp b/code/nel/src/net/buf_server.cpp index 44c966e11..09b061fd4 100644 --- a/code/nel/src/net/buf_server.cpp +++ b/code/nel/src/net/buf_server.cpp @@ -22,7 +22,9 @@ #include "nel/net/net_log.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined NL_OS_UNIX # include diff --git a/code/nel/src/net/buf_sock.cpp b/code/nel/src/net/buf_sock.cpp index e7f07085d..8535435b0 100644 --- a/code/nel/src/net/buf_sock.cpp +++ b/code/nel/src/net/buf_sock.cpp @@ -25,7 +25,9 @@ #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined NL_OS_UNIX # include diff --git a/code/nel/src/net/callback_client.cpp b/code/nel/src/net/callback_client.cpp index bb9261b65..f05648016 100644 --- a/code/nel/src/net/callback_client.cpp +++ b/code/nel/src/net/callback_client.cpp @@ -53,7 +53,7 @@ CCallbackClient::~CCallbackClient() * Recorded : YES * Replayed : MAYBE */ -void CCallbackClient::send (const CMessage &buffer, TSockId hostid, bool log) +void CCallbackClient::send (const CMessage &buffer, TSockId hostid, bool /* log */) { nlassert (hostid == InvalidSockId); // should always be InvalidSockId on client nlassert (connected ()); diff --git a/code/nel/src/net/listen_sock.cpp b/code/nel/src/net/listen_sock.cpp index 8c9802076..7dedd6b97 100644 --- a/code/nel/src/net/listen_sock.cpp +++ b/code/nel/src/net/listen_sock.cpp @@ -22,7 +22,9 @@ #ifdef NL_OS_WINDOWS -#define NOMINMAX +#ifndef NL_COMP_MINGW +# define NOMINMAX +#endif #include typedef sint socklen_t; diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp index 3a6991485..f42806245 100644 --- a/code/nel/src/net/service.cpp +++ b/code/nel/src/net/service.cpp @@ -24,8 +24,10 @@ // these defines is for IsDebuggerPresent(). it'll not compile on windows 95 // just comment this and the IsDebuggerPresent to compile on windows 95 # define _WIN32_WINDOWS 0x0410 -# define WINVER 0x0400 -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define WINVER 0x0400 +# define NOMINMAX +# endif # include # include #elif defined NL_OS_UNIX diff --git a/code/nel/src/net/sock.cpp b/code/nel/src/net/sock.cpp index 2a88ca967..0e2329733 100644 --- a/code/nel/src/net/sock.cpp +++ b/code/nel/src/net/sock.cpp @@ -22,7 +22,9 @@ #include "nel/misc/hierarchical_timer.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include # define socklen_t int diff --git a/code/nel/src/net/stdnet.h b/code/nel/src/net/stdnet.h index 3a67ea783..d18db3222 100644 --- a/code/nel/src/net/stdnet.h +++ b/code/nel/src/net/stdnet.h @@ -17,7 +17,9 @@ #include "nel/misc/types_nl.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include #endif // NL_OS_WINDOWS diff --git a/code/nel/src/net/tcp_sock.cpp b/code/nel/src/net/tcp_sock.cpp index 12948e033..ed04b21b4 100644 --- a/code/nel/src/net/tcp_sock.cpp +++ b/code/nel/src/net/tcp_sock.cpp @@ -21,7 +21,9 @@ #ifdef NL_OS_WINDOWS # include -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # define socklen_t int # define ERROR_NUM WSAGetLastError() diff --git a/code/nel/src/net/udp_sock.cpp b/code/nel/src/net/udp_sock.cpp index a7dcd4483..16b75d929 100644 --- a/code/nel/src/net/udp_sock.cpp +++ b/code/nel/src/net/udp_sock.cpp @@ -21,7 +21,9 @@ #ifdef NL_OS_WINDOWS # include -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # define socklen_t int # define ERROR_NUM WSAGetLastError() diff --git a/code/nel/src/net/unified_network.cpp b/code/nel/src/net/unified_network.cpp index e8af9ceac..788dcdf12 100644 --- a/code/nel/src/net/unified_network.cpp +++ b/code/nel/src/net/unified_network.cpp @@ -36,7 +36,7 @@ namespace NLNET { static size_t ThreadCreator = 0; -static const uint64 AppIdDeadConnection = 0xDEAD; +static const uintptr_t AppIdDeadConnection = 0xDEAD; uint32 TotalCallbackCalled = 0; diff --git a/code/nel/src/sound/driver/openal/driver_openal.def b/code/nel/src/sound/driver/openal/driver_openal.def index 41e42cf9d..a8b0c2781 100644 --- a/code/nel/src/sound/driver/openal/driver_openal.def +++ b/code/nel/src/sound/driver/openal/driver_openal.def @@ -1,4 +1,6 @@ -EXPORTS NLSOUND_createISoundDriverInstance -EXPORTS NLSOUND_interfaceVersion -EXPORTS NLSOUND_outputProfile -EXPORTS NLSOUND_getDriverType +LIBRARY nel_drv_openal_win_r +EXPORTS + NLSOUND_createISoundDriverInstance + NLSOUND_interfaceVersion + NLSOUND_outputProfile + NLSOUND_getDriverType \ No newline at 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 40ea39d0b..82f52b782 100644 --- a/code/nel/src/sound/driver/openal/sound_driver_al.cpp +++ b/code/nel/src/sound/driver/openal/sound_driver_al.cpp @@ -92,7 +92,12 @@ NLMISC_DECL_PURE_LIB(CSoundDriverALNelLibrary) * Sound driver instance creation */ #ifdef NL_OS_WINDOWS - +#ifdef NL_COMP_MINGW +#ifndef NL_STATIC +extern "C" +{ +#endif +#endif // ****************************************************************** #ifdef NL_STATIC @@ -140,7 +145,11 @@ __declspec(dllexport) ISoundDriver::TDriver NLSOUND_getDriverType() } // ****************************************************************** - +#ifdef NL_COMP_MINGW +#ifndef NL_STATIC +} +#endif +#endif #elif defined (NL_OS_UNIX) #ifndef NL_STATIC diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/code/nel/src/sound/driver/sound_driver.cpp index 145344b8a..4a87df307 100644 --- a/code/nel/src/sound/driver/sound_driver.cpp +++ b/code/nel/src/sound/driver/sound_driver.cpp @@ -34,7 +34,9 @@ #endif // HAVE_CONFIG_H #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS @@ -151,7 +153,9 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD switch(driverType) { case DriverFMod: -#if defined (NL_OS_WINDOWS) +#if defined (NL_COMP_MINGW) + dllName = "libnel_drv_fmod_win"; +#elif defined (NL_OS_WINDOWS) dllName = "nel_drv_fmod_win"; #elif defined (NL_OS_UNIX) dllName = "nel_drv_fmod"; @@ -160,7 +164,9 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD #endif // NL_OS_UNIX / NL_OS_WINDOWS break; case DriverOpenAl: -#ifdef NL_OS_WINDOWS +#if defined (NL_COMP_MINGW) + dllName = "libnel_drv_openal_win"; +#elif defined (NL_OS_WINDOWS) dllName = "nel_drv_openal_win"; #elif defined (NL_OS_UNIX) dllName = "nel_drv_openal"; @@ -169,7 +175,9 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD #endif break; case DriverDSound: -#ifdef NL_OS_WINDOWS +#if defined (NL_COMP_MINGW) + dllName = "libnel_drv_dsound_win"; +#elif defined (NL_OS_WINDOWS) dllName = "nel_drv_dsound_win"; #elif defined (NL_OS_UNIX) nlerror("DriverDSound doesn't exist on Unix because it requires DirectX"); @@ -178,7 +186,9 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD #endif break; case DriverXAudio2: -#ifdef NL_OS_WINDOWS +#if defined (NL_COMP_MINGW) + dllName = "libnel_drv_xaudio2_win"; +#elif defined (NL_OS_WINDOWS) dllName = "nel_drv_xaudio2_win"; #elif defined (NL_OS_UNIX) nlerror("DriverXAudio2 doesn't exist on Unix because it requires DirectX"); @@ -187,7 +197,9 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD #endif break; default: -#ifdef NL_OS_WINDOWS +#if defined (NL_COMP_MINGW) + dllName = "libnel_drv_xaudio2_win"; +#elif defined (NL_OS_WINDOWS) dllName = "nel_drv_xaudio2_win"; #elif defined (NL_OS_UNIX) dllName = "nel_drv_openal"; diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h index 6655c57a8..3b46d1b9a 100644 --- a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h @@ -62,7 +62,7 @@ protected: /// Mutex for cross-thread access from XAudio2 callbacks. NLMISC::CMutex _Mutex; /// Unique id for buffer. - uint _LastBufferContext; + uintptr_t _LastBufferContext; /// Current buffer. void *_ValidBufferContext[_BufferNb]; public: diff --git a/code/nel/src/sound/driver/xaudio2/driver_xaudio2.def b/code/nel/src/sound/driver/xaudio2/driver_xaudio2.def index 247ed160f..2a29a2d91 100644 --- a/code/nel/src/sound/driver/xaudio2/driver_xaudio2.def +++ b/code/nel/src/sound/driver/xaudio2/driver_xaudio2.def @@ -1,4 +1,6 @@ -EXPORTS NLSOUND_createISoundDriverInstance -EXPORTS NLSOUND_interfaceVersion -EXPORTS NLSOUND_outputProfile -EXPORTS NLSOUND_getDriverType \ No newline at end of file +LIBRARY nel_drv_xaudio2_win_r +EXPORTS + NLSOUND_createISoundDriverInstance + NLSOUND_interfaceVersion + NLSOUND_outputProfile + NLSOUND_getDriverType \ No newline at 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 c1cdd3729..b95735fc5 100644 --- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp @@ -53,6 +53,14 @@ BOOL WINAPI DllMain(HANDLE hModule, DWORD /* ul_reason_for_call */, LPVOID /* lp // *************************************************************************** +#ifndef NL_STATIC +#ifdef NL_COMP_MINGW +extern "C" { +#endif +#endif + +// *************************************************************************** + #ifdef NL_STATIC ISoundDriver* createISoundDriverInstanceXAudio2 #else @@ -99,6 +107,14 @@ __declspec(dllexport) ISoundDriver::TDriver NLSOUND_getDriverType() // ****************************************************************** +#ifndef NL_STATIC +#ifdef NL_COMP_MINGW +} +#endif +#endif + +// ****************************************************************** + #ifdef NL_DEBUG static XAUDIO2_DEBUG_CONFIGURATION NLSOUND_XAUDIO2_DEBUG_CONFIGURATION_DISABLED = { diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h index d716d91bf..76b2a13d8 100644 --- a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h @@ -25,9 +25,57 @@ #include #include #include +#include // 3rd Party Includes +#include #define XAUDIO2_HELPER_FUNCTIONS + +#ifdef NL_COMP_MINGW +#define __in_bcount(x) +#define __in_bcount_opt(x) +#define __in_ecount(x) +#define __in_xcount(x) +#define __inout_bcount_full(x) +#define __inout_bcount_opt(x) +#define __out_bcount(x) +#define __out_bcount_full(x) +#define __out_bcount_opt(x) +#define __out_bcount_part_opt(x,y) +#define __out_ecount(x) +#define __out_xcount(x) +#define __deref_opt_inout_bcount_part_opt(x,y) +#define __deref_out_bcount(x) +#define __deref_out_bcount_opt(x) +#define __out +#define __in +#define __inout +#define __deref_out +#define __in_opt +#define __inout_opt +#define __out_opt +#define __deref +#define __deref_inout_opt +#define __reserved +#define __XMA2DEFS_INCLUDED__ +#endif /* NL_COMP_MINGW */ + +#include + +#ifdef NL_COMP_MINGW +#undef DEFINE_CLSID +#undef DEFINE_IID +#undef DECLSPEC_UUID_WRAPPER +#define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + class className; \ + __CRT_UUID_DECL(className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) \ + EXTERN_C const GUID CLSID_##className +#define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + interface interfaceName; \ + __CRT_UUID_DECL(interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) \ + EXTERN_C const GUID IID_##interfaceName +#endif /* NL_COMP_MINGW */ + #include #include #include diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index a07e8c53a..2ac0ac1c5 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -1,40 +1,42 @@ IF(WITH_NEL_TOOLS) - + IF(WITH_3D) + SUBDIRS( + anim_builder + animation_set_builder + build_clod_bank + build_clodtex + build_coarse_mesh + build_far_bank + build_shadow_skin + build_smallbank + cluster_viewer + file_info + ig_add + ig_elevation + ig_info + ig_lighter + lightmap_optimizer + zone_dependencies + zone_ig_lighter + zone_lighter + zone_welder + shapes_exporter + shape2obj + zone_check_bind + zone_dump + zviewer) + ENDIF() + SUBDIRS( - build_coarse_mesh - build_far_bank - build_smallbank - ig_lighter - ig_elevation - lightmap_optimizer - zone_dependencies - zone_ig_lighter - zone_lighter - zone_welder - animation_set_builder - anim_builder - build_clod_bank - build_clodtex build_interface - build_shadow_skin - cluster_viewer - file_info get_neighbors - ig_add - ig_info - shapes_exporter tga_cut - tga_resize - shape2obj - zone_check_bind - zone_dump - zviewer) - -ENDIF(WITH_NEL_TOOLS) + tga_resize) +ENDIF() # For tools selection of only max plugins -IF(WIN32) +IF(WIN32 AND WITH_3D) IF(MFC_FOUND) ADD_SUBDIRECTORY(object_viewer) IF(WITH_NEL_MAXPLUGIN) @@ -44,9 +46,9 @@ IF(WIN32) ENDIF(MAXSDK_FOUND) ENDIF(WITH_NEL_MAXPLUGIN) ENDIF(MFC_FOUND) -ENDIF(WIN32) +ENDIF() -IF(WITH_NEL_TOOLS) +IF(WITH_NEL_TOOLS AND WITH_3D) IF(WIN32) # ADD_SUBDIRECTORY(lightmap_optimizer) IF(MFC_FOUND) @@ -71,5 +73,5 @@ IF(WITH_NEL_TOOLS) #crash_log_analyser #shapes_exporter -ENDIF(WITH_NEL_TOOLS) +ENDIF() diff --git a/code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp b/code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp index 9938eb486..b5cd89f76 100644 --- a/code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp +++ b/code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) float bakeFrameRate= 20; if(argc>=5) { - bakeFrameRate= (float)atof(argv[4]); + NLMISC::fromString(argv[4], bakeFrameRate); if(bakeFrameRate<=1) { nlwarning("bad bakeFrameRate value, use a default of 20"); diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index be39b7d17..343673b34 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -113,18 +113,17 @@ void putPixel(uint8 *dst, uint8 *src, bool alphaTransfert) // *************************************************************************** bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y, bool alphaTransfert=true) { - uint32 a, b; - uint8 *rSrcPix = &pSrc->getPixels()[0]; uint8 *rDstPix = &pDst->getPixels()[0]; uint wSrc= pSrc->getWidth(); uint hSrc= pSrc->getHeight(); - for (b = 0; b < hSrc; ++b) - for (a = 0; a < wSrc; ++a) + for (uint b = 0; b < hSrc; ++b) + for (uint a = 0; a < wSrc; ++a) { if (rDstPix[4*((x+a)+(y+b)*pDst->getWidth())+3] != 0) return false; + // write putPixel(rDstPix + 4*((x+a)+(y+b)*pDst->getWidth()), rSrcPix+ 4*(a+b*pSrc->getWidth()), alphaTransfert); } @@ -135,9 +134,9 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y, bo // expand on W if(wSrcgetWidth()), rDstPix + 4*((x+wSrc-1)+(y+b)*pDst->getWidth()), alphaTransfert); } @@ -146,9 +145,9 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y, bo // expand on H if(hSrcgetWidth()), rDstPix + 4*((x+a)+(y+hSrc-1)*pDst->getWidth()), alphaTransfert); } @@ -252,30 +251,38 @@ int main(int nNbArg, char **ppArgs) } vector AllMaps; - sint32 i, j; + sint32 j; // Load all maps sint32 mapSize = (sint32)AllMapNames.size(); AllMaps.resize( mapSize ); - for( i = 0; i < mapSize; ++i ) + for(sint i = 0; i < mapSize; ++i ) { + NLMISC::CBitmap *pBtmp = NULL; + try { - NLMISC::CBitmap *pBtmp = new NLMISC::CBitmap; + pBtmp = new NLMISC::CBitmap; NLMISC::CIFile inFile; - inFile.open( AllMapNames[i] ); - pBtmp->load(inFile); + if (!inFile.open( AllMapNames[i] )) throw NLMISC::Exception("Unable to open " + AllMapNames[i]); + + uint8 colors = pBtmp->load(inFile); + + if (colors != 32) throw NLMISC::Exception(AllMapNames[i] + " is using " + toString(colors) + " bits colors, only 32 bit supported!"); + AllMaps[i] = pBtmp; } catch (const NLMISC::Exception &e) { + if (pBtmp) delete pBtmp; + outString (string("ERROR :") + e.what()); return -1; } } // Sort all maps by decreasing size - for (i = 0; i < mapSize-1; ++i) + for (sint i = 0; i < mapSize-1; ++i) for (j = i+1; j < mapSize; ++j) { NLMISC::CBitmap *pBI = AllMaps[i]; @@ -303,7 +310,7 @@ int main(int nNbArg, char **ppArgs) vector UVMin, UVMax; UVMin.resize (mapSize, NLMISC::CUV(0.0f, 0.0f)); UVMax.resize (mapSize, NLMISC::CUV(0.0f, 0.0f)); - for (i = 0; i < mapSize; ++i) + for (sint i = 0; i < mapSize; ++i) { sint32 x, y; while (!tryAllPos(AllMaps[i], &GlobalMask, x, y)) @@ -349,7 +356,7 @@ int main(int nNbArg, char **ppArgs) } // Convert UV from pixel to ratio - for (i = 0; i < mapSize; ++i) + for (sint i = 0; i < mapSize; ++i) { UVMin[i].U = UVMin[i].U / (float)GlobalTexture.getWidth(); UVMin[i].V = UVMin[i].V / (float)GlobalTexture.getHeight(); @@ -394,7 +401,7 @@ int main(int nNbArg, char **ppArgs) FILE *f = fopen (fmtName.c_str(), "wt"); if (f != NULL) { - for (i = 0; i < mapSize; ++i) + for (sint i = 0; i < mapSize; ++i) { // get the string whitout path string fileName= CFile::getFilename(AllMapNames[i]); @@ -442,6 +449,8 @@ int main(int nNbArg, char **ppArgs) nlwarning("Can't parse %s", bufTmp); continue; } + + sint i; sTGAname = toLower(string(tgaName)); string findTGAName; diff --git a/code/nel/tools/3d/cluster_viewer/view_cs.cpp b/code/nel/tools/3d/cluster_viewer/view_cs.cpp index abe54ada5..5e31543ca 100644 --- a/code/nel/tools/3d/cluster_viewer/view_cs.cpp +++ b/code/nel/tools/3d/cluster_viewer/view_cs.cpp @@ -38,7 +38,9 @@ #include "nel/3d/event_mouse_listener.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/tools/3d/object_viewer/edit_ex.cpp b/code/nel/tools/3d/object_viewer/edit_ex.cpp index c600334b0..71d5b8907 100644 --- a/code/nel/tools/3d/object_viewer/edit_ex.cpp +++ b/code/nel/tools/3d/object_viewer/edit_ex.cpp @@ -67,7 +67,9 @@ uint CEditEx::getUInt() const float CEditEx::getFloat() const { nlassert(_Type == FloatType); - return (float) ::atof(getString().c_str()); + float val; + NLMISC::fromString(getString(), val); + return val; } std::string CEditEx::getString() const diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cpp b/code/nel/tools/3d/object_viewer/object_viewer.cpp index ff530e007..d79090662 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.cpp +++ b/code/nel/tools/3d/object_viewer/object_viewer.cpp @@ -598,7 +598,11 @@ bool CObjectViewer::initUI (HWND parent) // initialize NeL context if needed if (!NLMISC::INelContext::isContextInitialised()) - new NLMISC::CApplicationContext; + { + new NLMISC::CApplicationContext(); + nldebug("NeL Object Viewer: initUI"); + NLMISC::CSheetId::initWithoutSheet(); + } // The fonts manager _FontManager.setMaxMemory(2000000); @@ -676,9 +680,12 @@ bool CObjectViewer::initUI (HWND parent) view->MainFrame = _MainFrame; _MainFrame->ShowWindow (SW_SHOW); + + RECT viewportRect; + GetClientRect(view->m_hWnd, &viewportRect); // Init NELU - if (!CNELU::init (640, 480, viewport, 32, true, view->m_hWnd, false, _Direct3d)) + if (!CNELU::init (viewportRect.right, viewportRect.bottom, viewport, 32, true, view->m_hWnd, false, _Direct3d)) { return false; } diff --git a/code/nel/tools/3d/object_viewer/vegetable_density_page.cpp b/code/nel/tools/3d/object_viewer/vegetable_density_page.cpp index 72e53756b..2db682bcd 100644 --- a/code/nel/tools/3d/object_viewer/vegetable_density_page.cpp +++ b/code/nel/tools/3d/object_viewer/vegetable_density_page.cpp @@ -225,7 +225,8 @@ void CVegetableDensityPage::updateAngleMinFromEditText() // get angles edited. char stmp[256]; AngleMinEdit.GetWindowText(stmp, 256); - float angleMin= (float)atof(stmp); + float angleMin; + NLMISC::fromString(stmp, angleMin); NLMISC::clamp(angleMin, -90, 90); // make a sinus, because 90 => 1, and -90 =>-1 float cosAngleMin= (float)sin(angleMin*NLMISC::Pi/180.f); @@ -248,7 +249,8 @@ void CVegetableDensityPage::updateAngleMaxFromEditText() // get angles edited. char stmp[256]; AngleMaxEdit.GetWindowText(stmp, 256); - float angleMax= (float)atof(stmp); + float angleMax; + NLMISC::fromString(stmp, angleMax); NLMISC::clamp(angleMax, -90, 90); // make a sinus, because 90 => 1, and -90 =>-1 float cosAngleMax= (float)sin(angleMax*NLMISC::Pi/180.f); diff --git a/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp b/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp index 7378fc8ca..fcb2317fd 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp @@ -20,6 +20,7 @@ #include "nel/misc/app_context.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include +#include "nel/misc/sheet_id.h" extern ClassDesc2* GetCNelExportDesc(); @@ -34,6 +35,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Export: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } hInstance = hinstDLL; // Hang on to this DLL's instance handle. diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp index 68d3b8b2b..3a3e40810 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp @@ -173,7 +173,7 @@ INT_PTR CALLBACK OptionsDialogCallback ( if( SendMessage( GetDlgItem(hwndDlg,IDC_RADIORADIOSITYEXPORTLIGHTING), BM_GETCHECK, 0, 0 ) == BST_CHECKED ) theExportSceneStruct.nExportLighting = 1; SendMessage( GetDlgItem(hwndDlg,IDC_EDITLUMELSIZE), WM_GETTEXT, 1024, (long)tmp ); - theExportSceneStruct.rLumelSize = (float)atof( tmp ); + NLMISC::fromString(tmp, theExportSceneStruct.rLumelSize); if( SendMessage( GetDlgItem(hwndDlg,IDC_RADIOSS1), BM_GETCHECK, 0, 0 ) == BST_CHECKED ) theExportSceneStruct.nOverSampling = 1; @@ -192,9 +192,9 @@ INT_PTR CALLBACK OptionsDialogCallback ( // SurfaceLighting theExportSceneStruct.bTestSurfaceLighting= (SendMessage( GetDlgItem(hwndDlg,IDC_TEST_SURFACE_LIGHT), BM_GETCHECK, 0, 0 ) == BST_CHECKED); SendMessage( GetDlgItem(hwndDlg,IDC_EDITCELLSIZE), WM_GETTEXT, 1024, (long)tmp ); - theExportSceneStruct.SurfaceLightingCellSize= (float)atof( tmp ); + NLMISC::fromString(tmp, theExportSceneStruct.SurfaceLightingCellSize); SendMessage( GetDlgItem(hwndDlg,IDC_EDITCELLDELTAZ), WM_GETTEXT, 1024, (long)tmp ); - theExportSceneStruct.SurfaceLightingDeltaZ= (float)atof( tmp ); + NLMISC::fromString(tmp, theExportSceneStruct.SurfaceLightingDeltaZ); // End the dialog EndDialog(hwndDlg, TRUE); diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc index a2f49f0da..bf3c4a12f 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc @@ -575,8 +575,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 117 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -591,16 +591,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "TECH: \0" - VALUE "CompanyName", "\0" - VALUE "FileVersion", "1, 0, 0, 117\0" + VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" + VALUE "CompanyName", "Ryzom Core\0" + VALUE "FileVersion", "0.9.1\0" VALUE "InternalName", "CNelExport\0" VALUE "LegalCopyright", "\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "CNelExport.dlu\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "3D Studio MAX\0" - VALUE "ProductVersion", "3.0.0.0\0" + VALUE "ProductName", "Ryzom Core\0" + VALUE "ProductVersion", "0.9.1\0" VALUE "SpecialBuild", "\0" END END diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp index 155bbe5b5..d6bdbb690 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp @@ -293,16 +293,19 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime) for (sint i = 0; i < exclusionList.Count(); ++i) { INode *exclNode = exclusionList[i]; - string tmp = exclNode->GetName(); - this->setExclusion.insert(tmp); + if (exclNode) // Crashfix // FIXME: Why is this NULL? + { + string tmp = exclNode->GetName(); + this->setExclusion.insert(tmp); + } } #endif // (MAX_RELEASE < 4000) // Get Soft Shadow information string sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_RADIUS, toString(NEL3D_APPDATA_SOFTSHADOW_RADIUS_DEFAULT)); - this->rSoftShadowRadius = (float)atof(sTmp.c_str()); + NLMISC::fromString(sTmp, this->rSoftShadowRadius); sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_CONELENGTH, toString(NEL3D_APPDATA_SOFTSHADOW_CONELENGTH_DEFAULT)); - this->rSoftShadowConeLength = (float)atof(sTmp.c_str()); + NLMISC::fromString(sTmp, this->rSoftShadowConeLength); if( deleteIt ) maxLight->DeleteThis(); @@ -2147,7 +2150,8 @@ bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshB // **** Retrieve Shape Node properties string sLumelSizeMul = CExportNel::getScriptAppData (&ZeNode, NEL3D_APPDATA_LUMELSIZEMUL, "1.0"); - float rLumelSizeMul = (float)atof(sLumelSizeMul.c_str()); + float rLumelSizeMul; + NLMISC::fromString(sLumelSizeMul, rLumelSizeMul); // 8Bits LightMap Compression bool lmcEnabled= CExportNel::getScriptAppData (&ZeNode, NEL3D_APPDATA_EXPORT_LMC_ENABLED, BST_UNCHECKED)==BST_CHECKED; enum {NumLightGroup= 3}; diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp index 738e6b724..5997006d5 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp @@ -508,14 +508,13 @@ std::string CExportNel::getName (MtlBase& mtl) // -------------------------------------------------- // Get the node name -std::string CExportNel::getName (INode& mtl) +std::string CExportNel::getName(INode& node) { // Return its name - TCHAR* name=mtl.GetName(); - return std::string (name); + MCHAR* name = node.GetName(); + return std::string(name); } - // -------------------------------------------------- // Get the NEL node name diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp index f8dce3ac6..3708a0906 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp @@ -18,64 +18,17 @@ #include "export_nel.h" #include "export_appdata.h" #include "nel/3d/skeleton_shape.h" +#include "iskin.h" using namespace NLMISC; using namespace NL3D; // *************************************************************************** -#define SKIN_INTERFACE 0x00010000 - -// *************************************************************************** - -#define SKIN_CLASS_ID Class_ID(9815843,87654) #define PHYSIQUE_CLASS_ID Class_ID(PHYSIQUE_CLASS_ID_A, PHYSIQUE_CLASS_ID_B) // *************************************************************************** -class ISkinContextData -{ -public: - virtual int GetNumPoints()=0; - virtual int GetNumAssignedBones(int vertexIdx)=0; - virtual int GetAssignedBone(int vertexIdx, int boneIdx)=0; - virtual float GetBoneWeight(int vertexIdx, int boneIdx)=0; - - virtual int GetSubCurveIndex(int vertexIdx, int boneIdx)=0; - virtual int GetSubSegmentIndex(int vertexIdx, int boneIdx)=0; - virtual float GetSubSegmentDistance(int vertexIdx, int boneIdx)=0; - virtual Point3 GetTangent(int vertexIdx, int boneIdx)=0; - virtual Point3 GetOPoint(int vertexIdx, int boneIdx)=0; - - virtual void SetWeight(int vertexIdx, int boneIdx, float weight)=0; - virtual void SetWeight(int vertexIdx, INode* bone, float weight)=0; - virtual void SetWeights(int vertexIdx, Tab boneIdx, Tab weights)=0; - virtual void SetWeights(int vertexIdx, INodeTab boneIdx, Tab weights)=0; - -}; - -// *************************************************************************** - -class ISkin -{ -public: - ISkin() {} - ~ISkin() {} - virtual int GetBoneInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0; - virtual int GetSkinInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0; - virtual int GetNumBones()=0; - virtual INode *GetBone(int idx)=0; - virtual DWORD GetBoneProperty(int idx)=0; - virtual ISkinContextData *GetContextInterface(INode *pNode)=0; - - virtual BOOL AddBone(INode *bone)=0; - virtual BOOL AddBones(INodeTab *bones)=0; - virtual BOOL RemoveBone(INode *bone)=0; - virtual void Invalidate()=0; -}; - -// *************************************************************************** - void CExportNel::buildSkeletonShape (CSkeletonShape& skeletonShape, INode& node, mapBoneBindPos* mapBindPos, TInodePtrInt& mapId, TimeValue time) { @@ -410,7 +363,8 @@ void CExportNel::buildSkeleton (std::vector& bonesArray, INode& node, bonesArray.push_back (bone); // **** Call on child - for (int children=0; childrenIsEnabled()) { // Get a com_skin2 interface - ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); + ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN); // Found com_skin2 ? if (comSkinInterface) @@ -446,7 +400,7 @@ bool CExportNel::isSkin (INode& node) ok=true; // Release the interface - skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); + skin->ReleaseInterface (I_SKIN, comSkinInterface); } } } @@ -490,7 +444,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt uint ok=NoError; // Get the skin modifier - Modifier* skin=getModifier (&node, SKIN_CLASS_ID); + Modifier* skin=getModifier (&node, SKIN_CLASSID); // Build a the name array buildMesh.BonesNames.resize (skeletonShape.size()); @@ -513,7 +467,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt // ********** COMSKIN EXPORT ********** // Get a com_skin2 interface - ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); + ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN); // Should been controled with isSkin before. nlassert (comSkinInterface); @@ -645,7 +599,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt } // Release the interface - skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); + skin->ReleaseInterface (I_SKIN, comSkinInterface); } else { @@ -881,13 +835,13 @@ INode* CExportNel::getSkeletonRootBone (INode& node) INode* ret=NULL; // Get the skin modifier - Modifier* skin=getModifier (&node, SKIN_CLASS_ID); + Modifier* skin=getModifier (&node, SKIN_CLASSID); // Found it ? if (skin) { // Get a com_skin2 interface - ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); + ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN); // Found com_skin2 ? if (comSkinInterface) @@ -921,7 +875,7 @@ INode* CExportNel::getSkeletonRootBone (INode& node) } // Release the interface - skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); + skin->ReleaseInterface (I_SKIN, comSkinInterface); } } else @@ -961,40 +915,47 @@ INode* CExportNel::getSkeletonRootBone (INode& node) // Get a vertex interface IPhyVertexExport *vertexInterface=localData->GetVertexInterface (vtx); - // Check if it is a rigid vertex or a blended vertex - int type=vertexInterface->GetVertexType (); - if (type==RIGID_TYPE) + if (vertexInterface) { - // this is a rigid vertex - IPhyRigidVertex *rigidInterface=(IPhyRigidVertex*)vertexInterface; - - // Get the bone - INode *newBone=rigidInterface->GetNode(); - - // Get the root of the hierarchy - ret=getRoot (newBone); - found=true; - break; - } - else - { - // It must be a blendable vertex - nlassert (type==RIGID_BLENDED_TYPE); - IPhyBlendedRigidVertex *blendedInterface=(IPhyBlendedRigidVertex*)vertexInterface; - - // For each bones - uint bone; - uint count=(uint)blendedInterface->GetNumberNodes (); - for (bone=0; boneGetVertexType (); + if (type==RIGID_TYPE) { - // Get the bone pointer - INode *newBone=blendedInterface->GetNode(bone); + // this is a rigid vertex + IPhyRigidVertex *rigidInterface=(IPhyRigidVertex*)vertexInterface; + + // Get the bone + INode *newBone=rigidInterface->GetNode(); // Get the root of the hierarchy ret=getRoot (newBone); found=true; break; } + else + { + // It must be a blendable vertex + nlassert (type==RIGID_BLENDED_TYPE); + IPhyBlendedRigidVertex *blendedInterface=(IPhyBlendedRigidVertex*)vertexInterface; + + // For each bones + uint bone; + uint count=(uint)blendedInterface->GetNumberNodes (); + for (bone=0; boneGetNode(bone); + + // Get the root of the hierarchy + ret=getRoot (newBone); + found=true; + break; + } + } + } + else + { + nlwarning("Physique vertex interface NULL"); } // Release vertex interfaces @@ -1030,13 +991,13 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind uint ok=NoError; // Get the skin modifier - Modifier* skin=getModifier (&skinedNode, SKIN_CLASS_ID); + Modifier* skin=getModifier (&skinedNode, SKIN_CLASSID); // Found it ? if (skin) { // Get a com_skin2 interface - ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); + ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN); // Should been controled with isSkin before. nlassert (comSkinInterface); @@ -1082,7 +1043,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind } // Release the interface - skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); + skin->ReleaseInterface (I_SKIN, comSkinInterface); } } else @@ -1267,7 +1228,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind } // Release the interface - skin->ReleaseInterface (SKIN_INTERFACE, physiqueInterface); + skin->ReleaseInterface (I_SKIN, physiqueInterface); } } } @@ -1279,7 +1240,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind void CExportNel::enableSkinModifier (INode& node, bool enable) { // Get the skin modifier - Modifier* skin=getModifier (&node, SKIN_CLASS_ID); + Modifier* skin=getModifier (&node, SKIN_CLASSID); // Found it ? if (skin) diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp index 0fe5bc556..715e35618 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp @@ -21,6 +21,7 @@ #include "nel/misc/app_context.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include +#include "nel/misc/sheet_id.h" extern ClassDesc2* GetPO2RPODesc(); extern ClassDesc* GetRPODesc(); @@ -44,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Export: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } if(fdwReason == DLL_PROCESS_ATTACH) diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc index 619028a99..d921a6c36 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc +++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc @@ -85,8 +85,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,0,0 - PRODUCTVERSION 0,6,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -101,14 +101,14 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "http://www.opennel.org/" + VALUE "Comments", "http://www.ryzomcore.org/" VALUE "FileDescription", "PatchMesh to RykolPatchMesh" - VALUE "FileVersion", "0.6.0" + VALUE "FileVersion", "0.9.1" VALUE "InternalName", "PatchMesh to RykolPatchMesh" VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd." VALUE "OriginalFilename", "nel_convert_patch.dlm" VALUE "ProductName", "NeL Patch Converter" - VALUE "ProductVersion", "0.6.0" + VALUE "ProductVersion", "0.9.1" END END BLOCK "VarFileInfo" diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc index 324c82139..0acebb752 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc +++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc @@ -514,8 +514,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,50 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -530,15 +530,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Nevrax Ltd." - VALUE "FileDescription", "Standard modifiers (plugin)" - VALUE "FileVersion", "1, 0, 0, 50" + VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" + VALUE "CompanyName", "Ryzom Core" + VALUE "FileDescription", "NeL Patch Edit" + VALUE "FileVersion", "0.9.1" VALUE "InternalName", "neleditpatch" VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc." VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX. The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF." VALUE "OriginalFilename", "neleditpatch.dlm" - VALUE "ProductName", "3D Studio MAX" - VALUE "ProductVersion", "3.0.0.0" + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", "0.9.1" END END BLOCK "VarFileInfo" diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp index 788c0d649..0d16dd149 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp @@ -18,6 +18,7 @@ #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include +#include "nel/misc/sheet_id.h" HINSTANCE hInstance; int controlsInit = FALSE; @@ -32,6 +33,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Patch Edit: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } if (fdwReason == DLL_PROCESS_ATTACH) diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp index e0ae7c0fa..7afde8938 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp @@ -4,6 +4,7 @@ #include "nel/misc/app_context.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include +#include "nel/misc/sheet_id.h" HINSTANCE hInstance; int controlsInit = FALSE; @@ -18,6 +19,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Patch Paint: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } hInstance = hinstDLL; diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc index c984f2541..bdde6c31d 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc +++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc @@ -96,8 +96,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 51 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -112,17 +112,18 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN + VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" VALUE "Comments", "TECH: cyril.corvazier\0" - VALUE "CompanyName", "Nevrax Ltd\0" - VALUE "FileDescription", "Standard modifiers (plugin)\0" - VALUE "FileVersion", "1, 0, 0, 51\0" + VALUE "CompanyName", "Ryzom Core\0" + VALUE "FileDescription", "NeL Patch Paint\0" + VALUE "FileVersion", "0.9.1\0" VALUE "InternalName", "mods\0" - VALUE "LegalCopyright", "Copyright © 1998 Nevrax Ltd\0" + VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nelpatchpaint.dlm\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "3D Studio MAX\0" - VALUE "ProductVersion", "3.0.0.0\0" + VALUE "ProductName", "Ryzom Core\0" + VALUE "ProductVersion", "0.9.1\0" VALUE "SpecialBuild", "\0" END END diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp index 0fdf6db75..ad5393cf5 100644 --- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp +++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp @@ -1,6 +1,7 @@ #include "vertex_tree_paint.h" #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include +#include "nel/misc/sheet_id.h" HINSTANCE hInstance; @@ -12,6 +13,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Vertex Tree Paint: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } hInstance = hinstDLL; // Hang on to this DLL's instance handle. diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc index bb9d2cce7..bf23b28e6 100644 --- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc +++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc @@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR CURSOR DISCARDABLE "dropcurs.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,1,0,0 - PRODUCTVERSION 3,1,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -141,16 +141,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "TECH: Christer Janson\0" - VALUE "CompanyName", "Kinetix, a division of Autodesk, Inc.\0" - VALUE "FileDescription", "Vertex Color Paint (plugin)\0" - VALUE "FileVersion", "3.1.0.0\0" - VALUE "InternalName", "VertexPaint\0" - VALUE "LegalCopyright", "Copyright © 1998 Autodesk Inc.\0" + VALUE "Comments", "Based on Kinetix 3D Studio Max 3.1 plugin sample\0" + VALUE "Comments", "TECH: \0" + VALUE "CompanyName", "Ryzom Core\0" + VALUE "FileDescription", "Vertex Tree Paint\0" + VALUE "FileVersion", "0.9.1\0" + VALUE "InternalName", "VertexTreePaint\0" + VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0" VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX. The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0" VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0" - VALUE "ProductName", "3D Studio MAX\0" - VALUE "ProductVersion", "3.1.0.0\0" + VALUE "ProductName", "Ryzom Core\0" + VALUE "ProductVersion", "0.9.1\0" END END BLOCK "VarFileInfo" diff --git a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms b/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms index 06021c45f..95c76c894 100644 --- a/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms +++ b/code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms @@ -545,7 +545,7 @@ plugin material NelMaterial rollout nelBasicParameters "NeL Basic Parameters" rolledUp:false ( Label lblNlbpA "NeL Material" align:#center across:3 - Label lblNlbpB "http://dev.ryzom.com/" align:#center + Label lblNlbpB "http://www.ryzomcore.org/" align:#center CheckBox cbTwoSided "2-Sided" checked:false align:#right group "Standard Lighting" @@ -595,7 +595,7 @@ plugin material NelMaterial cpSelfIllumColor.visible = bUseSelfIllumColor ) else - ( + ( bTwoSided = cbTwoSided.checked cAmbient = cpAmbient.color cDiffuse = cpDiffuse.color @@ -607,6 +607,9 @@ plugin material NelMaterial pSelfIllumAmount = spSelfIllumAmount.value bUseSelfIllumColor = cbUseSelfIllumColor.checked + spSelfIllumAmount.visible = not cbUseSelfIllumColor.checked + cpSelfIllumColor.visible = cbUseSelfIllumColor.checked + delegate.twoSided = bTwoSided delegate.ambient = cAmbient delegate.diffuse = cDiffuse @@ -2211,6 +2214,18 @@ plugin material NelMaterial on create do ( + -- Load from Standard + bTwoSided = delegate.twoSided + cAmbient = delegate.ambient + cDiffuse = delegate.diffuse + pOpacity = delegate.opacity + cSpecular = delegate.specular + pSpecularLevel = delegate.specularLevel + pGlossiness = delegate.glossiness + cSelfIllumColor = delegate.selfIllumColor + pSelfIllumAmount = delegate.selfIllumAmount + bUseSelfIllumColor = delegate.useSelfIllumColor + -- Single shader loadShader ShaderSingleTexture ) diff --git a/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp b/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp index fbd53ca37..eb39f7cb0 100644 --- a/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp +++ b/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp @@ -21,6 +21,7 @@ #include "../nel_3dsmax_shared/nel_3dsmax_shared.h" #include #include +#include "nel/misc/sheet_id.h" extern ClassDesc2* GetTile_utilityDesc(); extern ClassDesc* GetRGBAddDesc(); @@ -41,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) { new NLMISC::CLibraryContext(GetSharedNelContext()); nldebug("NeL Tile Utility: DllMain"); + NLMISC::CSheetId::initWithoutSheet(); } hInstance = hinstDLL; // Hang on to this DLL's instance handle. diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc index f727c9bf2..7615f379f 100644 --- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc +++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc @@ -124,8 +124,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 56 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 0, 9, 1, 0 + PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -140,13 +140,14 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "\0" - VALUE "FileVersion", "1, 0, 0, 56\0" + VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" + VALUE "CompanyName", "Ryzom Core\0" + VALUE "FileVersion", "0.9.1\0" VALUE "InternalName", "Tile_utility\0" VALUE "LegalCopyright", "\0" VALUE "OriginalFilename", "Tile_utility.dlu\0" - VALUE "ProductName", "3D Studio MAX\0" - VALUE "ProductVersion", "3.0.0.0\0" + VALUE "ProductName", "Ryzom Core\0" + VALUE "ProductVersion", "0.9.1\0" VALUE "FileDescription", "Create material for tiles\0" VALUE "Comments", "TECH: \0" VALUE "LegalTrademarks", "\0" diff --git a/code/nel/tools/3d/shapes_exporter/main.cpp b/code/nel/tools/3d/shapes_exporter/main.cpp index 183bd8a49..56249e357 100644 --- a/code/nel/tools/3d/shapes_exporter/main.cpp +++ b/code/nel/tools/3d/shapes_exporter/main.cpp @@ -20,7 +20,9 @@ #include "shapes_exporter.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp index 6becf5e7b..292280349 100644 --- a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp +++ b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp @@ -61,6 +61,10 @@ uint8 getType(const std::string &sFileNameDest) return NOT_DEFINED; } +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(dds); +#endif + if (fread(&h,sizeof(CS3TCCompressor::DDS_HEADER),1,f) != 1) { fclose(f); diff --git a/code/nel/tools/3d/zviewer/zviewer.cpp b/code/nel/tools/3d/zviewer/zviewer.cpp index d1711c286..9d64badb1 100644 --- a/code/nel/tools/3d/zviewer/zviewer.cpp +++ b/code/nel/tools/3d/zviewer/zviewer.cpp @@ -41,8 +41,10 @@ #include #ifdef NL_OS_WINDOWS - #define NOMINMAX - #include +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif +# include #endif // NL_OS_WINDOWS using namespace std; @@ -981,7 +983,7 @@ int main(int /* argc */, char ** /* argv */) ViewerCfg.FontManager.setMaxMemory(2000000); displayZones(); - + // release nelu NL3D::CNELU::release(); } diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index abc5dff02..2c1f641a0 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -6,9 +6,7 @@ IF(WITH_NEL_TOOLS) ENDIF(WITH_NEL_TOOLS) # Max plugins are under the 3d directory as well. -IF(WITH_3D) - ADD_SUBDIRECTORY(3d) -ENDIF(WITH_3D) +ADD_SUBDIRECTORY(3d) # Don't add other subdirectories if only max plugins are selected. IF(WITH_NEL_TOOLS) diff --git a/code/nel/tools/build_gamedata/configuration/scripts.py b/code/nel/tools/build_gamedata/configuration/scripts.py index d7122d3a3..02f13139c 100755 --- a/code/nel/tools/build_gamedata/configuration/scripts.py +++ b/code/nel/tools/build_gamedata/configuration/scripts.py @@ -282,6 +282,26 @@ def findFilesNoSubdir(log, dir_where, file_ext): printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull) return result +def findFilesNoSubdirFiltered(log, dir_where, file_ext, filter): + if len(filter) == 0: + return findFilesNoSubdir(log, dir_where, file_ext) + result = [ ] + files = os.listdir(dir_where) + len_file_ext = len(file_ext) + for fileName in files: + if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*": + fileFull = dir_where + "/" + fileName + if os.path.isfile(fileFull): + if fileName[-len_file_ext:].lower() == file_ext.lower(): + fileNameLower = fileName.lower() + for filterWord in filter: + if filterWord in fileNameLower: + result += [ fileName ] + break + elif not os.path.isdir(fileFull): + printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull) + return result + def findFile(log, dir_where, file_name): files = os.listdir(dir_where) for fileName in files: @@ -323,6 +343,31 @@ def needUpdateDirByLowercaseTagLog(log, dir_source, ext_source, dir_dest, ext_de printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles))) return 0 +def needUpdateDirByTagLogFiltered(log, dir_source, ext_source, dir_dest, ext_dest, filter): + updateCount = 0 + skipCount = 0 + lenSrcExt = len(ext_source) + sourceFiles = findFilesNoSubdirFiltered(log, dir_source, ext_source, filter) + destFiles = findFilesNoSubdir(log, dir_dest, ext_dest) + for file in sourceFiles: + sourceFile = dir_source + "/" + file + tagFile = dir_dest + "/" + file[0:-lenSrcExt] + ext_dest + if os.path.isfile(tagFile): + sourceTime = os.stat(sourceFile).st_mtime + tagTime = os.stat(tagFile).st_mtime + if (sourceTime > tagTime): + updateCount = updateCount + 1 + else: + skipCount = skipCount + 1 + else: + updateCount = updateCount + 1 + if updateCount > 0: + printLog(log, "UPDATE " + str(updateCount) + " / " + str(len(sourceFiles)) + "; SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles))) + return 1 + else: + printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles))) + return 0 + def needUpdateDirByTagLog(log, dir_source, ext_source, dir_dest, ext_dest): updateCount = 0 skipCount = 0 diff --git a/code/nel/tools/build_gamedata/processes/ligo/1_export.py b/code/nel/tools/build_gamedata/processes/ligo/1_export.py index 8204926ac..029121478 100755 --- a/code/nel/tools/build_gamedata/processes/ligo/1_export.py +++ b/code/nel/tools/build_gamedata/processes/ligo/1_export.py @@ -62,7 +62,7 @@ if LigoExportLand == "" or LigoExportOnePass == 1: mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory) mkPath(log, DatabaseDirectory + "/" + ZoneSourceDirectory[0]) mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory) - if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory, ".max.tag")): + if (needUpdateDirByTagLogFiltered(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory, ".max.tag", [ "zonematerial", "zonetransition", "zonespecial" ])): printLog(log, "WRITE " + ligoIniPath) ligoIni = open(ligoIniPath, "w") ligoIni.write("[LigoConfig]\n") diff --git a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms index 303b4917f..4b25c1427 100755 --- a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms +++ b/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms @@ -233,6 +233,15 @@ fn exportCollisionsFromZone outputNelDir filename = if (isToBeExportedCollision m) == true then selectmore m ) + for node in objects where classOf node == XRefObject do + ( + sourceObject = node.GetSourceObject false + if (superclassOf sourceObject == GeometryClass) then + ( + if (isToBeExportedCollision node) == true then + selectmore node + ) + ) -- Export the collision if (NelExportCollision ($selection as array) outputNelDir) == false then @@ -311,10 +320,10 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi -- Scan all the ig in this project nlerror("Scan all the ig in this project") - for node in geometry do + for node in objects do ( ig = getIg node - nlerror("geometry node") + nlerror("object node") if ( (ig != undefined) and (ig != "") and ( (igName == "") or (ig == igName) ) ) then ( nlerror("Found something with an IG name") @@ -347,71 +356,6 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi ) ) - for node in lights do - ( - ig = getIg node - - if ( (ig != undefined) and (ig != "") and ( (igName == "") or ( ig == igName) ) ) then - ( - -- Transition ? - if ( ig == IgName) then - ( - -- Transform the object - node.transform = buildTransitionMatrixObj node.transform transitionZone cellSize - ) - - -- Found ? - found = false - - -- Already found ? - for j = 1 to ig_array.count do - ( - if (ig_array[j]==ig) then - ( - found = true - ) - ) - - -- Found ? - if (found == false) then - ( - append ig_array ig - ) - ) - ) - - for node in helpers do - ( - ig = getIg node - if ( (ig != undefined) and (ig != "") and ( (igName == "") or (ig == igName) ) ) then - ( - -- Transition ? - if (ig == IgName) then - ( - -- Transform the object - node.transform = buildTransitionMatrixObj node.transform transitionZone cellSize - ) - - -- Found ? - found = false - -- Already found ? - for j = 1 to ig_array.count do - ( - if (ig_array[j]==ig) then - ( - found = true - ) - ) - -- Found ? - if (found == false) then - ( - append ig_array ig - ) - ) - ) - - - -- Have some ig ? if (ig_array.count != 0) then ( @@ -429,6 +373,29 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi -- Select none max select none + for node in objects where classOf node == XRefObject do + ( + if ((getIg node) == ig_array[ig]) then + ( + sourceObject = node.GetSourceObject false + if (classOf sourceObject == XRefObject) then + ( + nlerror("FAIL XREF STILL XREF " + node.name) + ) + else if (superclassOf sourceObject == GeometryClass) then + ( + selectmore node + ) + else if (superclassOf sourceObject == Helper) then + ( + selectmore node + ) + else if (superclassOf sourceObject == Light) then + ( + selectmore node + ) + ) + ) -- Select all node in this ig for node in geometry do ( @@ -508,8 +475,8 @@ try for curFileName in MaxFilesList do ( -- Free memory and file handles - gc () - resetMAXFile #noprompt + -- gc () + -- resetMAXFile #noprompt tokenArray = filterString (getFilenameFile curFileName) "-" @@ -528,6 +495,7 @@ try nlerror ("Scanning file "+curFileName+" ...") mergeMaxFile curFileName quiet:true + objXRefMgr.UpdateAllRecords() -- Unhide category unhidecategory() @@ -622,6 +590,8 @@ try ) resetMAXFile #noprompt + gc () + resetMAXFile #noprompt ) else ( @@ -635,10 +605,10 @@ try for curFileName in MaxFilesList do ( -- Free memory and file handles - gc () + -- gc () -- Reset 3dsmax - resetMAXFile #noprompt + -- resetMAXFile #noprompt tokenArray = filterString (getFilenameFile curFileName) "-" if (tokenArray.count == 4) and (tokenArray[1] == "zonetransition") then @@ -672,6 +642,7 @@ try nlerror ("Scanning file "+curFileName+" ...") mergeMaxFile curFileName quiet:true + objXRefMgr.UpdateAllRecords() -- Unhide category unhidecategory() @@ -852,6 +823,8 @@ try ) resetMAXFile #noprompt + gc () + resetMAXFile #noprompt ) else ( @@ -865,8 +838,8 @@ try for curFileName in MaxFilesList do ( -- Free memory and file handles - gc () - resetMAXFile #noprompt + -- gc () + -- resetMAXFile #noprompt tokenArray = filterString (getFilenameFile curFileName) "-" if (tokenArray.count == 2) and (tokenArray[1] == "zonespecial") then @@ -884,6 +857,7 @@ try nlerror ("Scanning file "+curFileName+" ...") mergeMaxFile curFileName quiet:true + objXRefMgr.UpdateAllRecords() -- Unhide category unhidecategory() @@ -971,6 +945,8 @@ try ) resetMAXFile #noprompt + gc () + resetMAXFile #noprompt ) else ( diff --git a/code/nel/tools/memory/memlog/memlog.cpp b/code/nel/tools/memory/memlog/memlog.cpp index 2f9892727..8112f6181 100644 --- a/code/nel/tools/memory/memlog/memlog.cpp +++ b/code/nel/tools/memory/memlog/memlog.cpp @@ -69,11 +69,20 @@ int main(int argc, char* argv[]) if (fread (&size, sizeof(uint32), 1, file) != 1) break; +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(size); +#endif + while (1) { uint32 start; if (fread (&start, sizeof(uint32), 1, file) != 1) break; + +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(start); +#endif + string category; if (!readString (category, file)) break; diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/code/nel/tools/misc/bnp_make/main.cpp index 06025d80c..a3f34a6a4 100644 --- a/code/nel/tools/misc/bnp_make/main.cpp +++ b/code/nel/tools/misc/bnp_make/main.cpp @@ -94,7 +94,15 @@ struct BNPHeader if (f == NULL) return false; uint32 nNbFile = (uint32)Files.size(); - if (fwrite (&nNbFile, sizeof(uint32), 1, f) != 1) + + // value to be serialized + uint32 nNbFile2 = nNbFile; + +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(nNbFile2); +#endif + + if (fwrite (&nNbFile2, sizeof(uint32), 1, f) != 1) { fclose(f); return false; @@ -115,20 +123,38 @@ struct BNPHeader return false; } - if (fwrite (&Files[i].Size, sizeof(uint32), 1, f) != 1) + uint32 nFileSize = Files[i].Size; + +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(nFileSize); +#endif + + if (fwrite (&nFileSize, sizeof(uint32), 1, f) != 1) { fclose(f); return false; } - if (fwrite (&Files[i].Pos, sizeof(uint32), 1, f) != 1) + uint32 nFilePos = Files[i].Pos; + +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(nFilePos); +#endif + + if (fwrite (&nFilePos, sizeof(uint32), 1, f) != 1) { fclose(f); return false; } } - if (fwrite (&OffsetFromBeginning, sizeof(uint32), 1, f) != 1) + uint32 nOffsetFromBeginning = OffsetFromBeginning; + +#ifdef NL_BIG_ENDIAN + NLMISC_BSWAP32(nOffsetFromBeginning); +#endif + + if (fwrite (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1) { fclose(f); return false; diff --git a/code/nel/tools/pacs/CMakeLists.txt b/code/nel/tools/pacs/CMakeLists.txt index 405476ed6..c3a5a71f6 100644 --- a/code/nel/tools/pacs/CMakeLists.txt +++ b/code/nel/tools/pacs/CMakeLists.txt @@ -1 +1,9 @@ -SUBDIRS(build_ig_boxes build_indoor_rbank build_rbank) +IF(WITH_3D) + ADD_SUBDIRECTORY(build_ig_boxes) + + IF(WITH_LIGO) + ADD_SUBDIRECTORY(build_rbank) + ENDIF() +ENDIF() + +ADD_SUBDIRECTORY(build_indoor_rbank) diff --git a/code/nelns/login_service/connection_client.cpp b/code/nelns/login_service/connection_client.cpp index 37976cb24..8ff713ec2 100644 --- a/code/nelns/login_service/connection_client.cpp +++ b/code/nelns/login_service/connection_client.cpp @@ -395,11 +395,11 @@ static void cbWSShardChooseShard (CMessage &msgin, const std::string &serviceNam string addr; msgin.serial (addr); msgout.serial (addr); - ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); + ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit return; } msgout.serial(reason); - ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); + ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit } static const TUnifiedCallbackItem WSCallbackArray[] = diff --git a/code/nelns/login_service/connection_web.cpp b/code/nelns/login_service/connection_web.cpp index 290884f91..e3abb9936 100644 --- a/code/nelns/login_service/connection_web.cpp +++ b/code/nelns/login_service/connection_web.cpp @@ -117,7 +117,7 @@ static void cbWSShardChooseShard/* (CMessage &msgin, TSockId from, CCallbackNetB */ } - WebServer->send (msgout, (TSockId)cookie.getUserAddr ()); + WebServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit } static const TUnifiedCallbackItem WSCallbackArray[] = diff --git a/code/nelns/login_service/login_service.h b/code/nelns/login_service/login_service.h index 7c8c5a427..3d84b1c8e 100644 --- a/code/nelns/login_service/login_service.h +++ b/code/nelns/login_service/login_service.h @@ -19,7 +19,9 @@ // we have to include windows.h because mysql.h uses it but not include it #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include typedef unsigned long ulong; diff --git a/code/nelns/login_service/mysql_helper.h b/code/nelns/login_service/mysql_helper.h index fee1d1bf6..ed4ebbd48 100644 --- a/code/nelns/login_service/mysql_helper.h +++ b/code/nelns/login_service/mysql_helper.h @@ -24,7 +24,9 @@ // we have to include windows.h because mysql.h uses it but not include it #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include typedef unsigned long ulong; diff --git a/code/nelns/login_system/database/nel.sql b/code/nelns/login_system/database/nel.sql deleted file mode 100644 index 66c887dcb..000000000 --- a/code/nelns/login_system/database/nel.sql +++ /dev/null @@ -1,62 +0,0 @@ -# HeidiSQL Dump -# -# -------------------------------------------------------- -# Host: 127.0.0.1 -# Database: nel -# Server version: 5.0.33 -# Server OS: Win32 -# Target-Compatibility: MySQL 5.0 -# Extended INSERTs: Y -# max_allowed_packet: 1048576 -# HeidiSQL version: 3.0 Revision: 572 -# -------------------------------------------------------- - -/*!40100 SET CHARACTER SET latin1*/; - - -# -# Table structure for table 'permission' -# - -CREATE TABLE `permission` ( - `UId` int(10) unsigned NOT NULL default '0', - `ClientApplication` char(64) collate latin1_general_ci NOT NULL default 'sample', - `ShardId` int(10) NOT NULL default '-1' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; - - - -# -# Table structure for table 'shard' -# - -CREATE TABLE `shard` ( - `ShardId` int(10) NOT NULL auto_increment, - `WsAddr` varchar(64) collate latin1_general_ci NOT NULL, - `NbPlayers` int(10) unsigned NOT NULL default '0', - `Name` varchar(64) collate latin1_general_ci NOT NULL default 'unknown shard', - `Online` tinyint(1) unsigned NOT NULL default '0', - `ClientApplication` varchar(64) collate latin1_general_ci NOT NULL, - `Version` varchar(64) collate latin1_general_ci NOT NULL default '', - `DynPatchURL` varchar(255) collate latin1_general_ci NOT NULL default '', - PRIMARY KEY (`ShardId`) -) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards information for login system'; - - - -# -# Table structure for table 'user' -# - -CREATE TABLE `user` ( - `UId` int(10) NOT NULL auto_increment, - `Login` varchar(64) collate latin1_general_ci NOT NULL default '', - `Password` char(32) collate latin1_general_ci NOT NULL, - `ShardId` int(10) NOT NULL default '-1', - `State` enum('Offline','Authorized','Waiting','Online') collate latin1_general_ci NOT NULL default 'Offline', - `Privilege` varchar(255) collate latin1_general_ci NOT NULL default '', - `ExtendedPrivilege` varchar(45) collate latin1_general_ci NOT NULL default '', - `Cookie` varchar(255) collate latin1_general_ci NOT NULL default '', - PRIMARY KEY (`UId`) -) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users information for login system'; - diff --git a/code/nelns/login_system/database/nel_tool.sql b/code/nelns/login_system/database/nel_tool.sql deleted file mode 100644 index 12caf7393..000000000 --- a/code/nelns/login_system/database/nel_tool.sql +++ /dev/null @@ -1,50 +0,0 @@ -# Database : `nel_tool` - -# -------------------------------------------------------- -# -# Table structure for table `server` -# - -CREATE TABLE server ( - sid int(11) unsigned NOT NULL auto_increment, - name varchar(64) default NULL, - address varchar(64) default NULL, - PRIMARY KEY (sid) -) TYPE=MyISAM; - -# -# Dumping data for table `server` -# -INSERT INTO server VALUES (1, 'Local Host', '127.0.0.1'); - -# -------------------------------------------------------- -# -# Table structure for table `service` -# -CREATE TABLE service ( - shid int(11) unsigned NOT NULL auto_increment, - shard varchar(64) default NULL, - server varchar(64) default NULL, - name varchar(64) default NULL, - PRIMARY KEY (shid) -) TYPE=MyISAM; - -# -# Dumping data for table `service` -# -INSERT INTO service VALUES (1, '300', 'Local Host', 'localhost'); - -# -------------------------------------------------------- -# -# Table structure for table `variable` -# -CREATE TABLE variable ( - path text, - error_bound text, - alarm_order text, - graph_update text -) TYPE=MyISAM; - -# -# Dumping data for table `variable` -# diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 1fc53145b..637003321 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -121,9 +121,9 @@ NL_ADD_RUNTIME_FLAGS(ryzom_client) NL_ADD_LIB_SUFFIX(ryzom_client) -IF(WITH_PCH) +IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS)) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) -ENDIF(WITH_PCH) +ENDIF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS)) INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/client/src/camera.cpp b/code/ryzom/client/src/camera.cpp index c409f9e58..5f388fb28 100644 --- a/code/ryzom/client/src/camera.cpp +++ b/code/ryzom/client/src/camera.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "camera.h" #include diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp index 3805122f2..ad8a328ba 100644 --- a/code/ryzom/client/src/commands.cpp +++ b/code/ryzom/client/src/commands.cpp @@ -3921,11 +3921,11 @@ NLMISC_COMMAND (url, "launch a browser to the specified url", "") return false; HINSTANCE result = ShellExecute(NULL, "open", args[0].c_str(), NULL,NULL, SW_SHOW); - if ((sint32)result > 32) + if ((intptr_t)result > 32) return true; else { - log.displayNL ("ShellExecute failed %d", (uint32)result); + log.displayNL ("ShellExecute failed %d", (uint32)(intptr_t)result); return false; } } diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 92b3acbe8..3a39dec1d 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -184,7 +184,7 @@ bool hasPrivilegeEM() { return (UserPrivileges.find(":EM:") != std::string::npos bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != std::string::npos); } -// Restore the video mode (fullscreen for exemple) after the connection (done in a window) +// Restore the video mode (fullscreen for example) after the connection (done in a window) void connectionRestaureVideoMode () { // Setup full screen if we have to diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index aa18cee6a..809232983 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -882,9 +882,9 @@ void prelogInit() UDriver::TDriver driver = UDriver::OpenGl; #ifdef NL_OS_WINDOWS - uint icon = (uint)LoadIcon(HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON)); + uintptr_t icon = (uintptr_t)LoadIcon(HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON)); #else - uint icon = 0; + uintptr_t icon = 0; #endif // NL_OS_WINDOWS switch(ClientCfg.Driver3D) diff --git a/code/ryzom/client/src/input.cpp b/code/ryzom/client/src/input.cpp index e67df8af2..eff4e2bc9 100644 --- a/code/ryzom/client/src/input.cpp +++ b/code/ryzom/client/src/input.cpp @@ -263,7 +263,6 @@ bool IsMouseFreeLook() return MouseFreeLook; } - // ********************************************************************************* // Use this method to toggle the mouse (freelook -> cursor) void SetMouseCursor (bool updatePos) @@ -287,8 +286,11 @@ void SetMouseCursor (bool updatePos) { sint32 ix, iy; cursor->getPointerPos (ix, iy); - x = (float)ix / (float)width; - y = (float)iy / (float)height; + if (ix != CViewPointer::InvalidCoord && iy != CViewPointer::InvalidCoord) + { + x = (float)ix / (float)width; + y = (float)iy / (float)height; + } } } diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.h b/code/ryzom/client/src/interface_v3/input_handler_manager.h index c29d0155d..bafe0f640 100644 --- a/code/ryzom/client/src/interface_v3/input_handler_manager.h +++ b/code/ryzom/client/src/interface_v3/input_handler_manager.h @@ -44,7 +44,7 @@ class CInputHandlerManager : public NLMISC::IEventListener, public CGroupEditBox::IComboKeyHandler { public: - /// The EventServer Filled with Filtered Messages the InterfaceManager didn't cactch + /// The EventServer Filled with Filtered Messages the InterfaceManager didn't catch NLMISC::CEventServer FilteredEventServer; public: diff --git a/code/ryzom/client/src/landscape_poly_drawer.cpp b/code/ryzom/client/src/landscape_poly_drawer.cpp index e98f17dc7..714684e26 100644 --- a/code/ryzom/client/src/landscape_poly_drawer.cpp +++ b/code/ryzom/client/src/landscape_poly_drawer.cpp @@ -396,7 +396,6 @@ void CLandscapePolyDrawer::buildShadowVolume(uint poly) // because they are calculated in camera location. vb.setVertexFormat(CVertexBuffer::PositionFlag); vb.setNumVertices(2*verticesNb + 2); - vb.setPreferredMemory(CVertexBuffer::RAMVolatile, false); { CVertexBufferReadWrite vba; vb.lock(vba); @@ -412,7 +411,6 @@ void CLandscapePolyDrawer::buildShadowVolume(uint poly) int index = 0; ib.setFormat(NL_DEFAULT_INDEX_BUFFER_FORMAT); ib.setNumIndexes(12*verticesNb); - ib.setPreferredMemory(CIndexBuffer::RAMVolatile, false); { CIndexBufferReadWrite iba; ib.lock (iba); diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp index bd5112f99..0d000310d 100644 --- a/code/ryzom/client/src/main_loop.cpp +++ b/code/ryzom/client/src/main_loop.cpp @@ -688,22 +688,27 @@ void updateWeather() } #endif - // FIXME: temporary fix for teleportation crash // Update new sky - if (ContinentMngr.cur() && Driver->getPolygonMode() == UDriver::Filled && Filter3D[FilterSky]) + s_SkyMode = NoSky; + if (ContinentMngr.cur() && !ContinentMngr.cur()->Indoor) { - CSky &sky = ContinentMngr.cur()->CurrentSky; - - if (!ContinentMngr.cur()->Indoor && sky.getScene()) + if(Driver->getPolygonMode() == UDriver::Filled) { - s_SkyMode = NewSky; - sky.getScene()->animate(TimeInSec-FirstTimeInSec); - // Setup the sky camera - preRenderNewSky(); - } - else - { - s_SkyMode = OldSky; + if (Filter3D[FilterSky]) + { + CSky &sky = ContinentMngr.cur()->CurrentSky; + if (sky.getScene()) + { + s_SkyMode = NewSky; + sky.getScene()->animate(TimeInSec-FirstTimeInSec); + // Setup the sky camera + preRenderNewSky(); + } + else + { + s_SkyMode = OldSky; + } + } } } } diff --git a/code/ryzom/client/src/main_loop_debug.cpp b/code/ryzom/client/src/main_loop_debug.cpp index dbcb47b96..8b224f27f 100644 --- a/code/ryzom/client/src/main_loop_debug.cpp +++ b/code/ryzom/client/src/main_loop_debug.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "main_loop_debug.h" #include diff --git a/code/ryzom/client/src/main_loop_temp.cpp b/code/ryzom/client/src/main_loop_temp.cpp index 0b3f24fa3..0bb49b13f 100644 --- a/code/ryzom/client/src/main_loop_temp.cpp +++ b/code/ryzom/client/src/main_loop_temp.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "main_loop_temp.h" #include "global.h" diff --git a/code/ryzom/client/src/main_loop_utilities.cpp b/code/ryzom/client/src/main_loop_utilities.cpp index bca1ccad2..194810ea9 100644 --- a/code/ryzom/client/src/main_loop_utilities.cpp +++ b/code/ryzom/client/src/main_loop_utilities.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "main_loop_utilities.h" #include diff --git a/code/ryzom/client/src/ping.cpp b/code/ryzom/client/src/ping.cpp index 5a07a2b9d..98d469592 100644 --- a/code/ryzom/client/src/ping.cpp +++ b/code/ryzom/client/src/ping.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "ping.h" #include "interface_v3/interface_manager.h" diff --git a/code/ryzom/client/src/profiling.cpp b/code/ryzom/client/src/profiling.cpp index a5a0f770f..85805bbf4 100644 --- a/code/ryzom/client/src/profiling.cpp +++ b/code/ryzom/client/src/profiling.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "stdpch.h" #include "profiling.h" // NeL includes diff --git a/code/ryzom/client/src/stdpch.h b/code/ryzom/client/src/stdpch.h index 48451ceea..5f046fcfe 100644 --- a/code/ryzom/client/src/stdpch.h +++ b/code/ryzom/client/src/stdpch.h @@ -120,7 +120,9 @@ // Foutez pas d'include du client ici svp ! Grrr ! Hulud #ifdef NL_OS_WINDOWS -#define NOMINMAX -#include -#include +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif +# include +# include #endif // NL_OS_WINDOWS 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 1deb06f03..cbc251be2 100644 --- a/code/ryzom/common/src/game_share/mirror_prop_value.h +++ b/code/ryzom/common/src/game_share/mirror_prop_value.h @@ -1150,7 +1150,7 @@ public: typedef _CMirrorPropValueListIterator iterator; typedef _CCMirrorPropValueListIterator const_iterator; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC friend iterator; // MSVC friend const_iterator; #else @@ -1192,7 +1192,7 @@ public: // If changing this struct, don't forget to change the places where it is initialized TSharedListRow Next; T Value; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC }; #else } __attribute__((packed)); @@ -1237,7 +1237,7 @@ public: typedef _CMirrorPropValueListIterator iterator; typedef _CCMirrorPropValueListIterator const_iterator; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC friend iterator; // MSVC friend const_iterator; #else @@ -1280,7 +1280,7 @@ public: // If changing this struct, don't forget to change the places where it is initialized TSharedListRow Next; uint64 Value; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC }; #else } __attribute__((packed)); diff --git a/code/ryzom/common/src/game_share/stdpch.h b/code/ryzom/common/src/game_share/stdpch.h index e658fff41..320e8c523 100644 --- a/code/ryzom/common/src/game_share/stdpch.h +++ b/code/ryzom/common/src/game_share/stdpch.h @@ -67,7 +67,9 @@ #include #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include #endif diff --git a/code/ryzom/server/src/ai_service/ai_entity_physical.h b/code/ryzom/server/src/ai_service/ai_entity_physical.h index c3a8fa966..5eb30b34f 100644 --- a/code/ryzom/server/src/ai_service/ai_entity_physical.h +++ b/code/ryzom/server/src/ai_service/ai_entity_physical.h @@ -55,7 +55,9 @@ template class CTargetable { #ifdef NL_OS_WINDOWS - friend class CTargetable; +# ifndef NL_COMP_MINGW + friend class CTargetable; +# endif #endif public: typedef NLMISC::CDbgPtr TPtr; diff --git a/code/ryzom/server/src/ai_service/ai_grp_npc.cpp b/code/ryzom/server/src/ai_service/ai_grp_npc.cpp index 937a6f421..056293a25 100644 --- a/code/ryzom/server/src/ai_service/ai_grp_npc.cpp +++ b/code/ryzom/server/src/ai_service/ai_grp_npc.cpp @@ -59,7 +59,7 @@ CSpawnGroupNpc::CSpawnGroupNpc(CPersistent& owner) _LastUpdate = (randomVal>=0)?randomVal:CTimeInterface::gameCycle(); _LastBotUpdate = CTimeInterface::gameCycle(); activityProfile().setAIProfile(new CGrpProfileNormal(this)); - _BotUpdateTimer.set((CAIS::rand32(40)+((long)this>>2))%20); // start with a random value. + _BotUpdateTimer.set((CAIS::rand32(40)+((intptr_t)this>>2))%20); // start with a random value. resetSlowUpdateCycle(); _DespawnBotsWhenNoMoreHandleTimerActive = false; } diff --git a/code/ryzom/server/src/ai_service/service_main.cpp b/code/ryzom/server/src/ai_service/service_main.cpp index 4bdb2c766..130ea1acb 100644 --- a/code/ryzom/server/src/ai_service/service_main.cpp +++ b/code/ryzom/server/src/ai_service/service_main.cpp @@ -38,7 +38,9 @@ #include "ais_user_models.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/ai_service/stdpch.h b/code/ryzom/server/src/ai_service/stdpch.h index d0978b2f7..5ad1d5f28 100644 --- a/code/ryzom/server/src/ai_service/stdpch.h +++ b/code/ryzom/server/src/ai_service/stdpch.h @@ -191,7 +191,9 @@ namespace MULTI_LINE_FORMATER { #include "ai_share/world_map.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/backup_service/backup_service.cpp b/code/ryzom/server/src/backup_service/backup_service.cpp index 698cbc02f..aed50a32c 100644 --- a/code/ryzom/server/src/backup_service/backup_service.cpp +++ b/code/ryzom/server/src/backup_service/backup_service.cpp @@ -30,7 +30,9 @@ #include "web_connection.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt index d57ff9302..15e7794a4 100644 --- a/code/ryzom/server/src/entities_game_service/CMakeLists.txt +++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt @@ -111,8 +111,8 @@ NL_ADD_RUNTIME_FLAGS(ryzom_entities_game_service) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -IF(WITH_PCH) +IF(WITH_PCH AND NOT MINGW) # FIXME: PCH too large (> 130MB), crashes cc1plus under MinGW ADD_NATIVE_PRECOMPILED_HEADER(ryzom_entities_game_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) -ENDIF(WITH_PCH) +ENDIF(WITH_PCH AND NOT MINGW) INSTALL(TARGETS ryzom_entities_game_service RUNTIME DESTINATION sbin COMPONENT services) 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 085d67aae..8ca025870 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 @@ -127,7 +127,9 @@ #include "server_share/stl_allocator_checker.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS 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 75ae81f04..30ff4acae 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 @@ -2895,13 +2895,13 @@ uint32 CGameItem::maxDurability() const // tools // SHEARS = pick for forage - case ITEM_TYPE::SHEARS: return (uint32)CWeaponCraftParameters::ForageToolDurability; - case ITEM_TYPE::AmmoTool: return (uint32)CWeaponCraftParameters::AmmoCraftingToolDurability; - case ITEM_TYPE::ArmorTool: return (uint32)CWeaponCraftParameters::ArmorCraftingToolDurability; - case ITEM_TYPE::JewelryTool: return (uint32)CWeaponCraftParameters::JewelryCraftingToolDurability; - case ITEM_TYPE::MeleeWeaponTool:return (uint32)CWeaponCraftParameters::MeleeWeaponCraftingToolDurability; - case ITEM_TYPE::RangeWeaponTool:return (uint32)CWeaponCraftParameters::RangeWeaponCraftingToolDurability; - case ITEM_TYPE::ToolMaker: return (uint32)CWeaponCraftParameters::ToolCraftingToolDurability; + case ITEM_TYPE::SHEARS: d = CWeaponCraftParameters::ForageToolDurability; break; + case ITEM_TYPE::AmmoTool: d = CWeaponCraftParameters::AmmoCraftingToolDurability; break; + case ITEM_TYPE::ArmorTool: d = CWeaponCraftParameters::ArmorCraftingToolDurability; break; + case ITEM_TYPE::JewelryTool: d = CWeaponCraftParameters::JewelryCraftingToolDurability; break; + case ITEM_TYPE::MeleeWeaponTool: d = CWeaponCraftParameters::MeleeWeaponCraftingToolDurability; break; + case ITEM_TYPE::RangeWeaponTool: d = CWeaponCraftParameters::RangeWeaponCraftingToolDurability; break; + case ITEM_TYPE::ToolMaker: d = CWeaponCraftParameters::ToolCraftingToolDurability; break; default: return 0; diff --git a/code/ryzom/server/src/frontend_service/fe_receive_task.cpp b/code/ryzom/server/src/frontend_service/fe_receive_task.cpp index 4eb85134a..3c958f461 100644 --- a/code/ryzom/server/src/frontend_service/fe_receive_task.cpp +++ b/code/ryzom/server/src/frontend_service/fe_receive_task.cpp @@ -22,7 +22,9 @@ #include "fe_types.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #elif defined NL_OS_UNIX diff --git a/code/ryzom/server/src/frontend_service/frontend_service.cpp b/code/ryzom/server/src/frontend_service/frontend_service.cpp index e43b9ccce..cbf4a5610 100644 --- a/code/ryzom/server/src/frontend_service/frontend_service.cpp +++ b/code/ryzom/server/src/frontend_service/frontend_service.cpp @@ -57,7 +57,9 @@ #include "uid_impulsions.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/frontend_service/module_manager.cpp b/code/ryzom/server/src/frontend_service/module_manager.cpp index 24def9d18..f0d3e0514 100644 --- a/code/ryzom/server/src/frontend_service/module_manager.cpp +++ b/code/ryzom/server/src/frontend_service/module_manager.cpp @@ -178,7 +178,7 @@ void CModuleManager::addModule(uint id, TModuleExecCallback cb) { nlassert(id < _MaxModules); nlassert(cb != NULL); - nldebug("FEMMAN: [%s] Added module %d (Cb=%p) to stack", _StackName.c_str(), id, cb); + nldebug("FEMMAN: [%s] Added module %d (Cb=%p) to stack", _StackName.c_str(), id, (void *)cb); _ExecutionStack.push_back(CExecutionItem()); @@ -372,7 +372,7 @@ void CModuleManager::executeStack() nlwarning("FEMMAN: Unexpected ExecutionItem type (%d) at item %d of the execution stack %s", item.Type, i, _StackName.c_str()); uint j; for (j=0; j<_ExecutionStack.size(); ++j) - nlwarning("FEMMAN: > %d [%s] Id=%d Cb=%p", j, (item.Type == Module) ? "MOD" : (item.Type == Wait) ? "WAIT" : "ERR", item.Id, item.Cb); + nlwarning("FEMMAN: > %d [%s] Id=%d Cb=%p", j, (item.Type == Module) ? "MOD" : (item.Type == Wait) ? "WAIT" : "ERR", item.Id, (void *)item.Cb); nlerror("FEMMAN: Error in execution stack %s", _StackName.c_str()); } } 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 7a19d90b7..af61c4c71 100644 --- a/code/ryzom/server/src/general_utilities_service/service_main.cpp +++ b/code/ryzom/server/src/general_utilities_service/service_main.cpp @@ -34,7 +34,9 @@ #include "service_main.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/gpm_service/gpm_service.cpp b/code/ryzom/server/src/gpm_service/gpm_service.cpp index 0756f641e..f6011fc82 100644 --- a/code/ryzom/server/src/gpm_service/gpm_service.cpp +++ b/code/ryzom/server/src/gpm_service/gpm_service.cpp @@ -50,7 +50,9 @@ #include "sheets.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS 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 d58de20a4..de3d73458 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 @@ -47,7 +47,9 @@ */ #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp index 3725299d6..823a8d1e4 100644 --- a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp +++ b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp @@ -20,7 +20,9 @@ #include #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/logger_service/logger_service.cpp b/code/ryzom/server/src/logger_service/logger_service.cpp index dba4cae57..cb51c6a6d 100644 --- a/code/ryzom/server/src/logger_service/logger_service.cpp +++ b/code/ryzom/server/src/logger_service/logger_service.cpp @@ -36,7 +36,9 @@ #include "log_storage.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp b/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp index 20c32173e..f902251e9 100644 --- a/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp +++ b/code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp @@ -25,7 +25,9 @@ #include "hof_generator.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/mirror_service/data_set_ms.h b/code/ryzom/server/src/mirror_service/data_set_ms.h index 4e40557ad..4fc9a4bfc 100644 --- a/code/ryzom/server/src/mirror_service/data_set_ms.h +++ b/code/ryzom/server/src/mirror_service/data_set_ms.h @@ -338,7 +338,7 @@ public: // If changing this struct, don't forget to change the places where it is initialized TSharedListRow Next; T Value; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC }; #else } __attribute__((packed)); @@ -409,7 +409,7 @@ void push_front( const NLMISC::CEntityId& value ); // If changing this struct, don't forget to change the places where it is initialized TSharedListRow Next; uint64 Value; -#ifdef NL_OS_WINDOWS +#ifdef NL_COMP_VC }; #else } __attribute__((packed)); diff --git a/code/ryzom/server/src/mirror_service/mirror_service.cpp b/code/ryzom/server/src/mirror_service/mirror_service.cpp index 9d1952cc7..d29ca4f3d 100644 --- a/code/ryzom/server/src/mirror_service/mirror_service.cpp +++ b/code/ryzom/server/src/mirror_service/mirror_service.cpp @@ -25,7 +25,9 @@ #include #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp index 0ad027d86..a0e577269 100644 --- a/code/ryzom/server/src/monitor_service/service_main.cpp +++ b/code/ryzom/server/src/monitor_service/service_main.cpp @@ -28,7 +28,9 @@ #include "messages.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include # include typedef unsigned long ulong; diff --git a/code/ryzom/server/src/patchman_service/service_main.cpp b/code/ryzom/server/src/patchman_service/service_main.cpp index c26ac0924..8bf99a275 100644 --- a/code/ryzom/server/src/patchman_service/service_main.cpp +++ b/code/ryzom/server/src/patchman_service/service_main.cpp @@ -36,8 +36,10 @@ #include "patchman_tester.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX -# include +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif +# include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp b/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp index 6bb687e8e..20eda6c18 100644 --- a/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp +++ b/code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp @@ -21,7 +21,9 @@ #include "delta_builder_task.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/pd_support_service/service_main.cpp b/code/ryzom/server/src/pd_support_service/service_main.cpp index 81bb66f94..447f8f2c4 100644 --- a/code/ryzom/server/src/pd_support_service/service_main.cpp +++ b/code/ryzom/server/src/pd_support_service/service_main.cpp @@ -34,7 +34,9 @@ #include "service_main.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp b/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp index 8a7a9cd6a..9fb21d1c9 100644 --- a/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp +++ b/code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp @@ -19,7 +19,9 @@ #include "db_manager.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp index a7c1b6f66..54701aff7 100644 --- a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp +++ b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp @@ -22,7 +22,9 @@ #include "nel/net/service.h" #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/server_share/stl_allocator_checker.cpp b/code/ryzom/server/src/server_share/stl_allocator_checker.cpp index 893ff9cb3..daf9b79b6 100644 --- a/code/ryzom/server/src/server_share/stl_allocator_checker.cpp +++ b/code/ryzom/server/src/server_share/stl_allocator_checker.cpp @@ -27,12 +27,12 @@ bool EnableStlAllocatorChecker= true; NLMISC_VARIABLE(bool,EnableStlAllocatorChecker,"Enable stl allocator tests"); -uint32 StlAllocatorMaxFree= 0; -NLMISC_VARIABLE(uint32,StlAllocatorMaxFree,"When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered"); +uintptr_t StlAllocatorMaxFree= 0; +NLMISC_VARIABLE(uintptr_t,StlAllocatorMaxFree,"When EnableStlAllocatorChecker is true, this value gives the largest number of free blocks encountered"); -// setup a 'max iterations' value of 3GBytes/ sizeof(uint32*) +// setup a 'max iterations' value of 3GBytes/ sizeof(void*) (32bit) // => this is equivalent to the total addressable memory space under linux -static const uint32 MaxIterations= 768*1024*1024; +static const uintptr_t MaxIterations= 768*1024*1024; // the following static vector exists only for the use of the testStlMemoryAllocator() routine // - it is required to allow us to get hold of the stl small block memory allocator @@ -54,20 +54,20 @@ void testStlMemoryAllocator(const char* state) if (IsCrashed) return; // setup a pointer 'p' to the first block in the allocator's linked list of free blocks - std::vector::allocator_type allocator= StaticIntVector.get_allocator(); - uint32 *p; + std::vector::allocator_type allocator= StaticIntVector.get_allocator(); + uintptr_t *p; p= allocator.allocate(1); allocator.deallocate(p,1); - // setup a counter to 3GBytes/ sizeof(uint32*) => equivalent to the total addressable memory space under linux - uint32 counter= MaxIterations; + // setup a counter to 3GBytes/ sizeof(void*) (32bit) => equivalent to the total addressable memory space under linux + uintptr_t counter= MaxIterations; if (setjmp(Context) == 0) { do { // step forwards allong the linked list - p= (uint32*)*p; + p= (uintptr_t*)*p; // if the counter hits zero then we can assume that we're in an infinite loop if (--counter==0) @@ -78,7 +78,7 @@ void testStlMemoryAllocator(const char* state) // if we hit a NULL end of list terminator then return happily if (p==NULL) { - uint32 numIterations= MaxIterations- counter; + uintptr_t numIterations= MaxIterations- counter; StlAllocatorMaxFree= std::max(numIterations,StlAllocatorMaxFree); signal(SIGSEGV, NULL); return; @@ -88,7 +88,7 @@ void testStlMemoryAllocator(const char* state) // note that our memory allocators contain invalid data so any call to 'nlassert' etc may modify // data thta they shouldn't and make our debugging task harder // ... so just provoke an access violation - *(uint32**)(0) = p; + *(uintptr_t**)(0) = p; } // we just hit a crash case so setup flags / globals accordingly diff --git a/code/ryzom/server/src/shard_unifier_service/nel.sql b/code/ryzom/server/src/shard_unifier_service/nel.sql deleted file mode 100644 index 6230cc7ef..000000000 --- a/code/ryzom/server/src/shard_unifier_service/nel.sql +++ /dev/null @@ -1,125 +0,0 @@ -# MySQL-Front Dump 2.4 -# -# Host: localhost Database: nel -#-------------------------------------------------------- -# Server version 4.0.24_Debian-10sarge1-log - -USE nel; - - -# -# Table structure for table 'domain' -# - -CREATE TABLE `domain` ( - `domain_id` int(10) unsigned NOT NULL auto_increment, - `domain_name` varchar(32) NOT NULL default '', - `status` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL default 'ds_dev', - `patch_version` int(10) unsigned NOT NULL default '0', - `backup_patch_url` varchar(255) default NULL, - `patch_urls` text, - `login_address` varchar(255) NOT NULL default '', - `session_manager_address` varchar(255) NOT NULL default '', - `ring_db_name` varchar(255) NOT NULL default '', - `web_host` varchar(255) NOT NULL default '', - `web_host_php` varchar(255) NOT NULL default '', - `description` varchar(200) default NULL, - PRIMARY KEY (`domain_id`), - UNIQUE KEY `name_idx` (`domain_name`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'permission' -# - -CREATE TABLE `permission` ( - `UId` int(10) unsigned NOT NULL default '0', - `ClientApplication` char(64) NOT NULL default 'r2', - `ShardId` int(10) NOT NULL default '-1', - `AccessPrivilege` set('DEV','RESTRICTED','OPEN') NOT NULL default 'OPEN', - `prim` int(10) unsigned NOT NULL auto_increment, - PRIMARY KEY (`prim`), - KEY `UIdIndex` (`UId`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'shard' -# - -CREATE TABLE `shard` ( - `ShardId` int(10) NOT NULL auto_increment, - `domain_id` int(10) NOT NULL default '-1', - `WsAddr` varchar(64) default NULL, - `NbPlayers` int(10) unsigned default '0', - `Name` varchar(64) default 'unknown shard', - `Online` tinyint(1) unsigned default '0', - `ClientApplication` varchar(64) default 'ryzom', - `Version` varchar(64) default NULL, - `PatchURL` varchar(255) default NULL, - `DynPatchURL` varchar(255) default NULL, - `FixedSessionId` int(10) unsigned default '0', - PRIMARY KEY (`ShardId`) -) TYPE=MyISAM COMMENT='contains all shards information for login system'; - - - -# -# Table structure for table 'user' -# - -CREATE TABLE `user` ( - `UId` int(10) NOT NULL auto_increment, - `Login` varchar(64) NOT NULL default '', - `Password` varchar(13) default NULL, - `ShardId` int(10) NOT NULL default '-1', - `State` enum('Offline','Online') NOT NULL default 'Offline', - `Privilege` varchar(255) default NULL, - `GroupName` varchar(255) NOT NULL default '', - `FirstName` varchar(255) NOT NULL default '', - `LastName` varchar(255) NOT NULL default '', - `Birthday` varchar(32) NOT NULL default '', - `Gender` tinyint(1) unsigned NOT NULL default '0', - `Country` char(2) NOT NULL default '', - `Email` varchar(255) NOT NULL default '', - `Address` varchar(255) NOT NULL default '', - `City` varchar(100) NOT NULL default '', - `PostalCode` varchar(10) NOT NULL default '', - `USState` char(2) NOT NULL default '', - `Chat` char(2) NOT NULL default '0', - `BetaKeyId` int(10) unsigned NOT NULL default '0', - `CachedCoupons` varchar(255) NOT NULL default '', - `ProfileAccess` varchar(45) default NULL, - `Level` int(2) NOT NULL default '0', - `CurrentFunds` int(4) NOT NULL default '0', - `IdBilling` varchar(255) NOT NULL default '', - `Community` char(2) NOT NULL default '--', - `Newsletter` tinyint(1) NOT NULL default '1', - `Account` varchar(64) NOT NULL default '', - `ChoiceSubLength` tinyint(2) NOT NULL default '0', - `CurrentSubLength` varchar(255) NOT NULL default '0', - `ValidIdBilling` int(4) NOT NULL default '0', - `GMId` int(4) NOT NULL default '0', - `ExtendedPrivilege` varchar(255) NOT NULL default '', - `ToolsGroup` varchar(255) NOT NULL default '', - `Unsubscribe` date NOT NULL default '0000-00-00', - `SubDate` datetime NOT NULL default '0000-00-00 00:00:00', - `SubIp` varchar(20) NOT NULL default '', - `SecurePassword` varchar(32) NOT NULL default '', - `LastInvoiceEmailCheck` date NOT NULL default '0000-00-00', - `FromSource` varchar(8) NOT NULL default '', - `ValidMerchantCode` varchar(11) NOT NULL default '', - `PBC` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`UId`), - KEY `LoginIndex` (`Login`), - KEY `GroupIndex` (`GroupName`), - KEY `Email` (`Email`), - KEY `ToolsGroup` (`ToolsGroup`), - KEY `CurrentSubLength` (`CurrentSubLength`), - KEY `Community` (`Community`), - KEY `GMId` (`GMId`) -) TYPE=InnoDB; - diff --git a/code/ryzom/server/src/shard_unifier_service/nel_tool.sql b/code/ryzom/server/src/shard_unifier_service/nel_tool.sql deleted file mode 100644 index 5c6e6b06d..000000000 --- a/code/ryzom/server/src/shard_unifier_service/nel_tool.sql +++ /dev/null @@ -1,199 +0,0 @@ -# MySQL-Front Dump 2.4 -# -# Host: localhost Database: nel_tool -#-------------------------------------------------------- -# Server version 4.0.24_Debian-10sarge1-log - -USE nel_tool; - - -# -# Table structure for table 'help_topic' -# - -CREATE TABLE `help_topic` ( - `file` varchar(32) default '0', - `topic` varchar(32) default '0', - `help_body` text -) TYPE=MyISAM; - - - -# -# Table structure for table 'server' -# - -CREATE TABLE `server` ( - `name` char(32) NOT NULL default '0', - `address` char(32) NOT NULL default '0' -) TYPE=MyISAM; - - - -# -# Table structure for table 'service' -# - -CREATE TABLE `service` ( - `service_id` int(10) unsigned NOT NULL auto_increment, - `shard` char(32) NOT NULL default '', - `server` char(32) NOT NULL default '', - `name` char(32) NOT NULL default '', - PRIMARY KEY (`service_id`), - UNIQUE KEY `service_id` (`service_id`), - KEY `service_id_2` (`service_id`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'shard_access' -# - -CREATE TABLE `shard_access` ( - `uid` int(10) unsigned default '0', - `shard` char(64) default '0' -) TYPE=MyISAM; - - - -# -# Table structure for table 'shard_annotation' -# - -CREATE TABLE `shard_annotation` ( - `shard` varchar(32) default '0', - `annotation` varchar(255) default '0', - `user` int(10) unsigned default '0', - `post_date` datetime default NULL, - `lock_user` int(10) unsigned default '0', - `lock_ip` varchar(32) default NULL, - `lock_date` datetime default NULL, - `ASAddr` varchar(255) default NULL, - `alias` varchar(255) default NULL -) TYPE=MyISAM; - - - -# -# Table structure for table 'user' -# - -CREATE TABLE `user` ( - `login` varchar(16) NOT NULL default '', - `password` varchar(32) NOT NULL default '', - `uid` int(10) NOT NULL auto_increment, - `gid` int(10) NOT NULL default '1', - `useCookie` enum('yes','no') NOT NULL default 'no', - `default_view` int(11) NOT NULL default '0', - `allowed_ip` varchar(32) default NULL, - PRIMARY KEY (`uid`), - UNIQUE KEY `login` (`login`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'user_right' -# - -CREATE TABLE `user_right` ( - `uid` int(10) unsigned default '0', - `uright` varchar(16) default '0', - KEY `uid` (`uid`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'user_variable' -# - -CREATE TABLE `user_variable` ( - `uid` int(11) NOT NULL default '0', - `vid` int(11) NOT NULL default '0', - `privilege` enum('none','rd','rw') NOT NULL default 'none', - PRIMARY KEY (`uid`,`vid`), - UNIQUE KEY `uid` (`uid`,`vid`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'variable' -# - -CREATE TABLE `variable` ( - `vid` int(11) NOT NULL auto_increment, - `name` varchar(128) NOT NULL default '', - `path` varchar(255) NOT NULL default '', - `state` enum('rd','rw') NOT NULL default 'rd', - `vgid` int(10) unsigned NOT NULL default '1', - `warning_bound` int(11) default '-1', - `error_bound` int(11) default '-1', - `alarm_order` enum('gt','lt') NOT NULL default 'gt', - `graph_update` int(10) unsigned default '0', - `command` enum('variable','command') NOT NULL default 'variable', - PRIMARY KEY (`vid`), - UNIQUE KEY `vid` (`vid`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'variable_group' -# - -CREATE TABLE `variable_group` ( - `vgid` int(10) NOT NULL auto_increment, - `name` varchar(32) default '0', - PRIMARY KEY (`vgid`), - UNIQUE KEY `name` (`name`) -) TYPE=MyISAM; - - - -# -# Table structure for table 'view_command' -# - -CREATE TABLE `view_command` ( - `name` varchar(32) default '0', - `command` varchar(32) default '0', - `tid` int(11) unsigned default '0' -) TYPE=MyISAM; - - - -# -# Table structure for table 'view_row' -# - -CREATE TABLE `view_row` ( - `tid` int(11) NOT NULL default '0', - `vid` int(11) NOT NULL default '0', - `name` varchar(128) NOT NULL default '', - `ordering` tinyint(4) NOT NULL default '0', - `filter` varchar(64) default NULL, - `graph` tinyint(3) unsigned NOT NULL default '0' -) TYPE=MyISAM; - - - -# -# Table structure for table 'view_table' -# - -CREATE TABLE `view_table` ( - `tid` int(11) NOT NULL auto_increment, - `uid` int(11) NOT NULL default '0', - `name` varchar(32) NOT NULL default '', - `ordering` tinyint(4) NOT NULL default '0', - `filter` varchar(64) default NULL, - `display` enum('normal','condensed') NOT NULL default 'normal', - `refresh_rate` int(10) unsigned default '0', - `auto_display` enum('auto','manual') NOT NULL default 'auto', - `show_base_cols` tinyint(3) unsigned NOT NULL default '1', - UNIQUE KEY `tid` (`tid`,`uid`) -) TYPE=MyISAM; - diff --git a/code/ryzom/server/src/shard_unifier_service/ring.sql b/code/ryzom/server/src/shard_unifier_service/ring.sql deleted file mode 100644 index 068aa1102..000000000 --- a/code/ryzom/server/src/shard_unifier_service/ring.sql +++ /dev/null @@ -1,311 +0,0 @@ -# MySQL-Front Dump 2.4 -# -# Host: localhost Database: ring_ats -#-------------------------------------------------------- -# Server version 4.0.24_Debian-10sarge1-log - -USE ring_ats; - - -# -# Table structure for table 'characters' -# - -CREATE TABLE `characters` ( - `char_id` int(10) unsigned NOT NULL default '0', - `char_name` varchar(20) NOT NULL default '', - `user_id` int(10) unsigned NOT NULL default '0', - `guild_id` int(10) unsigned NOT NULL default '0', - `best_combat_level` int(10) unsigned NOT NULL default '0', - `home_mainland_session_id` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`char_id`), - UNIQUE KEY `char_name_idx` (`char_name`), - KEY `user_id_idx` (`user_id`), - KEY `guild_id_idx` (`guild_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'folder' -# - -CREATE TABLE `folder` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `owner` int(10) unsigned NOT NULL default '0', - `title` varchar(40) NOT NULL default '', - `comments` text NOT NULL, - PRIMARY KEY (`Id`), - KEY `owner_idx` (`owner`), - KEY `title_idx` (`title`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'folder_access' -# - -CREATE TABLE `folder_access` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `folder_id` int(10) unsigned NOT NULL default '0', - `user_id` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`Id`), - KEY `folder_id_idx` (`folder_id`), - KEY `user_idx` (`user_id`) -) TYPE=MyISAM ROW_FORMAT=FIXED; - - - -# -# Table structure for table 'guild_invites' -# - -CREATE TABLE `guild_invites` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `session_id` int(10) unsigned NOT NULL default '0', - `guild_id` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`Id`), - KEY `guild_id_idx` (`guild_id`), - KEY `session_id_idx` (`session_id`) -) TYPE=MyISAM ROW_FORMAT=FIXED; - - - -# -# Table structure for table 'guilds' -# - -CREATE TABLE `guilds` ( - `guild_id` int(10) unsigned NOT NULL default '0', - `guild_name` varchar(20) NOT NULL default '', - `shard_id` int(11) NOT NULL default '0', - PRIMARY KEY (`guild_id`), - UNIQUE KEY `huild_name_idx` (`guild_name`), - KEY `shard_id_idx` (`shard_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'journal_entry' -# - -CREATE TABLE `journal_entry` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `session_id` int(10) unsigned NOT NULL default '0', - `author` int(10) unsigned NOT NULL default '0', - `type` enum('jet_credits','jet_notes') NOT NULL default 'jet_notes', - `text` text NOT NULL, - `time_stamp` datetime NOT NULL default '2005-09-07 12:41:33', - PRIMARY KEY (`Id`), - KEY `session_id_idx` (`session_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'known_users' -# - -CREATE TABLE `known_users` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `owner` int(10) unsigned NOT NULL default '0', - `targer_user` int(10) unsigned NOT NULL default '0', - `targer_character` int(10) unsigned NOT NULL default '0', - `relation_type` enum('rt_friend','rt_banned','rt_friend_dm') NOT NULL default 'rt_friend', - `comments` varchar(255) NOT NULL default '', - PRIMARY KEY (`Id`), - KEY `user_index` (`owner`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'mfs_erased_mail_series' -# - -CREATE TABLE `mfs_erased_mail_series` ( - `erased_char_id` int(11) unsigned NOT NULL default '0', - `erased_char_name` varchar(32) NOT NULL default '', - `erased_series` int(11) unsigned NOT NULL auto_increment, - `erase_date` datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`erased_series`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'mfs_guild_thread' -# - -CREATE TABLE `mfs_guild_thread` ( - `thread_id` int(11) NOT NULL auto_increment, - `guild_id` int(11) unsigned NOT NULL default '0', - `topic` varchar(255) NOT NULL default '', - `author_name` varchar(32) NOT NULL default '', - `last_post_date` datetime NOT NULL default '0000-00-00 00:00:00', - `post_count` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`thread_id`), - KEY `guild_index` (`guild_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'mfs_guild_thread_message' -# - -CREATE TABLE `mfs_guild_thread_message` ( - `id` int(11) NOT NULL auto_increment, - `thread_id` int(11) unsigned NOT NULL default '0', - `author_name` varchar(32) NOT NULL default '', - `date` datetime NOT NULL default '0000-00-00 00:00:00', - `content` text NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'mfs_mail' -# - -CREATE TABLE `mfs_mail` ( - `id` int(11) NOT NULL auto_increment, - `sender_name` varchar(32) NOT NULL default '', - `subject` varchar(250) NOT NULL default '', - `date` datetime NOT NULL default '0000-00-00 00:00:00', - `status` enum('ms_new','ms_read','ms_erased') NOT NULL default 'ms_new', - `dest_char_id` int(11) unsigned NOT NULL default '0', - `erase_series` int(11) unsigned NOT NULL default '0', - `content` text NOT NULL, - PRIMARY KEY (`id`), - KEY `dest_index` (`dest_char_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'player_rating' -# - -CREATE TABLE `player_rating` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `session_id` int(10) unsigned NOT NULL default '0', - `author` int(10) unsigned NOT NULL default '0', - `rating` int(10) NOT NULL default '0', - `comments` text NOT NULL, - `time_stamp` datetime NOT NULL default '2005-09-07 12:41:33', - PRIMARY KEY (`Id`), - KEY `session_id_idx` (`session_id`), - KEY `author_idx` (`author`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'ring_users' -# - -CREATE TABLE `ring_users` ( - `user_id` int(10) unsigned NOT NULL default '0', - `user_name` varchar(20) NOT NULL default '', - `user_type` enum('ut_character','ut_pioneer') NOT NULL default 'ut_character', - `current_session` int(10) unsigned NOT NULL default '0', - `current_activity` enum('ca_none','ca_play','ca_edit','ca_anim') NOT NULL default 'ca_none', - `current_status` enum('cs_offline','cs_logged','cs_online') NOT NULL default 'cs_offline', - `public_level` enum('pl_none','pl_public') NOT NULL default 'pl_none', - `account_type` enum('at_normal','at_gold') NOT NULL default 'at_normal', - `content_access_level` varchar(20) NOT NULL default '', - `description` text NOT NULL, - `lang` enum('lang_en','lang_fr','lang_de') NOT NULL default 'lang_en', - `cookie` varchar(30) NOT NULL default '', - `current_domain_id` int(10) NOT NULL default '-1', - `pioneer_char_id` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`user_id`), - UNIQUE KEY `user_name_idx` (`user_name`), - KEY `cookie_idx` (`cookie`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'scenario_desc' -# - -CREATE TABLE `scenario_desc` ( - `session_id` int(10) unsigned NOT NULL default '0', - `parent_scenario` int(10) unsigned NOT NULL default '0', - `description` text NOT NULL, - `relation_to_parent` enum('rtp_same','rtp_variant','rtp_different') NOT NULL default 'rtp_same', - `title` varchar(40) NOT NULL default '', - `num_player` int(10) unsigned NOT NULL default '0', - `content_access_level` varchar(20) NOT NULL default '', - PRIMARY KEY (`session_id`), - UNIQUE KEY `title_idx` (`title`), - KEY `parent_idx` (`parent_scenario`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'session_participant' -# - -CREATE TABLE `session_participant` ( - `Id` int(10) unsigned NOT NULL auto_increment, - `session_id` int(10) unsigned NOT NULL default '0', - `char_id` int(10) unsigned NOT NULL default '0', - `status` enum('sps_play_subscribed','sps_play_invited','sps_edit_invited','sps_anim_invited','sps_playing','sps_editing','sps_animating') NOT NULL default 'sps_play_subscribed', - `kicked` tinyint(1) unsigned NOT NULL default '0', - `session_rated` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`Id`), - KEY `session_idx` (`session_id`), - KEY `user_idx` (`char_id`) -) TYPE=MyISAM ROW_FORMAT=FIXED; - - - -# -# Table structure for table 'sessions' -# - -CREATE TABLE `sessions` ( - `session_id` int(10) unsigned NOT NULL auto_increment, - `session_type` enum('st_edit','st_anim','st_outland','st_mainland') NOT NULL default 'st_edit', - `title` varchar(40) NOT NULL default '', - `owner` int(10) unsigned NOT NULL default '0', - `plan_date` datetime NOT NULL default '2005-09-21 12:41:33', - `start_date` datetime NOT NULL default '2005-08-31 00:00:00', - `description` text NOT NULL, - `orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL default 'so_other', - `level` enum('sl_a','sl_b','sl_c','sl_d','sl_e') NOT NULL default 'sl_a', - `rule_type` enum('rt_strict','rt_liberal') NOT NULL default 'rt_strict', - `access_type` enum('at_public','at_private') NOT NULL default 'at_public', - `state` enum('ss_planned','ss_open','ss_locked','ss_closed') NOT NULL default 'ss_planned', - `host_shard_id` int(11) NOT NULL default '0', - `subscription_slots` int(11) unsigned NOT NULL default '0', - `reserved_slots` int(10) unsigned NOT NULL default '0', - `free_slots` int(10) unsigned NOT NULL default '0', - `estimated_duration` enum('et_short','et_medium','et_long') NOT NULL default 'et_short', - `final_duration` int(10) unsigned NOT NULL default '0', - `folder_id` int(10) unsigned NOT NULL default '0', - `lang` enum('lang_en','lang_fr','lang_de') NOT NULL default 'lang_en', - `icone` varchar(70) NOT NULL default '', - PRIMARY KEY (`session_id`), - KEY `owner_idx` (`owner`), - KEY `folder_idx` (`folder_id`) -) TYPE=MyISAM ROW_FORMAT=DYNAMIC; - - - -# -# Table structure for table 'shard' -# - -CREATE TABLE `shard` ( - `shard_id` int(11) NOT NULL default '0', - PRIMARY KEY (`shard_id`) -) TYPE=MyISAM ROW_FORMAT=FIXED; - diff --git a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp index d22cf82a9..50b4eb419 100644 --- a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp +++ b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp @@ -24,7 +24,9 @@ //#include #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/server/src/tick_service/tick_service.cpp b/code/ryzom/server/src/tick_service/tick_service.cpp index a25c1c83e..95f609571 100644 --- a/code/ryzom/server/src/tick_service/tick_service.cpp +++ b/code/ryzom/server/src/tick_service/tick_service.cpp @@ -31,7 +31,9 @@ #include #ifdef NL_OS_WINDOWS -# define NOMINMAX +# ifndef NL_COMP_MINGW +# define NOMINMAX +# endif # include #endif // NL_OS_WINDOWS diff --git a/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql b/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql deleted file mode 100644 index f6fca36e6..000000000 --- a/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql +++ /dev/null @@ -1,107 +0,0 @@ -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: nel_tool -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 18:16:57 -# -------------------------------------------------------- -USE `nel_tool`; - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping data for table nel_tool.neltool_annotations: 1 rows -/*!40000 ALTER TABLE `neltool_annotations` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_annotations` (`annotation_id`, `annotation_domain_id`, `annotation_shard_id`, `annotation_data`, `annotation_user_name`, `annotation_date`) VALUES (12, NULL, 106, 'Welcome to the Shard Admin Website!', 'vl', 1272378352); -/*!40000 ALTER TABLE `neltool_annotations` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_applications: 38 rows -/*!40000 ALTER TABLE `neltool_applications` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_applications` (`application_id`, `application_name`, `application_uri`, `application_restriction`, `application_order`, `application_visible`, `application_icon`) VALUES (1, 'Main', 'index.php', '', 100, 1, 'imgs/icon_main.gif'), (2, 'Logout', 'index.php?mode=logout', '', 999999, 1, 'imgs/icon_logout.gif'), (3, 'Admin', 'tool_administration.php', 'tool_admin', 1500, 1, 'imgs/icon_admin.gif'), (4, 'Prefs', 'tool_preferences.php', 'tool_preferences', 1000, 1, 'imgs/icon_preferences.gif'), (5, 'Admin/Users', '', 'tool_admin_user', 1502, 0, ''), (6, 'Admin/Applications', '', 'tool_admin_application', 1501, 0, ''), (7, 'Admin/Domains', '', 'tool_admin_domain', 1504, 0, ''), (8, 'Admin/Shards', '', 'tool_admin_shard', 1505, 0, ''), (9, 'Admin/Groups', '', 'tool_admin_group', 1503, 0, ''), (10, 'Admin/Logs', '', 'tool_admin_logs', 1506, 0, ''), (11, 'Main/Start', '', 'tool_main_start', 101, 0, ''), (12, 'Main/Stop', '', 'tool_main_stop', 102, 0, ''), (13, 'Main/Restart', '', 'tool_main_restart', 103, 0, ''), (14, 'Main/Kill', '', 'tool_main_kill', 104, 0, ''), (15, 'Main/Abort', '', 'tool_main_abort', 105, 0, ''), (16, 'Main/Execute', '', 'tool_main_execute', 108, 0, ''), (18, 'Notes', 'tool_notes.php', 'tool_notes', 900, 1, 'imgs/icon_notes.gif'), (19, 'Player Locator', 'tool_player_locator.php', 'tool_player_locator', 200, 1, 'imgs/icon_player_locator.gif'), (20, 'Player Locator/Display Players', '', 'tool_player_locator_display_players', 201, 0, ''), (21, 'Player Locator/Locate', '', 'tool_player_locator_locate', 202, 0, ''), (22, 'Main/LockDomain', '', 'tool_main_lock_domain', 110, 0, ''), (23, 'Main/LockShard', '', 'tool_main_lock_shard', 111, 0, ''), (24, 'Main/WS', '', 'tool_main_ws', 112, 0, ''), (25, 'Main/ResetCounters', '', 'tool_main_reset_counters', 113, 0, ''), (26, 'Main/ServiceAutoStart', '', 'tool_main_service_autostart', 114, 0, ''), (27, 'Main/ShardAutoStart', '', 'tool_main_shard_autostart', 115, 0, ''), (28, 'Main/WS/Old', '', 'tool_main_ws_old', 112, 0, ''), (29, 'Graphs', 'tool_graphs.php', 'tool_graph', 500, 1, 'imgs/icon_graphs.gif'), (30, 'Notes/Global', '', 'tool_notes_global', 901, 0, ''), (31, 'Log Analyser', 'tool_log_analyser.php', 'tool_las', 400, 1, 'imgs/icon_log_analyser.gif'), (32, 'Guild Locator', 'tool_guild_locator.php', 'tool_guild_locator', 300, 1, 'imgs/icon_guild_locator.gif'), (33, 'Player Locator/UserID Check', '', 'tool_player_locator_userid_check', 203, 0, ''), (34, 'Player Locator/CSR Relocate', '', 'tool_player_locator_csr_relocate', 204, 0, ''), (35, 'Guild Locator/Guilds Update', '', 'tool_guild_locator_manage_guild', 301, 0, ''), (36, 'Guild Locator/Members Update', '', 'tool_guild_locator_manage_members', 302, 0, ''), (37, 'Entities', 'tool_event_entities.php', 'tool_event_entities', 350, 1, 'imgs/icon_entity.gif'), (38, 'Admin/Restarts', '', 'tool_admin_restart', 1507, 0, ''), (39, 'Main/EasyRestart', '', 'tool_main_easy_restart', 116, 0, ''); -/*!40000 ALTER TABLE `neltool_applications` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_domains: 1 rows -/*!40000 ALTER TABLE `neltool_domains` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_domains` (`domain_id`, `domain_name`, `domain_as_host`, `domain_as_port`, `domain_rrd_path`, `domain_las_admin_path`, `domain_las_local_path`, `domain_application`, `domain_sql_string`, `domain_hd_check`, `domain_mfs_web`, `domain_cs_sql_string`) VALUES (12, 'open', 'open', 46700, '/home/nevrax/code/ryzom/server/save_shard/rrd_graphs', '', '', 'ryzom_open', 'mysql://shard@localhost/ring_open', 0, '', 'mysql://shard@localhost/atrium_forums'); -/*!40000 ALTER TABLE `neltool_domains` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_groups: 11 rows -/*!40000 ALTER TABLE `neltool_groups` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_groups` (`group_id`, `group_name`, `group_level`, `group_default`, `group_active`, `group_default_domain_id`, `group_default_shard_id`) VALUES (1, 'AdminGroup', 0, 0, 1, 12, 106), (2, 'NevraxGroup', 0, 1, 1, NULL, NULL), (3, 'AdminDebugGroup', 10, 0, 1, 9, 56), (4, 'SupportSGMGroup', 0, 0, 1, NULL, NULL), (5, 'NevraxATSGroup', 0, 0, 1, NULL, NULL), (6, 'SupportGMGroup', 0, 0, 1, NULL, NULL), (7, 'SupportReadOnlyGroup', 0, 0, 1, NULL, NULL), (8, 'NevraxLevelDesigners', 0, 0, 1, NULL, NULL), (9, 'NevraxReadOnlyGroup', 0, 0, 1, 9, 56), (10, 'YubDevGroup', 0, 0, 1, 12, 106), (11, 'GuestGroup', 0, 0, 1, 12, 106); -/*!40000 ALTER TABLE `neltool_groups` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_group_applications: 178 rows -/*!40000 ALTER TABLE `neltool_group_applications` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_group_applications` (`group_application_id`, `group_application_group_id`, `group_application_application_id`) VALUES (879, 1, 10), (878, 1, 8), (877, 1, 7), (876, 1, 9), (875, 1, 5), (874, 1, 6), (873, 1, 3), (872, 1, 4), (871, 1, 30), (870, 1, 18), (869, 1, 29), (868, 1, 31), (867, 1, 37), (866, 1, 36), (865, 1, 35), (864, 1, 32), (863, 1, 34), (862, 1, 33), (861, 1, 21), (860, 1, 20), (859, 1, 19), (858, 1, 39), (857, 1, 27), (856, 1, 26), (843, 3, 10), (842, 3, 8), (841, 3, 7), (840, 3, 9), (839, 3, 5), (838, 3, 6), (837, 3, 3), (836, 3, 4), (835, 3, 30), (834, 3, 18), (833, 3, 29), (832, 3, 31), (831, 3, 37), (830, 3, 36), (829, 3, 35), (828, 3, 32), (827, 3, 34), (826, 3, 33), (825, 3, 21), (824, 3, 20), (823, 3, 19), (822, 3, 39), (821, 3, 27), (820, 3, 26), (597, 4, 36), (596, 4, 35), (595, 4, 32), (594, 4, 21), (593, 4, 20), (592, 4, 19), (591, 4, 24), (590, 4, 23), (589, 4, 14), (588, 4, 12), (632, 2, 18), (631, 2, 37), (630, 2, 32), (629, 2, 21), (628, 2, 20), (627, 2, 19), (626, 2, 24), (625, 2, 23), (624, 2, 22), (623, 2, 16), (622, 2, 15), (621, 2, 14), (620, 2, 13), (819, 3, 25), (855, 1, 25), (619, 2, 12), (818, 3, 28), (854, 1, 28), (817, 3, 24), (718, 5, 18), (717, 5, 37), (716, 5, 32), (715, 5, 21), (714, 5, 20), (713, 5, 19), (712, 5, 27), (711, 5, 26), (710, 5, 24), (709, 5, 23), (708, 5, 22), (707, 5, 16), (706, 5, 15), (705, 5, 14), (816, 3, 23), (609, 6, 35), (608, 6, 32), (607, 6, 21), (606, 6, 20), (605, 6, 19), (604, 6, 24), (603, 6, 23), (602, 6, 14), (601, 6, 12), (600, 6, 11), (815, 3, 22), (814, 3, 16), (853, 1, 24), (704, 5, 13), (703, 5, 12), (852, 1, 23), (587, 4, 11), (618, 2, 11), (702, 5, 11), (612, 7, 19), (851, 1, 22), (813, 3, 15), (812, 3, 14), (598, 4, 18), (599, 4, 4), (610, 6, 18), (611, 6, 4), (613, 7, 20), (614, 7, 21), (615, 7, 32), (616, 7, 35), (617, 7, 4), (633, 2, 4), (811, 3, 13), (810, 3, 12), (850, 1, 16), (849, 1, 15), (848, 1, 14), (847, 1, 13), (846, 1, 12), (719, 5, 4), (720, 8, 11), (721, 8, 12), (722, 8, 13), (723, 8, 14), (724, 8, 15), (725, 8, 16), (726, 8, 22), (727, 8, 23), (728, 8, 24), (729, 8, 25), (730, 8, 26), (731, 8, 27), (732, 8, 19), (733, 8, 20), (734, 8, 21), (735, 8, 37), (736, 8, 4), (737, 9, 29), (738, 9, 4), (809, 3, 11), (845, 1, 11), (844, 3, 38), (880, 1, 38), (909, 10, 18), (908, 10, 29), (907, 10, 37), (906, 10, 36), (905, 10, 35), (904, 10, 32), (903, 10, 34), (902, 10, 33), (901, 10, 21), (900, 10, 20), (899, 10, 19), (898, 10, 23), (897, 10, 13), (910, 10, 30), (965, 11, 29), (964, 11, 37), (963, 11, 32), (962, 11, 34), (961, 11, 33), (960, 11, 21), (959, 11, 20), (958, 11, 19); -/*!40000 ALTER TABLE `neltool_group_applications` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_group_domains: 25 rows -/*!40000 ALTER TABLE `neltool_group_domains` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_group_domains` (`group_domain_id`, `group_domain_group_id`, `group_domain_domain_id`) VALUES (79, 1, 9), (84, 3, 3), (78, 1, 8), (43, 2, 1), (20, 4, 4), (80, 1, 1), (77, 1, 3), (40, 5, 4), (21, 4, 1), (22, 6, 1), (42, 2, 4), (76, 1, 12), (83, 3, 12), (75, 1, 2), (41, 5, 8), (44, 2, 8), (82, 3, 2), (74, 1, 4), (73, 9, 9), (81, 3, 4), (85, 3, 8), (86, 3, 9), (87, 3, 1), (88, 10, 12), (89, 11, 12); -/*!40000 ALTER TABLE `neltool_group_domains` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_group_shards: 154 rows -/*!40000 ALTER TABLE `neltool_group_shards` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_group_shards` (`group_shard_id`, `group_shard_group_id`, `group_shard_shard_id`, `group_shard_domain_id`) VALUES (1513, 3, 43, 1), (1473, 1, 42, 1), (1472, 1, 2, 1), (1471, 1, 3, 1), (1470, 1, 1, 1), (1512, 3, 46, 1), (1511, 3, 45, 1), (1510, 3, 6, 1), (1509, 3, 5, 1), (1508, 3, 58, 9), (1507, 3, 102, 9), (1506, 3, 103, 9), (841, 2, 37, 8), (840, 2, 36, 8), (839, 2, 31, 8), (838, 2, 47, 8), (837, 2, 32, 8), (836, 2, 30, 8), (1469, 1, 44, 1), (1468, 1, 43, 1), (1467, 1, 46, 1), (1466, 1, 45, 1), (1465, 1, 6, 1), (1464, 1, 5, 1), (1463, 1, 58, 9), (1505, 3, 104, 9), (1504, 3, 57, 9), (1488, 3, 10, 2), (1487, 3, 14, 2), (1493, 3, 54, 3), (1486, 3, 8, 2), (1485, 3, 13, 2), (1503, 3, 56, 9), (1502, 3, 40, 8), (1501, 3, 37, 8), (1500, 3, 36, 8), (1499, 3, 31, 8), (1498, 3, 47, 8), (1497, 3, 32, 8), (1496, 3, 30, 8), (1462, 1, 102, 9), (1461, 1, 103, 9), (1492, 3, 53, 3), (1460, 1, 104, 9), (1459, 1, 57, 9), (1458, 1, 56, 9), (1457, 1, 40, 8), (903, 5, 37, 8), (902, 5, 36, 8), (901, 5, 31, 8), (900, 5, 47, 8), (899, 5, 32, 8), (898, 5, 30, 8), (897, 5, 39, 8), (1456, 1, 37, 8), (652, 4, 26, 4), (651, 4, 20, 4), (650, 4, 19, 4), (1491, 3, 15, 3), (1455, 1, 36, 8), (896, 5, 41, 8), (1490, 3, 106, 12), (1454, 1, 31, 8), (895, 5, 18, 4), (894, 5, 26, 4), (893, 5, 20, 4), (646, 4, 23, 4), (645, 4, 22, 4), (644, 4, 21, 4), (835, 2, 39, 8), (834, 2, 41, 8), (833, 2, 4, 1), (832, 2, 44, 1), (831, 2, 43, 1), (830, 2, 42, 1), (829, 2, 2, 1), (828, 2, 46, 1), (827, 2, 45, 1), (826, 2, 3, 1), (825, 2, 1, 1), (824, 2, 6, 1), (892, 5, 19, 4), (1495, 3, 39, 8), (1484, 3, 7, 2), (891, 5, 24, 4), (1489, 3, 107, 12), (1483, 3, 18, 4), (1482, 3, 26, 4), (1481, 3, 20, 4), (1480, 3, 19, 4), (1479, 3, 24, 4), (1453, 1, 47, 8), (1452, 1, 32, 8), (1474, 1, 4, 1), (887, 5, 23, 4), (886, 5, 22, 4), (1451, 1, 30, 8), (1450, 1, 39, 8), (1449, 1, 41, 8), (1448, 1, 54, 3), (1447, 1, 53, 3), (885, 5, 21, 4), (904, 5, 40, 8), (884, 5, 17, 4), (823, 2, 5, 1), (822, 2, 18, 4), (821, 2, 26, 4), (820, 2, 20, 4), (819, 2, 19, 4), (818, 2, 24, 4), (1446, 1, 15, 3), (1385, 9, 58, 9), (1445, 1, 106, 12), (1444, 1, 107, 12), (1443, 1, 10, 2), (1478, 3, 23, 4), (1477, 3, 22, 4), (1494, 3, 41, 8), (814, 2, 23, 4), (813, 2, 22, 4), (812, 2, 21, 4), (653, 4, 42, 1), (654, 4, 43, 1), (655, 4, 44, 1), (1384, 9, 102, 9), (842, 2, 40, 8), (1383, 9, 103, 9), (1382, 9, 104, 9), (811, 2, 17, 4), (1381, 9, 57, 9), (1442, 1, 14, 2), (1476, 3, 21, 4), (1441, 1, 8, 2), (1440, 1, 13, 2), (1380, 9, 56, 9), (1439, 1, 7, 2), (1438, 1, 18, 4), (1437, 1, 26, 4), (1436, 1, 20, 4), (1435, 1, 19, 4), (1434, 1, 24, 4), (1433, 1, 23, 4), (1432, 1, 22, 4), (1431, 1, 21, 4), (1430, 1, 17, 4), (1475, 3, 17, 4), (1514, 3, 44, 1), (1515, 3, 1, 1), (1516, 3, 3, 1), (1517, 3, 2, 1), (1518, 3, 42, 1), (1519, 3, 4, 1), (1520, 10, 106, 12), (1521, 11, 106, 12); -/*!40000 ALTER TABLE `neltool_group_shards` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_locks: 0 rows -/*!40000 ALTER TABLE `neltool_locks` DISABLE KEYS */; -/*!40000 ALTER TABLE `neltool_locks` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_notes: 8 rows -/*!40000 ALTER TABLE `neltool_notes` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES (2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters information.', 1272378065, 1, 1), (3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), (5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), (4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voilà, you're done.', 1153314198, 1, 0), (6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] & [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow "UP" process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), (7, 27, 'opening if the egs is too high on reboot', '<kadael> here my note on admin about egs to high on startup\r\n<kadael> ---\r\n<kadael> If [EGS] is to high on startup:\r\n<kadael> [shut down egs]\r\n<kadael> [5 mins]\r\n<kadael> [IOS] & [GPMS] (at same time shut down )\r\n<kadael> after the services are down follow "UP" process with timers again.\r\n<kadael> IOS\r\n<kadael> [3 mins]\r\n<kadael> GPMS\r\n<kadael> [3 mins]\r\n<kadael> EGS\r\n<kadael> [5 mins]\r\n<kadael> bla bla...\r\n<kadael> ---', 1153395362, 1, 0), (10, 27, 'Ring points', 'Commande pour donner tout les points ring à tout le monde :\r\n\r\nDans le DSS d'un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), (9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] & [GPMS] (shut down at same time) \r\n \r\n After the services are down follow "UP" process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0); -/*!40000 ALTER TABLE `neltool_notes` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_restart_groups: 4 rows -/*!40000 ALTER TABLE `neltool_restart_groups` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_restart_groups` (`restart_group_id`, `restart_group_name`, `restart_group_list`, `restart_group_order`) VALUES (1, 'Low Level', 'rns,ts,ms', '1'), (3, 'Mid Level', 'ios,gpms,egs', '2'), (4, 'High Level', 'ais', '3'), (5, 'Front Level', 'fes,sbs,dss,rws', '4'); -/*!40000 ALTER TABLE `neltool_restart_groups` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_restart_messages: 4 rows -/*!40000 ALTER TABLE `neltool_restart_messages` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_restart_messages` (`restart_message_id`, `restart_message_name`, `restart_message_value`, `restart_message_lang`) VALUES (5, 'reboot', 'The shard is about to go down. Please find a safe location and log out.', 'en'), (4, 'reboot', 'Le serveur va redemarrer dans $minutes$ minutes. Merci de vous deconnecter en lieu sur.', 'fr'), (6, 'reboot', 'Der Server wird heruntergefahren. Findet eine sichere Stelle und logt aus.', 'de'), (10, 'reboot', 'Arret du serveur dans $minutes+1$ minutes', 'fr'); -/*!40000 ALTER TABLE `neltool_restart_messages` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_restart_sequences: 0 rows -/*!40000 ALTER TABLE `neltool_restart_sequences` DISABLE KEYS */; -/*!40000 ALTER TABLE `neltool_restart_sequences` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_shards: 1 rows -/*!40000 ALTER TABLE `neltool_shards` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_shards` (`shard_id`, `shard_name`, `shard_as_id`, `shard_domain_id`, `shard_lang`, `shard_restart`) VALUES (106, 'Open', 'open', 12, 'en', 0); -/*!40000 ALTER TABLE `neltool_shards` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_stats_hd_datas: 0 rows -/*!40000 ALTER TABLE `neltool_stats_hd_datas` DISABLE KEYS */; -/*!40000 ALTER TABLE `neltool_stats_hd_datas` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_stats_hd_times: 0 rows -/*!40000 ALTER TABLE `neltool_stats_hd_times` DISABLE KEYS */; -/*!40000 ALTER TABLE `neltool_stats_hd_times` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_users: 3 rows -/*!40000 ALTER TABLE `neltool_users` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_users` (`user_id`, `user_name`, `user_password`, `user_group_id`, `user_created`, `user_active`, `user_logged_last`, `user_logged_count`, `user_menu_style`) VALUES (27, 'admin', '084e0343a0486ff05530df6c705c8bb4', 1, 1213886454, 1, 1273158945, 382, 2), (32, 'guest', '084e0343a0486ff05530df6c705c8bb4', 1, 1272379014, 1, 1273335407, 273, 2); -/*!40000 ALTER TABLE `neltool_users` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_user_applications: 5 rows -/*!40000 ALTER TABLE `neltool_user_applications` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_user_applications` (`user_application_id`, `user_application_user_id`, `user_application_application_id`) VALUES (8, 12, 33), (20, 6, 31), (19, 6, 34), (9, 12, 31), (21, 10, 34); -/*!40000 ALTER TABLE `neltool_user_applications` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_user_domains: 11 rows -/*!40000 ALTER TABLE `neltool_user_domains` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_user_domains` (`user_domain_id`, `user_domain_user_id`, `user_domain_domain_id`) VALUES (5, 6, 2), (9, 22, 1), (10, 23, 4), (4, 12, 3), (6, 6, 3), (11, 23, 2), (12, 23, 1), (13, 23, 8), (18, 15, 1), (17, 15, 2), (19, 31, 9); -/*!40000 ALTER TABLE `neltool_user_domains` ENABLE KEYS */; - -# Dumping data for table nel_tool.neltool_user_shards: 81 rows -/*!40000 ALTER TABLE `neltool_user_shards` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_user_shards` (`user_shard_id`, `user_shard_user_id`, `user_shard_shard_id`, `user_shard_domain_id`) VALUES (1, 8, 1, 1), (2, 9, 2, 1), (68, 7, 3, 1), (143, 6, 4, 1), (142, 6, 2, 1), (141, 6, 45, 1), (140, 6, 3, 1), (90, 23, 26, 4), (89, 23, 20, 4), (13, 14, 1, 1), (14, 14, 3, 1), (15, 14, 2, 1), (139, 6, 1, 1), (74, 17, 2, 1), (73, 17, 45, 1), (72, 17, 3, 1), (71, 17, 1, 1), (70, 17, 18, 4), (88, 23, 19, 4), (87, 23, 24, 4), (83, 23, 23, 4), (82, 23, 22, 4), (81, 23, 21, 4), (34, 12, 15, 3), (36, 18, 2, 1), (138, 6, 7, 2), (80, 23, 17, 4), (79, 22, 45, 1), (78, 22, 3, 1), (77, 21, 45, 1), (76, 21, 3, 1), (75, 17, 4, 1), (69, 7, 45, 1), (146, 6, 54, 3), (91, 23, 18, 4), (92, 23, 7, 2), (93, 23, 13, 2), (94, 23, 8, 2), (95, 23, 14, 2), (145, 6, 53, 3), (97, 23, 10, 2), (144, 6, 15, 3), (99, 23, 5, 1), (100, 23, 6, 1), (101, 23, 1, 1), (102, 23, 3, 1), (103, 23, 45, 1), (104, 23, 46, 1), (105, 23, 2, 1), (106, 23, 42, 1), (107, 23, 43, 1), (108, 23, 44, 1), (109, 23, 4, 1), (110, 23, 41, 8), (111, 23, 39, 8), (112, 23, 30, 8), (113, 23, 32, 8), (114, 23, 47, 8), (115, 23, 31, 8), (116, 23, 36, 8), (117, 23, 37, 8), (118, 23, 40, 8), (156, 15, 45, 1), (155, 15, 3, 1), (154, 15, 1, 1), (153, 15, 6, 1), (152, 15, 5, 1), (151, 15, 10, 2), (150, 15, 14, 2), (149, 15, 8, 2), (148, 15, 13, 2), (147, 15, 7, 2), (157, 15, 46, 1), (158, 15, 2, 1), (159, 15, 42, 1), (160, 15, 43, 1), (161, 15, 44, 1), (162, 15, 4, 1), (163, 31, 57, 9), (164, 31, 104, 9), (165, 31, 103, 9); -/*!40000 ALTER TABLE `neltool_user_shards` ENABLE KEYS */; -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/code/ryzom/tools/server/sql/ryzom_default_data.sql b/code/ryzom/tools/server/sql/ryzom_default_data.sql deleted file mode 100644 index 3439e27f4..000000000 --- a/code/ryzom/tools/server/sql/ryzom_default_data.sql +++ /dev/null @@ -1,49 +0,0 @@ -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: nel -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 15:31:21 -# -------------------------------------------------------- -USE `nel`; - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping data for table nel.domain: 8 rows -/*!40000 ALTER TABLE `domain` DISABLE KEYS */; -INSERT IGNORE INTO `domain` (`domain_id`, `domain_name`, `status`, `patch_version`, `backup_patch_url`, `patch_urls`, `login_address`, `session_manager_address`, `ring_db_name`, `web_host`, `web_host_php`, `description`) VALUES (12, 'ryzom_open', 'ds_open', 610, 'http://open.ryzom.com:23001', NULL, 'open.ryzom.com:49998', 'open.ryzom.com:49999', 'ring_open', 'open.ryzom.com:30000', 'open.ryzom.com:40916', 'Open Domain'); -/*!40000 ALTER TABLE `domain` ENABLE KEYS */; - -# Dumping data for table nel.shard: 17 rows -/*!40000 ALTER TABLE `shard` DISABLE KEYS */; -INSERT IGNORE INTO `shard` (`ShardId`, `domain_id`, `WsAddr`, `NbPlayers`, `Name`, `Online`, `ClientApplication`, `Version`, `PatchURL`, `DynPatchURL`, `FixedSessionId`, `State`, `MOTD`, `prim`) VALUES (302, 12, 'open.ryzom.com', 0, 'Open Shard', 0, 'ryzom_open', '', '', '', 0, 'ds_dev', '', 30); -/*!40000 ALTER TABLE `shard` ENABLE KEYS */; -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: ring_open -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 15:31:22 -# -------------------------------------------------------- -USE `ring_open`; - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping data for table ring_open.sessions: 1 rows -/*!40000 ALTER TABLE `sessions` DISABLE KEYS */; -INSERT IGNORE INTO `sessions` (`session_id`, `session_type`, `title`, `owner`, `plan_date`, `start_date`, `description`, `orientation`, `level`, `rule_type`, `access_type`, `state`, `host_shard_id`, `subscription_slots`, `reserved_slots`, `free_slots`, `estimated_duration`, `final_duration`, `folder_id`, `lang`, `icone`, `anim_mode`, `race_filter`, `religion_filter`, `guild_filter`, `shard_filter`, `level_filter`, `subscription_closed`, `newcomer`) VALUES (302, 'st_mainland', 'open shard mainland', 0, '2005-09-21 12:41:33', '2005-08-31 00:00:00', '', 'so_other', 'sl_a', 'rt_strict', 'at_public', 'ss_planned', 0, 0, 0, 0, 'et_short', 0, 0, 'lang_en', '', 'am_dm', 'rf_fyros,rf_matis,rf_tryker,rf_zorai', 'rf_kami,rf_karavan,rf_neutral', 'gf_any_player', '', 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f', 0, 0); -/*!40000 ALTER TABLE `sessions` ENABLE KEYS */; - -# Dumping data for table ring_open.shard: 1 rows -/*!40000 ALTER TABLE `shard` DISABLE KEYS */; -INSERT IGNORE INTO `shard` (`shard_id`, `WSOnline`, `MOTD`, `OldState`, `RequiredState`) VALUES (302, 1, 'Shard up', 'ds_restricted', 'ds_open'); -/*!40000 ALTER TABLE `shard` ENABLE KEYS */; -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/code/ryzom/tools/server/sql/ryzom_tables.sql b/code/ryzom/tools/server/sql/ryzom_tables.sql deleted file mode 100644 index 158d359a4..000000000 --- a/code/ryzom/tools/server/sql/ryzom_tables.sql +++ /dev/null @@ -1,812 +0,0 @@ -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: nel -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 09:14:27 -# -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping database structure for nel -CREATE DATABASE IF NOT EXISTS `nel` /*!40100 DEFAULT CHARACTER SET latin1 */; -USE `nel`; - - -# Dumping structure for table nel.domain -CREATE TABLE IF NOT EXISTS `domain` ( - `domain_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `domain_name` varchar(32) NOT NULL DEFAULT '', - `status` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', - `patch_version` int(10) unsigned NOT NULL DEFAULT '0', - `backup_patch_url` varchar(255) DEFAULT NULL, - `patch_urls` text, - `login_address` varchar(255) NOT NULL DEFAULT '', - `session_manager_address` varchar(255) NOT NULL DEFAULT '', - `ring_db_name` varchar(255) NOT NULL DEFAULT '', - `web_host` varchar(255) NOT NULL DEFAULT '', - `web_host_php` varchar(255) NOT NULL DEFAULT '', - `description` varchar(200) DEFAULT NULL, - PRIMARY KEY (`domain_id`), - UNIQUE KEY `name_idx` (`domain_name`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel.permission -CREATE TABLE IF NOT EXISTS `permission` ( - `UId` int(10) unsigned NOT NULL DEFAULT '0', - `ClientApplication` char(64) NOT NULL DEFAULT 'ryzom', - `ShardId` int(10) NOT NULL DEFAULT '-1', - `AccessPrivilege` set('OPEN','DEV','RESTRICTED') NOT NULL DEFAULT 'OPEN', - `prim` int(10) unsigned NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`prim`), - KEY `UIDIndex` (`UId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel.shard -CREATE TABLE IF NOT EXISTS `shard` ( - `ShardId` int(10) NOT NULL DEFAULT '0', - `domain_id` int(11) unsigned NOT NULL DEFAULT '0', - `WsAddr` varchar(64) DEFAULT NULL, - `NbPlayers` int(10) unsigned DEFAULT '0', - `Name` varchar(255) DEFAULT 'unknown shard', - `Online` tinyint(1) unsigned DEFAULT '0', - `ClientApplication` varchar(64) DEFAULT 'ryzom', - `Version` varchar(64) NOT NULL DEFAULT '', - `PatchURL` varchar(255) NOT NULL DEFAULT '', - `DynPatchURL` varchar(255) NOT NULL DEFAULT '', - `FixedSessionId` int(11) unsigned NOT NULL DEFAULT '0', - `State` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', - `MOTD` text NOT NULL, - `prim` int(10) unsigned NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`prim`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all shards information for login system'; - -# Data exporting was unselected. - - -# Dumping structure for table nel.user -CREATE TABLE IF NOT EXISTS `user` ( - `UId` int(10) NOT NULL AUTO_INCREMENT, - `Login` varchar(64) NOT NULL DEFAULT '', - `Password` varchar(13) DEFAULT NULL, - `ShardId` int(10) NOT NULL DEFAULT '-1', - `State` enum('Offline','Online') NOT NULL DEFAULT 'Offline', - `Privilege` varchar(255) NOT NULL DEFAULT '', - `GroupName` varchar(255) NOT NULL DEFAULT '', - `FirstName` varchar(255) NOT NULL DEFAULT '', - `LastName` varchar(255) NOT NULL DEFAULT '', - `Birthday` varchar(32) NOT NULL DEFAULT '', - `Gender` tinyint(1) unsigned NOT NULL DEFAULT '0', - `Country` char(2) NOT NULL DEFAULT '', - `Email` varchar(255) NOT NULL DEFAULT '', - `Address` varchar(255) NOT NULL DEFAULT '', - `City` varchar(100) NOT NULL DEFAULT '', - `PostalCode` varchar(10) NOT NULL DEFAULT '', - `USState` char(2) NOT NULL DEFAULT '', - `Chat` char(2) NOT NULL DEFAULT '0', - `BetaKeyId` int(10) unsigned NOT NULL DEFAULT '0', - `CachedCoupons` varchar(255) NOT NULL DEFAULT '', - `ProfileAccess` varchar(45) DEFAULT NULL, - `Level` int(2) NOT NULL DEFAULT '0', - `CurrentFunds` int(4) NOT NULL DEFAULT '0', - `IdBilling` varchar(255) NOT NULL DEFAULT '', - `Community` char(2) NOT NULL DEFAULT '--', - `Newsletter` tinyint(1) NOT NULL DEFAULT '1', - `Account` varchar(64) NOT NULL DEFAULT '', - `ChoiceSubLength` tinyint(2) NOT NULL DEFAULT '0', - `CurrentSubLength` varchar(255) NOT NULL DEFAULT '0', - `ValidIdBilling` int(4) NOT NULL DEFAULT '0', - `GMId` int(4) NOT NULL DEFAULT '0', - `ExtendedPrivilege` varchar(128) NOT NULL DEFAULT '', - `ToolsGroup` varchar(20) NOT NULL DEFAULT '', - `Unsubscribe` date NOT NULL DEFAULT '0000-00-00', - `SubDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `SubIp` varchar(20) NOT NULL DEFAULT '', - `SecurePassword` varchar(32) NOT NULL DEFAULT '', - `LastInvoiceEmailCheck` date NOT NULL DEFAULT '0000-00-00', - `FromSource` varchar(8) NOT NULL DEFAULT '', - `ValidMerchantCode` varchar(13) NOT NULL DEFAULT '', - `PBC` tinyint(1) NOT NULL DEFAULT '0', - `ApiKeySeed` varchar(8) DEFAULT NULL, - PRIMARY KEY (`UId`), - KEY `LoginIndex` (`Login`), - KEY `GroupIndex` (`GroupName`), - KEY `ToolsGroup` (`ToolsGroup`), - KEY `CurrentSubLength` (`CurrentSubLength`), - KEY `Community` (`Community`), - KEY `Email` (`Email`), - KEY `GMId` (`GMId`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all users information for login system'; - -# Data exporting was unselected. -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: nel_tool -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 09:14:28 -# -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping database structure for nel_tool -CREATE DATABASE IF NOT EXISTS `nel_tool` /*!40100 DEFAULT CHARACTER SET latin1 */; -USE `nel_tool`; - - -# Dumping structure for table nel_tool.neltool_annotations -CREATE TABLE IF NOT EXISTS `neltool_annotations` ( - `annotation_id` int(11) NOT NULL AUTO_INCREMENT, - `annotation_domain_id` int(11) DEFAULT NULL, - `annotation_shard_id` int(11) DEFAULT NULL, - `annotation_data` varchar(255) NOT NULL DEFAULT '', - `annotation_user_name` varchar(32) NOT NULL DEFAULT '', - `annotation_date` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`annotation_id`), - UNIQUE KEY `annotation_shard_id` (`annotation_shard_id`), - UNIQUE KEY `annotation_domain_id` (`annotation_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_applications -CREATE TABLE IF NOT EXISTS `neltool_applications` ( - `application_id` int(11) NOT NULL AUTO_INCREMENT, - `application_name` varchar(64) NOT NULL DEFAULT '', - `application_uri` varchar(255) NOT NULL DEFAULT '', - `application_restriction` varchar(64) NOT NULL DEFAULT '', - `application_order` int(11) NOT NULL DEFAULT '0', - `application_visible` int(11) NOT NULL DEFAULT '0', - `application_icon` varchar(128) NOT NULL DEFAULT '', - PRIMARY KEY (`application_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_domains -CREATE TABLE IF NOT EXISTS `neltool_domains` ( - `domain_id` int(11) NOT NULL AUTO_INCREMENT, - `domain_name` varchar(128) NOT NULL DEFAULT '', - `domain_as_host` varchar(128) NOT NULL DEFAULT '', - `domain_as_port` int(11) NOT NULL DEFAULT '0', - `domain_rrd_path` varchar(255) NOT NULL DEFAULT '', - `domain_las_admin_path` varchar(255) NOT NULL DEFAULT '', - `domain_las_local_path` varchar(255) NOT NULL DEFAULT '', - `domain_application` varchar(128) NOT NULL DEFAULT '', - `domain_sql_string` varchar(128) NOT NULL DEFAULT '', - `domain_hd_check` int(11) NOT NULL DEFAULT '0', - `domain_mfs_web` text, - `domain_cs_sql_string` varchar(255) DEFAULT NULL, - PRIMARY KEY (`domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_groups -CREATE TABLE IF NOT EXISTS `neltool_groups` ( - `group_id` int(11) NOT NULL AUTO_INCREMENT, - `group_name` varchar(32) NOT NULL DEFAULT 'NewGroup', - `group_level` int(11) NOT NULL DEFAULT '0', - `group_default` int(11) NOT NULL DEFAULT '0', - `group_active` int(11) NOT NULL DEFAULT '0', - `group_default_domain_id` tinyint(3) unsigned DEFAULT NULL, - `group_default_shard_id` tinyint(3) unsigned DEFAULT NULL, - PRIMARY KEY (`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_group_applications -CREATE TABLE IF NOT EXISTS `neltool_group_applications` ( - `group_application_id` int(11) NOT NULL AUTO_INCREMENT, - `group_application_group_id` int(11) NOT NULL DEFAULT '0', - `group_application_application_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`group_application_id`), - KEY `group_application_group_id` (`group_application_group_id`), - KEY `group_application_application_id` (`group_application_application_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_group_domains -CREATE TABLE IF NOT EXISTS `neltool_group_domains` ( - `group_domain_id` int(11) NOT NULL AUTO_INCREMENT, - `group_domain_group_id` int(11) NOT NULL DEFAULT '0', - `group_domain_domain_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`group_domain_id`), - KEY `group_domain_group_id` (`group_domain_group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_group_shards -CREATE TABLE IF NOT EXISTS `neltool_group_shards` ( - `group_shard_id` int(11) NOT NULL AUTO_INCREMENT, - `group_shard_group_id` int(11) NOT NULL DEFAULT '0', - `group_shard_shard_id` int(11) NOT NULL DEFAULT '0', - `group_shard_domain_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`group_shard_id`), - KEY `group_shard_group_id` (`group_shard_group_id`), - KEY `group_shard_domain_id` (`group_shard_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_locks -CREATE TABLE IF NOT EXISTS `neltool_locks` ( - `lock_id` int(11) NOT NULL AUTO_INCREMENT, - `lock_domain_id` int(11) DEFAULT NULL, - `lock_shard_id` int(11) DEFAULT NULL, - `lock_user_name` varchar(32) NOT NULL DEFAULT '', - `lock_date` int(11) NOT NULL DEFAULT '0', - `lock_update` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`lock_id`), - UNIQUE KEY `lock_shard_id` (`lock_shard_id`), - UNIQUE KEY `lock_domain_id` (`lock_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_logs -CREATE TABLE IF NOT EXISTS `neltool_logs` ( - `logs_id` int(11) NOT NULL AUTO_INCREMENT, - `logs_user_name` varchar(32) NOT NULL DEFAULT '0', - `logs_date` int(11) NOT NULL DEFAULT '0', - `logs_data` varchar(255) NOT NULL DEFAULT '', - PRIMARY KEY (`logs_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_notes -CREATE TABLE IF NOT EXISTS `neltool_notes` ( - `note_id` int(11) NOT NULL AUTO_INCREMENT, - `note_user_id` int(11) NOT NULL DEFAULT '0', - `note_title` varchar(128) NOT NULL DEFAULT '', - `note_data` text NOT NULL, - `note_date` int(11) NOT NULL DEFAULT '0', - `note_active` int(11) NOT NULL DEFAULT '0', - `note_global` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`note_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_restart_groups -CREATE TABLE IF NOT EXISTS `neltool_restart_groups` ( - `restart_group_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `restart_group_name` varchar(50) DEFAULT NULL, - `restart_group_list` varchar(50) DEFAULT NULL, - `restart_group_order` varchar(50) DEFAULT NULL, - PRIMARY KEY (`restart_group_id`), - UNIQUE KEY `restart_group_id` (`restart_group_id`), - KEY `restart_group_id_2` (`restart_group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_restart_messages -CREATE TABLE IF NOT EXISTS `neltool_restart_messages` ( - `restart_message_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `restart_message_name` varchar(20) DEFAULT NULL, - `restart_message_value` varchar(128) DEFAULT NULL, - `restart_message_lang` varchar(5) DEFAULT NULL, - PRIMARY KEY (`restart_message_id`), - UNIQUE KEY `restart_message_id` (`restart_message_id`), - KEY `restart_message_id_2` (`restart_message_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_restart_sequences -CREATE TABLE IF NOT EXISTS `neltool_restart_sequences` ( - `restart_sequence_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `restart_sequence_domain_id` int(10) unsigned NOT NULL DEFAULT '0', - `restart_sequence_shard_id` int(10) unsigned NOT NULL DEFAULT '0', - `restart_sequence_user_name` varchar(50) DEFAULT NULL, - `restart_sequence_step` int(10) unsigned NOT NULL DEFAULT '0', - `restart_sequence_date_start` int(11) DEFAULT NULL, - `restart_sequence_date_end` int(11) DEFAULT NULL, - `restart_sequence_timer` int(11) unsigned DEFAULT '0', - PRIMARY KEY (`restart_sequence_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_shards -CREATE TABLE IF NOT EXISTS `neltool_shards` ( - `shard_id` int(11) NOT NULL AUTO_INCREMENT, - `shard_name` varchar(128) NOT NULL DEFAULT '', - `shard_as_id` varchar(255) NOT NULL DEFAULT '0', - `shard_domain_id` int(11) NOT NULL DEFAULT '0', - `shard_lang` char(2) NOT NULL DEFAULT 'en', - `shard_restart` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`shard_id`), - KEY `shard_domain_id` (`shard_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_stats_hd_datas -CREATE TABLE IF NOT EXISTS `neltool_stats_hd_datas` ( - `hd_id` int(11) NOT NULL AUTO_INCREMENT, - `hd_domain_id` int(11) NOT NULL DEFAULT '0', - `hd_server` varchar(32) NOT NULL DEFAULT '', - `hd_device` varchar(64) NOT NULL DEFAULT '', - `hd_size` varchar(16) NOT NULL DEFAULT '', - `hd_used` varchar(16) NOT NULL DEFAULT '', - `hd_free` varchar(16) NOT NULL DEFAULT '', - `hd_percent` int(11) NOT NULL DEFAULT '0', - `hd_mount` varchar(128) NOT NULL DEFAULT '', - PRIMARY KEY (`hd_id`), - KEY `hd_domain_id` (`hd_domain_id`), - KEY `hd_server` (`hd_server`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_stats_hd_times -CREATE TABLE IF NOT EXISTS `neltool_stats_hd_times` ( - `hd_domain_id` int(11) NOT NULL DEFAULT '0', - `hd_last_time` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`hd_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_users -CREATE TABLE IF NOT EXISTS `neltool_users` ( - `user_id` int(11) NOT NULL AUTO_INCREMENT, - `user_name` varchar(32) NOT NULL DEFAULT '', - `user_password` varchar(64) NOT NULL DEFAULT '', - `user_group_id` int(11) NOT NULL DEFAULT '0', - `user_created` int(11) NOT NULL DEFAULT '0', - `user_active` int(11) NOT NULL DEFAULT '0', - `user_logged_last` int(11) NOT NULL DEFAULT '0', - `user_logged_count` int(11) NOT NULL DEFAULT '0', - `user_menu_style` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`user_id`), - UNIQUE KEY `user_login` (`user_name`), - KEY `user_group_id` (`user_group_id`), - KEY `user_active` (`user_active`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_user_applications -CREATE TABLE IF NOT EXISTS `neltool_user_applications` ( - `user_application_id` int(11) NOT NULL AUTO_INCREMENT, - `user_application_user_id` int(11) NOT NULL DEFAULT '0', - `user_application_application_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`user_application_id`), - KEY `user_application_user_id` (`user_application_user_id`), - KEY `user_application_application_id` (`user_application_application_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_user_domains -CREATE TABLE IF NOT EXISTS `neltool_user_domains` ( - `user_domain_id` int(11) NOT NULL AUTO_INCREMENT, - `user_domain_user_id` int(11) NOT NULL DEFAULT '0', - `user_domain_domain_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`user_domain_id`), - KEY `user_domain_user_id` (`user_domain_user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table nel_tool.neltool_user_shards -CREATE TABLE IF NOT EXISTS `neltool_user_shards` ( - `user_shard_id` int(11) NOT NULL AUTO_INCREMENT, - `user_shard_user_id` int(11) NOT NULL DEFAULT '0', - `user_shard_shard_id` int(11) NOT NULL DEFAULT '0', - `user_shard_domain_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`user_shard_id`), - KEY `user_shard_user_id` (`user_shard_user_id`), - KEY `user_shard_domain_id` (`user_shard_domain_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. -# -------------------------------------------------------- -# Host: 94.23.202.75 -# Database: ring_open -# Server version: 5.1.37-1ubuntu5.1 -# Server OS: debian-linux-gnu -# HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 09:14:32 -# -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!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' */; -# Dumping database structure for ring_open -CREATE DATABASE IF NOT EXISTS `ring_open` /*!40100 DEFAULT CHARACTER SET latin1 */; -USE `ring_open`; - - -# Dumping structure for table ring_open.characters -CREATE TABLE IF NOT EXISTS `characters` ( - `char_id` int(10) unsigned NOT NULL DEFAULT '0', - `char_name` varchar(20) NOT NULL DEFAULT '', - `user_id` int(10) unsigned NOT NULL DEFAULT '0', - `guild_id` int(10) unsigned NOT NULL DEFAULT '0', - `best_combat_level` int(10) unsigned NOT NULL DEFAULT '0', - `home_mainland_session_id` int(10) unsigned NOT NULL DEFAULT '0', - `ring_access` varchar(63) NOT NULL DEFAULT '', - `race` enum('r_fyros','r_matis','r_tryker','r_zorai') NOT NULL DEFAULT 'r_fyros', - `civilisation` enum('c_neutral','c_fyros','c_fyros','c_matis','c_tryker','c_zorai') NOT NULL DEFAULT 'c_neutral', - `cult` enum('c_neutral','c_kami','c_karavan') NOT NULL DEFAULT 'c_neutral', - `current_session` int(11) unsigned NOT NULL DEFAULT '0', - `rrp_am` int(11) unsigned NOT NULL DEFAULT '0', - `rrp_masterless` int(11) unsigned NOT NULL DEFAULT '0', - `rrp_author` int(11) unsigned NOT NULL DEFAULT '0', - `newcomer` tinyint(1) NOT NULL DEFAULT '1', - `creation_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `last_played_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`char_id`), - UNIQUE KEY `char_name_idx` (`char_name`,`home_mainland_session_id`), - KEY `user_id_idx` (`user_id`), - KEY `guild_idx` (`guild_id`), - KEY `guild_id_idx` (`guild_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.folder -CREATE TABLE IF NOT EXISTS `folder` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `owner` int(10) unsigned NOT NULL DEFAULT '0', - `title` varchar(40) NOT NULL DEFAULT '', - `comments` text NOT NULL, - PRIMARY KEY (`Id`), - KEY `owner_idx` (`owner`), - KEY `title_idx` (`title`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.folder_access -CREATE TABLE IF NOT EXISTS `folder_access` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `folder_id` int(10) unsigned NOT NULL DEFAULT '0', - `user_id` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`Id`), - KEY `folder_id_idx` (`folder_id`), - KEY `user_idx` (`user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.guilds -CREATE TABLE IF NOT EXISTS `guilds` ( - `guild_id` int(10) unsigned NOT NULL DEFAULT '0', - `guild_name` varchar(50) NOT NULL DEFAULT '', - `shard_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`guild_id`), - KEY `shard_id_idx` (`shard_id`), - KEY `guild_name_idx` (`guild_name`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.guild_invites -CREATE TABLE IF NOT EXISTS `guild_invites` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `session_id` int(10) unsigned NOT NULL DEFAULT '0', - `guild_id` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`Id`), - KEY `guild_id_idx` (`guild_id`), - KEY `session_id_idx` (`session_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.journal_entry -CREATE TABLE IF NOT EXISTS `journal_entry` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `session_id` int(10) unsigned NOT NULL DEFAULT '0', - `author` int(10) unsigned NOT NULL DEFAULT '0', - `type` enum('jet_credits','jet_notes') NOT NULL DEFAULT 'jet_notes', - `text` text NOT NULL, - `time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33', - PRIMARY KEY (`Id`), - KEY `session_id_idx` (`session_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.known_users -CREATE TABLE IF NOT EXISTS `known_users` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `owner` int(10) unsigned NOT NULL DEFAULT '0', - `targer_user` int(10) unsigned NOT NULL DEFAULT '0', - `targer_character` int(10) unsigned NOT NULL DEFAULT '0', - `relation_type` enum('rt_friend','rt_banned','rt_friend_dm') NOT NULL DEFAULT 'rt_friend', - `comments` varchar(255) NOT NULL DEFAULT '', - PRIMARY KEY (`Id`), - KEY `user_index` (`owner`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.mfs_erased_mail_series -CREATE TABLE IF NOT EXISTS `mfs_erased_mail_series` ( - `erased_char_id` int(11) unsigned NOT NULL DEFAULT '0', - `erased_char_name` varchar(32) NOT NULL DEFAULT '', - `erased_series` int(11) unsigned NOT NULL AUTO_INCREMENT, - `erase_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`erased_series`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.mfs_guild_thread -CREATE TABLE IF NOT EXISTS `mfs_guild_thread` ( - `thread_id` int(11) NOT NULL AUTO_INCREMENT, - `guild_id` int(11) unsigned NOT NULL DEFAULT '0', - `topic` varchar(255) NOT NULL DEFAULT '', - `author_name` varchar(32) NOT NULL DEFAULT '', - `last_post_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `post_count` int(11) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`thread_id`), - KEY `guild_index` (`guild_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.mfs_guild_thread_message -CREATE TABLE IF NOT EXISTS `mfs_guild_thread_message` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `thread_id` int(11) unsigned NOT NULL DEFAULT '0', - `author_name` varchar(32) NOT NULL DEFAULT '', - `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `content` text NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.mfs_mail -CREATE TABLE IF NOT EXISTS `mfs_mail` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `sender_name` varchar(32) NOT NULL DEFAULT '', - `subject` varchar(250) NOT NULL DEFAULT '', - `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `status` enum('ms_new','ms_read','ms_erased') NOT NULL DEFAULT 'ms_new', - `dest_char_id` int(11) unsigned NOT NULL DEFAULT '0', - `erase_series` int(11) unsigned NOT NULL DEFAULT '0', - `content` text NOT NULL, - PRIMARY KEY (`id`), - KEY `dest_index` (`dest_char_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.outlands -CREATE TABLE IF NOT EXISTS `outlands` ( - `session_id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `island_name` text NOT NULL, - `billing_instance_id` int(11) unsigned NOT NULL DEFAULT '0', - `anim_session_id` int(11) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`session_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.player_rating -CREATE TABLE IF NOT EXISTS `player_rating` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `scenario_id` int(10) unsigned NOT NULL DEFAULT '0', - `session_id` int(10) unsigned NOT NULL DEFAULT '0', - `rate_fun` tinyint(3) unsigned NOT NULL DEFAULT '0', - `rate_difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0', - `rate_accessibility` tinyint(3) unsigned NOT NULL DEFAULT '0', - `rate_originality` tinyint(3) unsigned NOT NULL DEFAULT '0', - `rate_direction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `author` int(10) unsigned NOT NULL DEFAULT '0', - `rating` int(10) NOT NULL DEFAULT '0', - `comments` text NOT NULL, - `time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33', - PRIMARY KEY (`Id`), - KEY `session_id_idx` (`scenario_id`), - KEY `author_idx` (`author`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.ring_users -CREATE TABLE IF NOT EXISTS `ring_users` ( - `user_id` int(10) unsigned NOT NULL DEFAULT '0', - `user_name` varchar(20) NOT NULL DEFAULT '', - `user_type` enum('ut_character','ut_pioneer') NOT NULL DEFAULT 'ut_character', - `current_session` int(10) unsigned NOT NULL DEFAULT '0', - `current_activity` enum('ca_none','ca_play','ca_edit','ca_anim') NOT NULL DEFAULT 'ca_none', - `current_status` enum('cs_offline','cs_logged','cs_online') NOT NULL DEFAULT 'cs_offline', - `public_level` enum('pl_none','pl_public') NOT NULL DEFAULT 'pl_none', - `account_type` enum('at_normal','at_gold') NOT NULL DEFAULT 'at_normal', - `content_access_level` varchar(20) NOT NULL DEFAULT '', - `description` text NOT NULL, - `lang` enum('lang_en','lang_fr','lang_de') NOT NULL DEFAULT 'lang_en', - `cookie` varchar(30) NOT NULL DEFAULT '', - `current_domain_id` int(10) NOT NULL DEFAULT '-1', - `pioneer_char_id` int(11) unsigned NOT NULL DEFAULT '0', - `current_char` int(11) NOT NULL DEFAULT '0', - `add_privileges` varchar(64) NOT NULL DEFAULT '', - PRIMARY KEY (`user_id`), - UNIQUE KEY `user_name_idx` (`user_name`), - KEY `cookie_idx` (`cookie`), - KEY `current_session_idx` (`current_session`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.scenario -CREATE TABLE IF NOT EXISTS `scenario` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `md5` varchar(64) NOT NULL DEFAULT '', - `title` varchar(32) NOT NULL DEFAULT '', - `description` text NOT NULL, - `author` varchar(32) NOT NULL DEFAULT '', - `rrp_total` int(11) unsigned NOT NULL DEFAULT '0', - `anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm', - `language` varchar(11) NOT NULL DEFAULT '', - `orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other', - `level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a', - `allow_free_trial` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.scenario_desc -CREATE TABLE IF NOT EXISTS `scenario_desc` ( - `session_id` int(10) unsigned NOT NULL DEFAULT '0', - `parent_scenario` int(10) unsigned NOT NULL DEFAULT '0', - `description` text NOT NULL, - `relation_to_parent` enum('rtp_same','rtp_variant','rtp_different') NOT NULL DEFAULT 'rtp_same', - `title` varchar(40) NOT NULL DEFAULT '', - `num_player` int(10) unsigned NOT NULL DEFAULT '0', - `content_access_level` varchar(20) NOT NULL DEFAULT '', - PRIMARY KEY (`session_id`), - UNIQUE KEY `title_idx` (`title`), - KEY `parent_idx` (`parent_scenario`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.sessions -CREATE TABLE IF NOT EXISTS `sessions` ( - `session_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `session_type` enum('st_edit','st_anim','st_outland','st_mainland') NOT NULL DEFAULT 'st_edit', - `title` varchar(40) NOT NULL DEFAULT '', - `owner` int(10) unsigned NOT NULL DEFAULT '0', - `plan_date` datetime NOT NULL DEFAULT '2005-09-21 12:41:33', - `start_date` datetime NOT NULL DEFAULT '2005-08-31 00:00:00', - `description` text NOT NULL, - `orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other', - `level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a', - `rule_type` enum('rt_strict','rt_liberal') NOT NULL DEFAULT 'rt_strict', - `access_type` enum('at_public','at_private') NOT NULL DEFAULT 'at_private', - `state` enum('ss_planned','ss_open','ss_locked','ss_closed') NOT NULL DEFAULT 'ss_planned', - `host_shard_id` int(11) NOT NULL DEFAULT '0', - `subscription_slots` int(11) unsigned NOT NULL DEFAULT '0', - `reserved_slots` int(10) unsigned NOT NULL DEFAULT '0', - `free_slots` int(10) unsigned NOT NULL DEFAULT '0', - `estimated_duration` enum('et_short','et_medium','et_long') NOT NULL DEFAULT 'et_short', - `final_duration` int(10) unsigned NOT NULL DEFAULT '0', - `folder_id` int(10) unsigned NOT NULL DEFAULT '0', - `lang` varchar(20) NOT NULL DEFAULT '', - `icone` varchar(70) NOT NULL DEFAULT '', - `anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm', - `race_filter` set('rf_fyros','rf_matis','rf_tryker','rf_zorai') NOT NULL DEFAULT '', - `religion_filter` set('rf_kami','rf_karavan','rf_neutral') NOT NULL DEFAULT '', - `guild_filter` enum('gf_only_my_guild','gf_any_player') DEFAULT 'gf_only_my_guild', - `shard_filter` set('sf_shard00','sf_shard01','sf_shard02','sf_shard03','sf_shard04','sf_shard05','sf_shard06','sf_shard07','sf_shard08','sf_shard09','sf_shard10','sf_shard11','sf_shard12','sf_shard13','sf_shard14','sf_shard15','sf_shard16','sf_shard17','sf_shard18','sf_shard19','sf_shard20','sf_shard21','sf_shard22','sf_shard23','sf_shard24','sf_shard25','sf_shard26','sf_shard27','sf_shard28','sf_shard29','sf_shard30','sf_shard31') NOT NULL DEFAULT 'sf_shard00,sf_shard01,sf_shard02,sf_shard03,sf_shard04,sf_shard05,sf_shard06,sf_shard07,sf_shard08,sf_shard09,sf_shard10,sf_shard11,sf_shard12,sf_shard13,sf_shard14,sf_shard15,sf_shard16,sf_shard17,sf_shard18,sf_shard19,sf_shard20,sf_shard21,sf_shard22,sf_shard23,sf_shard24,sf_shard25,sf_shard26,sf_shard27,sf_shard28,sf_shard29,sf_shard30,sf_shard31', - `level_filter` set('lf_a','lf_b','lf_c','lf_d','lf_e','lf_f') NOT NULL DEFAULT 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f', - `subscription_closed` tinyint(1) NOT NULL DEFAULT '0', - `newcomer` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0', - PRIMARY KEY (`session_id`), - KEY `owner_idx` (`owner`), - KEY `folder_idx` (`folder_id`), - KEY `state_type_idx` (`state`,`session_type`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.session_log -CREATE TABLE IF NOT EXISTS `session_log` ( - `id` int(11) NOT NULL DEFAULT '0', - `scenario_id` int(11) unsigned NOT NULL DEFAULT '0', - `rrp_scored` int(11) unsigned NOT NULL DEFAULT '0', - `scenario_point_scored` int(11) unsigned NOT NULL DEFAULT '0', - `time_taken` int(11) unsigned NOT NULL DEFAULT '0', - `participants` text NOT NULL, - `launch_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `owner` varchar(32) NOT NULL DEFAULT '0', - `guild_name` varchar(50) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.session_participant -CREATE TABLE IF NOT EXISTS `session_participant` ( - `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `session_id` int(10) unsigned NOT NULL DEFAULT '0', - `char_id` int(10) unsigned NOT NULL DEFAULT '0', - `status` enum('sps_play_subscribed','sps_play_invited','sps_edit_invited','sps_anim_invited','sps_playing','sps_editing','sps_animating') NOT NULL DEFAULT 'sps_play_subscribed', - `kicked` tinyint(1) unsigned NOT NULL DEFAULT '0', - `session_rated` tinyint(1) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`Id`), - KEY `session_idx` (`session_id`), - KEY `user_idx` (`char_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; - -# Data exporting was unselected. - - -# Dumping structure for table ring_open.shard -CREATE TABLE IF NOT EXISTS `shard` ( - `shard_id` int(10) NOT NULL DEFAULT '0', - `WSOnline` tinyint(1) NOT NULL DEFAULT '0', - `MOTD` text NOT NULL, - `OldState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_restricted', - `RequiredState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', - PRIMARY KEY (`shard_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; - -# Data exporting was unselected. -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/code/snowballs2/server/frontend/src/main.cpp b/code/snowballs2/server/frontend/src/main.cpp index 7b3470cbe..38bcc18fc 100644 --- a/code/snowballs2/server/frontend/src/main.cpp +++ b/code/snowballs2/server/frontend/src/main.cpp @@ -229,7 +229,7 @@ void cbAddClient ( CMessage& msgin, TSockId from, CCallbackNetBase& clientcb ) if(from->appId() != 0) { - CPlayer *p = (CPlayer *)(uint)from->appId(); + CPlayer *p = (CPlayer *)(void *)from->appId(); if(id == p->id) p->State = CPlayer::ONLINE; } @@ -590,12 +590,12 @@ void onDisconnectClient ( TSockId from, void *arg ) { uint32 id; - uint64 i = from->appId(); + uintptr_t i = from->appId(); if(i == 0) return; - CPlayer *p = (CPlayer *)(uint)i; + CPlayer *p = (CPlayer *)(void *)i; id = p->id; nlinfo( "A client with unique Id %u has disconnected", id ); diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Filelist.xml b/code/web/docs/admin/shard_restart/Filelist.xml similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Filelist.xml rename to code/web/docs/admin/shard_restart/Filelist.xml diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/H38.css b/code/web/docs/admin/shard_restart/H38.css similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/H38.css rename to code/web/docs/admin/shard_restart/H38.css diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/H70_2.htm b/code/web/docs/admin/shard_restart/H70_2.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/H70_2.htm rename to code/web/docs/admin/shard_restart/H70_2.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm b/code/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm rename to code/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hd36.xml b/code/web/docs/admin/shard_restart/Hd36.xml similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hd36.xml rename to code/web/docs/admin/shard_restart/Hd36.xml diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hf69.htm b/code/web/docs/admin/shard_restart/Hf69.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hf69.htm rename to code/web/docs/admin/shard_restart/Hf69.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.gif b/code/web/docs/admin/shard_restart/Hg39_1.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.gif rename to code/web/docs/admin/shard_restart/Hg39_1.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.htm b/code/web/docs/admin/shard_restart/Hg39_1.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.htm rename to code/web/docs/admin/shard_restart/Hg39_1.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.gif b/code/web/docs/admin/shard_restart/Hg41_2.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.gif rename to code/web/docs/admin/shard_restart/Hg41_2.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.htm b/code/web/docs/admin/shard_restart/Hg41_2.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.htm rename to code/web/docs/admin/shard_restart/Hg41_2.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.gif b/code/web/docs/admin/shard_restart/Hg43_3.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.gif rename to code/web/docs/admin/shard_restart/Hg43_3.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.htm b/code/web/docs/admin/shard_restart/Hg43_3.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.htm rename to code/web/docs/admin/shard_restart/Hg43_3.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.gif b/code/web/docs/admin/shard_restart/Hg45_4.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.gif rename to code/web/docs/admin/shard_restart/Hg45_4.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.htm b/code/web/docs/admin/shard_restart/Hg45_4.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.htm rename to code/web/docs/admin/shard_restart/Hg45_4.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.gif b/code/web/docs/admin/shard_restart/Hg47_5.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.gif rename to code/web/docs/admin/shard_restart/Hg47_5.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.htm b/code/web/docs/admin/shard_restart/Hg47_5.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.htm rename to code/web/docs/admin/shard_restart/Hg47_5.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.gif b/code/web/docs/admin/shard_restart/Hg49_6.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.gif rename to code/web/docs/admin/shard_restart/Hg49_6.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.htm b/code/web/docs/admin/shard_restart/Hg49_6.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.htm rename to code/web/docs/admin/shard_restart/Hg49_6.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.gif b/code/web/docs/admin/shard_restart/Hg51_7.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.gif rename to code/web/docs/admin/shard_restart/Hg51_7.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.htm b/code/web/docs/admin/shard_restart/Hg51_7.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.htm rename to code/web/docs/admin/shard_restart/Hg51_7.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.gif b/code/web/docs/admin/shard_restart/Hg53_8.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.gif rename to code/web/docs/admin/shard_restart/Hg53_8.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.htm b/code/web/docs/admin/shard_restart/Hg53_8.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.htm rename to code/web/docs/admin/shard_restart/Hg53_8.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.gif b/code/web/docs/admin/shard_restart/Hg55_9.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.gif rename to code/web/docs/admin/shard_restart/Hg55_9.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.htm b/code/web/docs/admin/shard_restart/Hg55_9.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.htm rename to code/web/docs/admin/shard_restart/Hg55_9.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.gif b/code/web/docs/admin/shard_restart/Hg57_10.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.gif rename to code/web/docs/admin/shard_restart/Hg57_10.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.htm b/code/web/docs/admin/shard_restart/Hg57_10.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.htm rename to code/web/docs/admin/shard_restart/Hg57_10.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.gif b/code/web/docs/admin/shard_restart/Hg59_11.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.gif rename to code/web/docs/admin/shard_restart/Hg59_11.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.htm b/code/web/docs/admin/shard_restart/Hg59_11.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.htm rename to code/web/docs/admin/shard_restart/Hg59_11.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.gif b/code/web/docs/admin/shard_restart/Hg61_12.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.gif rename to code/web/docs/admin/shard_restart/Hg61_12.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.htm b/code/web/docs/admin/shard_restart/Hg61_12.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.htm rename to code/web/docs/admin/shard_restart/Hg61_12.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hn68.htm b/code/web/docs/admin/shard_restart/Hn68.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hn68.htm rename to code/web/docs/admin/shard_restart/Hn68.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hu37.js b/code/web/docs/admin/shard_restart/Hu37.js similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hu37.js rename to code/web/docs/admin/shard_restart/Hu37.js diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/Hz63.htm b/code/web/docs/admin/shard_restart/Hz63.htm similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/Hz63.htm rename to code/web/docs/admin/shard_restart/Hz63.htm diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/lt_off.gif b/code/web/docs/admin/shard_restart/lt_off.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/lt_off.gif rename to code/web/docs/admin/shard_restart/lt_off.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/lt_over.gif b/code/web/docs/admin/shard_restart/lt_over.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/lt_over.gif rename to code/web/docs/admin/shard_restart/lt_over.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/rt_off.gif b/code/web/docs/admin/shard_restart/rt_off.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/rt_off.gif rename to code/web/docs/admin/shard_restart/rt_off.gif diff --git a/code/ryzom/tools/server/admin/docs/shard_restart/rt_over.gif b/code/web/docs/admin/shard_restart/rt_over.gif similarity index 100% rename from code/ryzom/tools/server/admin/docs/shard_restart/rt_over.gif rename to code/web/docs/admin/shard_restart/rt_over.gif diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/Doxyfile b/code/web/docs/ams/doxygen/Doxyfile similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/Doxyfile rename to code/web/docs/ams/doxygen/Doxyfile diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/db.png b/code/web/docs/ams/doxygen/img/db.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/db.png rename to code/web/docs/ams/doxygen/img/db.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.jpg b/code/web/docs/ams/doxygen/img/info.jpg similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.jpg rename to code/web/docs/ams/doxygen/img/info.jpg diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.psd b/code/web/docs/ams/doxygen/img/info.psd old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.psd rename to code/web/docs/ams/doxygen/img/info.psd diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/info.php b/code/web/docs/ams/doxygen/info.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/info.php rename to code/web/docs/ams/doxygen/info.php diff --git a/code/ryzom/tools/server/ryzom_ams_docs/doxygen/logo.png b/code/web/docs/ams/doxygen/logo.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/doxygen/logo.png rename to code/web/docs/ams/doxygen/logo.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/add__sgroup_8php.html b/code/web/docs/ams/html/add__sgroup_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/add__sgroup_8php.html rename to code/web/docs/ams/html/add__sgroup_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/add__user_8php.html b/code/web/docs/ams/html/add__user_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/add__user_8php.html rename to code/web/docs/ams/html/add__user_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/add__user__to__sgroup_8php.html b/code/web/docs/ams/html/add__user__to__sgroup_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/add__user__to__sgroup_8php.html rename to code/web/docs/ams/html/add__user__to__sgroup_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/annotated.html b/code/web/docs/ams/html/annotated.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/annotated.html rename to code/web/docs/ams/html/annotated.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/assigned_8php.html b/code/web/docs/ams/html/assigned_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/assigned_8php.html rename to code/web/docs/ams/html/assigned_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/bc_s.png b/code/web/docs/ams/html/bc_s.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/bc_s.png rename to code/web/docs/ams/html/bc_s.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/change__info_8php.html b/code/web/docs/ams/html/change__info_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/change__info_8php.html rename to code/web/docs/ams/html/change__info_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/change__mail_8php.html b/code/web/docs/ams/html/change__mail_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/change__mail_8php.html rename to code/web/docs/ams/html/change__mail_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/change__password_8php.html b/code/web/docs/ams/html/change__password_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/change__password_8php.html rename to code/web/docs/ams/html/change__password_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/change__permission_8php.html b/code/web/docs/ams/html/change__permission_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/change__permission_8php.html rename to code/web/docs/ams/html/change__permission_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/change__receivemail_8php.html b/code/web/docs/ams/html/change__receivemail_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/change__receivemail_8php.html rename to code/web/docs/ams/html/change__receivemail_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classAssigned.html b/code/web/docs/ams/html/classAssigned.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classAssigned.html rename to code/web/docs/ams/html/classAssigned.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classDBLayer.html b/code/web/docs/ams/html/classDBLayer.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classDBLayer.html rename to code/web/docs/ams/html/classDBLayer.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classForwarded.html b/code/web/docs/ams/html/classForwarded.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classForwarded.html rename to code/web/docs/ams/html/classForwarded.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classGui__Elements.html b/code/web/docs/ams/html/classGui__Elements.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classGui__Elements.html rename to code/web/docs/ams/html/classGui__Elements.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classHelpers.html b/code/web/docs/ams/html/classHelpers.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classHelpers.html rename to code/web/docs/ams/html/classHelpers.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classIn__Support__Group.html b/code/web/docs/ams/html/classIn__Support__Group.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classIn__Support__Group.html rename to code/web/docs/ams/html/classIn__Support__Group.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classMail__Handler.html b/code/web/docs/ams/html/classMail__Handler.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classMail__Handler.html rename to code/web/docs/ams/html/classMail__Handler.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classMyCrypt.html b/code/web/docs/ams/html/classMyCrypt.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classMyCrypt.html rename to code/web/docs/ams/html/classMyCrypt.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classPagination.html b/code/web/docs/ams/html/classPagination.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classPagination.html rename to code/web/docs/ams/html/classPagination.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classQuerycache.html b/code/web/docs/ams/html/classQuerycache.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classQuerycache.html rename to code/web/docs/ams/html/classQuerycache.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classSupport__Group.html b/code/web/docs/ams/html/classSupport__Group.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classSupport__Group.html rename to code/web/docs/ams/html/classSupport__Group.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classSync.html b/code/web/docs/ams/html/classSync.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classSync.html rename to code/web/docs/ams/html/classSync.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket.html b/code/web/docs/ams/html/classTicket.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket.html rename to code/web/docs/ams/html/classTicket.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Category.html b/code/web/docs/ams/html/classTicket__Category.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Category.html rename to code/web/docs/ams/html/classTicket__Category.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Content.html b/code/web/docs/ams/html/classTicket__Content.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Content.html rename to code/web/docs/ams/html/classTicket__Content.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Info.html b/code/web/docs/ams/html/classTicket__Info.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Info.html rename to code/web/docs/ams/html/classTicket__Info.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Log.html b/code/web/docs/ams/html/classTicket__Log.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Log.html rename to code/web/docs/ams/html/classTicket__Log.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Queue.html b/code/web/docs/ams/html/classTicket__Queue.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Queue.html rename to code/web/docs/ams/html/classTicket__Queue.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Queue__Handler.html b/code/web/docs/ams/html/classTicket__Queue__Handler.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Queue__Handler.html rename to code/web/docs/ams/html/classTicket__Queue__Handler.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Reply.html b/code/web/docs/ams/html/classTicket__Reply.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__Reply.html rename to code/web/docs/ams/html/classTicket__Reply.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__User.html b/code/web/docs/ams/html/classTicket__User.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classTicket__User.html rename to code/web/docs/ams/html/classTicket__User.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classUsers.html b/code/web/docs/ams/html/classUsers.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classUsers.html rename to code/web/docs/ams/html/classUsers.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classUsers.png b/code/web/docs/ams/html/classUsers.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classUsers.png rename to code/web/docs/ams/html/classUsers.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classWebUsers.html b/code/web/docs/ams/html/classWebUsers.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classWebUsers.html rename to code/web/docs/ams/html/classWebUsers.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classWebUsers.png b/code/web/docs/ams/html/classWebUsers.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classWebUsers.png rename to code/web/docs/ams/html/classWebUsers.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/classes.html b/code/web/docs/ams/html/classes.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/classes.html rename to code/web/docs/ams/html/classes.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/closed.png b/code/web/docs/ams/html/closed.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/closed.png rename to code/web/docs/ams/html/closed.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/create__ticket_8php.html b/code/web/docs/ams/html/create__ticket_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/create__ticket_8php.html rename to code/web/docs/ams/html/create__ticket_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/createticket_8php.html b/code/web/docs/ams/html/createticket_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/createticket_8php.html rename to code/web/docs/ams/html/createticket_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/dashboard_8php.html b/code/web/docs/ams/html/dashboard_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/dashboard_8php.html rename to code/web/docs/ams/html/dashboard_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/db.png b/code/web/docs/ams/html/db.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/db.png rename to code/web/docs/ams/html/db.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/dblayer_8php.html b/code/web/docs/ams/html/dblayer_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/dblayer_8php.html rename to code/web/docs/ams/html/dblayer_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/deprecated.html b/code/web/docs/ams/html/deprecated.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/deprecated.html rename to code/web/docs/ams/html/deprecated.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/design.html b/code/web/docs/ams/html/design.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/design.html rename to code/web/docs/ams/html/design.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/doxygen.css b/code/web/docs/ams/html/doxygen.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/doxygen.css rename to code/web/docs/ams/html/doxygen.css diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/doxygen.png b/code/web/docs/ams/html/doxygen.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/doxygen.png rename to code/web/docs/ams/html/doxygen.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2autoload_2webusers_8php.html b/code/web/docs/ams/html/drupal__module_2ryzommanage_2autoload_2webusers_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2autoload_2webusers_8php.html rename to code/web/docs/ams/html/drupal__module_2ryzommanage_2autoload_2webusers_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2config_8php.html b/code/web/docs/ams/html/drupal__module_2ryzommanage_2config_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2config_8php.html rename to code/web/docs/ams/html/drupal__module_2ryzommanage_2config_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2logout_8php.html b/code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2logout_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2logout_8php.html rename to code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2logout_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2settings_8php.html b/code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2settings_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2settings_8php.html rename to code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2settings_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2show__user_8php.html b/code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2show__user_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/drupal__module_2ryzommanage_2inc_2show__user_8php.html rename to code/web/docs/ams/html/drupal__module_2ryzommanage_2inc_2show__user_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/error_8php.html b/code/web/docs/ams/html/error_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/error_8php.html rename to code/web/docs/ams/html/error_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/files.html b/code/web/docs/ams/html/files.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/files.html rename to code/web/docs/ams/html/files.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/forwarded_8php.html b/code/web/docs/ams/html/forwarded_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/forwarded_8php.html rename to code/web/docs/ams/html/forwarded_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/func_2login_8php.html b/code/web/docs/ams/html/func_2login_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/func_2login_8php.html rename to code/web/docs/ams/html/func_2login_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions.html b/code/web/docs/ams/html/functions.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions.html rename to code/web/docs/ams/html/functions.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x5f.html b/code/web/docs/ams/html/functions_0x5f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x5f.html rename to code/web/docs/ams/html/functions_0x5f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x61.html b/code/web/docs/ams/html/functions_0x61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x61.html rename to code/web/docs/ams/html/functions_0x61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x63.html b/code/web/docs/ams/html/functions_0x63.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x63.html rename to code/web/docs/ams/html/functions_0x63.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x64.html b/code/web/docs/ams/html/functions_0x64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x64.html rename to code/web/docs/ams/html/functions_0x64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x65.html b/code/web/docs/ams/html/functions_0x65.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x65.html rename to code/web/docs/ams/html/functions_0x65.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x66.html b/code/web/docs/ams/html/functions_0x66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x66.html rename to code/web/docs/ams/html/functions_0x66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x67.html b/code/web/docs/ams/html/functions_0x67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x67.html rename to code/web/docs/ams/html/functions_0x67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x68.html b/code/web/docs/ams/html/functions_0x68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x68.html rename to code/web/docs/ams/html/functions_0x68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x69.html b/code/web/docs/ams/html/functions_0x69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x69.html rename to code/web/docs/ams/html/functions_0x69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6c.html b/code/web/docs/ams/html/functions_0x6c.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6c.html rename to code/web/docs/ams/html/functions_0x6c.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6d.html b/code/web/docs/ams/html/functions_0x6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6d.html rename to code/web/docs/ams/html/functions_0x6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6e.html b/code/web/docs/ams/html/functions_0x6e.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6e.html rename to code/web/docs/ams/html/functions_0x6e.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6f.html b/code/web/docs/ams/html/functions_0x6f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x6f.html rename to code/web/docs/ams/html/functions_0x6f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x73.html b/code/web/docs/ams/html/functions_0x73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x73.html rename to code/web/docs/ams/html/functions_0x73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x74.html b/code/web/docs/ams/html/functions_0x74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x74.html rename to code/web/docs/ams/html/functions_0x74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x75.html b/code/web/docs/ams/html/functions_0x75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x75.html rename to code/web/docs/ams/html/functions_0x75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x76.html b/code/web/docs/ams/html/functions_0x76.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_0x76.html rename to code/web/docs/ams/html/functions_0x76.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func.html b/code/web/docs/ams/html/functions_func.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func.html rename to code/web/docs/ams/html/functions_func.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x61.html b/code/web/docs/ams/html/functions_func_0x61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x61.html rename to code/web/docs/ams/html/functions_func_0x61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x63.html b/code/web/docs/ams/html/functions_func_0x63.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x63.html rename to code/web/docs/ams/html/functions_func_0x63.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x64.html b/code/web/docs/ams/html/functions_func_0x64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x64.html rename to code/web/docs/ams/html/functions_func_0x64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x65.html b/code/web/docs/ams/html/functions_func_0x65.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x65.html rename to code/web/docs/ams/html/functions_func_0x65.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x66.html b/code/web/docs/ams/html/functions_func_0x66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x66.html rename to code/web/docs/ams/html/functions_func_0x66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x67.html b/code/web/docs/ams/html/functions_func_0x67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x67.html rename to code/web/docs/ams/html/functions_func_0x67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x68.html b/code/web/docs/ams/html/functions_func_0x68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x68.html rename to code/web/docs/ams/html/functions_func_0x68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x69.html b/code/web/docs/ams/html/functions_func_0x69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x69.html rename to code/web/docs/ams/html/functions_func_0x69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6c.html b/code/web/docs/ams/html/functions_func_0x6c.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6c.html rename to code/web/docs/ams/html/functions_func_0x6c.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6d.html b/code/web/docs/ams/html/functions_func_0x6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6d.html rename to code/web/docs/ams/html/functions_func_0x6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6e.html b/code/web/docs/ams/html/functions_func_0x6e.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6e.html rename to code/web/docs/ams/html/functions_func_0x6e.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6f.html b/code/web/docs/ams/html/functions_func_0x6f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x6f.html rename to code/web/docs/ams/html/functions_func_0x6f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x73.html b/code/web/docs/ams/html/functions_func_0x73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x73.html rename to code/web/docs/ams/html/functions_func_0x73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x74.html b/code/web/docs/ams/html/functions_func_0x74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x74.html rename to code/web/docs/ams/html/functions_func_0x74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x75.html b/code/web/docs/ams/html/functions_func_0x75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x75.html rename to code/web/docs/ams/html/functions_func_0x75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x76.html b/code/web/docs/ams/html/functions_func_0x76.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_func_0x76.html rename to code/web/docs/ams/html/functions_func_0x76.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/functions_vars.html b/code/web/docs/ams/html/functions_vars.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/functions_vars.html rename to code/web/docs/ams/html/functions_vars.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/globals.html b/code/web/docs/ams/html/globals.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/globals.html rename to code/web/docs/ams/html/globals.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/globals_func.html b/code/web/docs/ams/html/globals_func.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/globals_func.html rename to code/web/docs/ams/html/globals_func.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/globals_vars.html b/code/web/docs/ams/html/globals_vars.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/globals_vars.html rename to code/web/docs/ams/html/globals_vars.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/gui__elements_8php.html b/code/web/docs/ams/html/gui__elements_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/gui__elements_8php.html rename to code/web/docs/ams/html/gui__elements_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/helpers_8php.html b/code/web/docs/ams/html/helpers_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/helpers_8php.html rename to code/web/docs/ams/html/helpers_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/hierarchy.html b/code/web/docs/ams/html/hierarchy.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/hierarchy.html rename to code/web/docs/ams/html/hierarchy.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/in__support__group_8php.html b/code/web/docs/ams/html/in__support__group_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/in__support__group_8php.html rename to code/web/docs/ams/html/in__support__group_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/inc_2login_8php.html b/code/web/docs/ams/html/inc_2login_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/inc_2login_8php.html rename to code/web/docs/ams/html/inc_2login_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/index.html b/code/web/docs/ams/html/index.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/index.html rename to code/web/docs/ams/html/index.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/index_8php.html b/code/web/docs/ams/html/index_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/index_8php.html rename to code/web/docs/ams/html/index_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/info.jpg b/code/web/docs/ams/html/info.jpg similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/info.jpg rename to code/web/docs/ams/html/info.jpg diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/info_8php.html b/code/web/docs/ams/html/info_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/info_8php.html rename to code/web/docs/ams/html/info_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/install_8php.html b/code/web/docs/ams/html/install_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/install_8php.html rename to code/web/docs/ams/html/install_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/installdox b/code/web/docs/ams/html/installdox old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/installdox rename to code/web/docs/ams/html/installdox diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/jquery.js b/code/web/docs/ams/html/jquery.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/jquery.js rename to code/web/docs/ams/html/jquery.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/libinclude_8php.html b/code/web/docs/ams/html/libinclude_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/libinclude_8php.html rename to code/web/docs/ams/html/libinclude_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/logo.png b/code/web/docs/ams/html/logo.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/logo.png rename to code/web/docs/ams/html/logo.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/mail__cron_8php.html b/code/web/docs/ams/html/mail__cron_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/mail__cron_8php.html rename to code/web/docs/ams/html/mail__cron_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/mail__handler_8php.html b/code/web/docs/ams/html/mail__handler_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/mail__handler_8php.html rename to code/web/docs/ams/html/mail__handler_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/modify__email__of__sgroup_8php.html b/code/web/docs/ams/html/modify__email__of__sgroup_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/modify__email__of__sgroup_8php.html rename to code/web/docs/ams/html/modify__email__of__sgroup_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/mycrypt_8php.html b/code/web/docs/ams/html/mycrypt_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/mycrypt_8php.html rename to code/web/docs/ams/html/mycrypt_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/nav_f.png b/code/web/docs/ams/html/nav_f.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/nav_f.png rename to code/web/docs/ams/html/nav_f.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/nav_h.png b/code/web/docs/ams/html/nav_h.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/nav_h.png rename to code/web/docs/ams/html/nav_h.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/open.png b/code/web/docs/ams/html/open.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/open.png rename to code/web/docs/ams/html/open.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/pages.html b/code/web/docs/ams/html/pages.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/pages.html rename to code/web/docs/ams/html/pages.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/pagination_8php.html b/code/web/docs/ams/html/pagination_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/pagination_8php.html rename to code/web/docs/ams/html/pagination_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/querycache_8php.html b/code/web/docs/ams/html/querycache_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/querycache_8php.html rename to code/web/docs/ams/html/querycache_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/register_8php.html b/code/web/docs/ams/html/register_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/register_8php.html rename to code/web/docs/ams/html/register_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/reply__on__ticket_8php.html b/code/web/docs/ams/html/reply__on__ticket_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/reply__on__ticket_8php.html rename to code/web/docs/ams/html/reply__on__ticket_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_24.html b/code/web/docs/ams/html/search/all_24.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_24.html rename to code/web/docs/ams/html/search/all_24.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_24.js b/code/web/docs/ams/html/search/all_24.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_24.js rename to code/web/docs/ams/html/search/all_24.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_5f.html b/code/web/docs/ams/html/search/all_5f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_5f.html rename to code/web/docs/ams/html/search/all_5f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_5f.js b/code/web/docs/ams/html/search/all_5f.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_5f.js rename to code/web/docs/ams/html/search/all_5f.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_61.html b/code/web/docs/ams/html/search/all_61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_61.html rename to code/web/docs/ams/html/search/all_61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_61.js b/code/web/docs/ams/html/search/all_61.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_61.js rename to code/web/docs/ams/html/search/all_61.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_63.html b/code/web/docs/ams/html/search/all_63.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_63.html rename to code/web/docs/ams/html/search/all_63.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_63.js b/code/web/docs/ams/html/search/all_63.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_63.js rename to code/web/docs/ams/html/search/all_63.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_64.html b/code/web/docs/ams/html/search/all_64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_64.html rename to code/web/docs/ams/html/search/all_64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_64.js b/code/web/docs/ams/html/search/all_64.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_64.js rename to code/web/docs/ams/html/search/all_64.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_65.html b/code/web/docs/ams/html/search/all_65.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_65.html rename to code/web/docs/ams/html/search/all_65.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_65.js b/code/web/docs/ams/html/search/all_65.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_65.js rename to code/web/docs/ams/html/search/all_65.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_66.html b/code/web/docs/ams/html/search/all_66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_66.html rename to code/web/docs/ams/html/search/all_66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_66.js b/code/web/docs/ams/html/search/all_66.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_66.js rename to code/web/docs/ams/html/search/all_66.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_67.html b/code/web/docs/ams/html/search/all_67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_67.html rename to code/web/docs/ams/html/search/all_67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_67.js b/code/web/docs/ams/html/search/all_67.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_67.js rename to code/web/docs/ams/html/search/all_67.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_68.html b/code/web/docs/ams/html/search/all_68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_68.html rename to code/web/docs/ams/html/search/all_68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_68.js b/code/web/docs/ams/html/search/all_68.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_68.js rename to code/web/docs/ams/html/search/all_68.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_69.html b/code/web/docs/ams/html/search/all_69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_69.html rename to code/web/docs/ams/html/search/all_69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_69.js b/code/web/docs/ams/html/search/all_69.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_69.js rename to code/web/docs/ams/html/search/all_69.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6c.html b/code/web/docs/ams/html/search/all_6c.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6c.html rename to code/web/docs/ams/html/search/all_6c.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6c.js b/code/web/docs/ams/html/search/all_6c.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6c.js rename to code/web/docs/ams/html/search/all_6c.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6d.html b/code/web/docs/ams/html/search/all_6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6d.html rename to code/web/docs/ams/html/search/all_6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6d.js b/code/web/docs/ams/html/search/all_6d.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6d.js rename to code/web/docs/ams/html/search/all_6d.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6e.html b/code/web/docs/ams/html/search/all_6e.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6e.html rename to code/web/docs/ams/html/search/all_6e.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6e.js b/code/web/docs/ams/html/search/all_6e.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6e.js rename to code/web/docs/ams/html/search/all_6e.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6f.html b/code/web/docs/ams/html/search/all_6f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6f.html rename to code/web/docs/ams/html/search/all_6f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6f.js b/code/web/docs/ams/html/search/all_6f.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_6f.js rename to code/web/docs/ams/html/search/all_6f.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_70.html b/code/web/docs/ams/html/search/all_70.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_70.html rename to code/web/docs/ams/html/search/all_70.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_70.js b/code/web/docs/ams/html/search/all_70.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_70.js rename to code/web/docs/ams/html/search/all_70.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_71.html b/code/web/docs/ams/html/search/all_71.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_71.html rename to code/web/docs/ams/html/search/all_71.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_71.js b/code/web/docs/ams/html/search/all_71.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_71.js rename to code/web/docs/ams/html/search/all_71.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_72.html b/code/web/docs/ams/html/search/all_72.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_72.html rename to code/web/docs/ams/html/search/all_72.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_72.js b/code/web/docs/ams/html/search/all_72.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_72.js rename to code/web/docs/ams/html/search/all_72.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_73.html b/code/web/docs/ams/html/search/all_73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_73.html rename to code/web/docs/ams/html/search/all_73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_73.js b/code/web/docs/ams/html/search/all_73.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_73.js rename to code/web/docs/ams/html/search/all_73.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_74.html b/code/web/docs/ams/html/search/all_74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_74.html rename to code/web/docs/ams/html/search/all_74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_74.js b/code/web/docs/ams/html/search/all_74.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_74.js rename to code/web/docs/ams/html/search/all_74.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_75.html b/code/web/docs/ams/html/search/all_75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_75.html rename to code/web/docs/ams/html/search/all_75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_75.js b/code/web/docs/ams/html/search/all_75.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_75.js rename to code/web/docs/ams/html/search/all_75.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_76.html b/code/web/docs/ams/html/search/all_76.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_76.html rename to code/web/docs/ams/html/search/all_76.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_76.js b/code/web/docs/ams/html/search/all_76.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_76.js rename to code/web/docs/ams/html/search/all_76.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_77.html b/code/web/docs/ams/html/search/all_77.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_77.html rename to code/web/docs/ams/html/search/all_77.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/all_77.js b/code/web/docs/ams/html/search/all_77.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/all_77.js rename to code/web/docs/ams/html/search/all_77.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_61.html b/code/web/docs/ams/html/search/classes_61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_61.html rename to code/web/docs/ams/html/search/classes_61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_61.js b/code/web/docs/ams/html/search/classes_61.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_61.js rename to code/web/docs/ams/html/search/classes_61.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_64.html b/code/web/docs/ams/html/search/classes_64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_64.html rename to code/web/docs/ams/html/search/classes_64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_64.js b/code/web/docs/ams/html/search/classes_64.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_64.js rename to code/web/docs/ams/html/search/classes_64.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_66.html b/code/web/docs/ams/html/search/classes_66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_66.html rename to code/web/docs/ams/html/search/classes_66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_66.js b/code/web/docs/ams/html/search/classes_66.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_66.js rename to code/web/docs/ams/html/search/classes_66.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_67.html b/code/web/docs/ams/html/search/classes_67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_67.html rename to code/web/docs/ams/html/search/classes_67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_67.js b/code/web/docs/ams/html/search/classes_67.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_67.js rename to code/web/docs/ams/html/search/classes_67.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_68.html b/code/web/docs/ams/html/search/classes_68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_68.html rename to code/web/docs/ams/html/search/classes_68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_68.js b/code/web/docs/ams/html/search/classes_68.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_68.js rename to code/web/docs/ams/html/search/classes_68.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_69.html b/code/web/docs/ams/html/search/classes_69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_69.html rename to code/web/docs/ams/html/search/classes_69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_69.js b/code/web/docs/ams/html/search/classes_69.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_69.js rename to code/web/docs/ams/html/search/classes_69.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_6d.html b/code/web/docs/ams/html/search/classes_6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_6d.html rename to code/web/docs/ams/html/search/classes_6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_6d.js b/code/web/docs/ams/html/search/classes_6d.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_6d.js rename to code/web/docs/ams/html/search/classes_6d.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_70.html b/code/web/docs/ams/html/search/classes_70.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_70.html rename to code/web/docs/ams/html/search/classes_70.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_70.js b/code/web/docs/ams/html/search/classes_70.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_70.js rename to code/web/docs/ams/html/search/classes_70.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_71.html b/code/web/docs/ams/html/search/classes_71.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_71.html rename to code/web/docs/ams/html/search/classes_71.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_71.js b/code/web/docs/ams/html/search/classes_71.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_71.js rename to code/web/docs/ams/html/search/classes_71.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_73.html b/code/web/docs/ams/html/search/classes_73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_73.html rename to code/web/docs/ams/html/search/classes_73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_73.js b/code/web/docs/ams/html/search/classes_73.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_73.js rename to code/web/docs/ams/html/search/classes_73.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_74.html b/code/web/docs/ams/html/search/classes_74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_74.html rename to code/web/docs/ams/html/search/classes_74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_74.js b/code/web/docs/ams/html/search/classes_74.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_74.js rename to code/web/docs/ams/html/search/classes_74.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_75.html b/code/web/docs/ams/html/search/classes_75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_75.html rename to code/web/docs/ams/html/search/classes_75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_75.js b/code/web/docs/ams/html/search/classes_75.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_75.js rename to code/web/docs/ams/html/search/classes_75.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_77.html b/code/web/docs/ams/html/search/classes_77.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_77.html rename to code/web/docs/ams/html/search/classes_77.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_77.js b/code/web/docs/ams/html/search/classes_77.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/classes_77.js rename to code/web/docs/ams/html/search/classes_77.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/close.png b/code/web/docs/ams/html/search/close.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/close.png rename to code/web/docs/ams/html/search/close.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_61.html b/code/web/docs/ams/html/search/files_61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_61.html rename to code/web/docs/ams/html/search/files_61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_61.js b/code/web/docs/ams/html/search/files_61.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_61.js rename to code/web/docs/ams/html/search/files_61.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_63.html b/code/web/docs/ams/html/search/files_63.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_63.html rename to code/web/docs/ams/html/search/files_63.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_63.js b/code/web/docs/ams/html/search/files_63.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_63.js rename to code/web/docs/ams/html/search/files_63.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_64.html b/code/web/docs/ams/html/search/files_64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_64.html rename to code/web/docs/ams/html/search/files_64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_64.js b/code/web/docs/ams/html/search/files_64.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_64.js rename to code/web/docs/ams/html/search/files_64.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_65.html b/code/web/docs/ams/html/search/files_65.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_65.html rename to code/web/docs/ams/html/search/files_65.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_65.js b/code/web/docs/ams/html/search/files_65.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_65.js rename to code/web/docs/ams/html/search/files_65.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_66.html b/code/web/docs/ams/html/search/files_66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_66.html rename to code/web/docs/ams/html/search/files_66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_66.js b/code/web/docs/ams/html/search/files_66.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_66.js rename to code/web/docs/ams/html/search/files_66.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_67.html b/code/web/docs/ams/html/search/files_67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_67.html rename to code/web/docs/ams/html/search/files_67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_67.js b/code/web/docs/ams/html/search/files_67.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_67.js rename to code/web/docs/ams/html/search/files_67.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_68.html b/code/web/docs/ams/html/search/files_68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_68.html rename to code/web/docs/ams/html/search/files_68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_68.js b/code/web/docs/ams/html/search/files_68.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_68.js rename to code/web/docs/ams/html/search/files_68.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_69.html b/code/web/docs/ams/html/search/files_69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_69.html rename to code/web/docs/ams/html/search/files_69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_69.js b/code/web/docs/ams/html/search/files_69.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_69.js rename to code/web/docs/ams/html/search/files_69.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6c.html b/code/web/docs/ams/html/search/files_6c.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6c.html rename to code/web/docs/ams/html/search/files_6c.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6c.js b/code/web/docs/ams/html/search/files_6c.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6c.js rename to code/web/docs/ams/html/search/files_6c.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6d.html b/code/web/docs/ams/html/search/files_6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6d.html rename to code/web/docs/ams/html/search/files_6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6d.js b/code/web/docs/ams/html/search/files_6d.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_6d.js rename to code/web/docs/ams/html/search/files_6d.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_70.html b/code/web/docs/ams/html/search/files_70.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_70.html rename to code/web/docs/ams/html/search/files_70.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_70.js b/code/web/docs/ams/html/search/files_70.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_70.js rename to code/web/docs/ams/html/search/files_70.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_71.html b/code/web/docs/ams/html/search/files_71.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_71.html rename to code/web/docs/ams/html/search/files_71.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_71.js b/code/web/docs/ams/html/search/files_71.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_71.js rename to code/web/docs/ams/html/search/files_71.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_72.html b/code/web/docs/ams/html/search/files_72.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_72.html rename to code/web/docs/ams/html/search/files_72.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_72.js b/code/web/docs/ams/html/search/files_72.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_72.js rename to code/web/docs/ams/html/search/files_72.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_73.html b/code/web/docs/ams/html/search/files_73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_73.html rename to code/web/docs/ams/html/search/files_73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_73.js b/code/web/docs/ams/html/search/files_73.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_73.js rename to code/web/docs/ams/html/search/files_73.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_74.html b/code/web/docs/ams/html/search/files_74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_74.html rename to code/web/docs/ams/html/search/files_74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_74.js b/code/web/docs/ams/html/search/files_74.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_74.js rename to code/web/docs/ams/html/search/files_74.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_75.html b/code/web/docs/ams/html/search/files_75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_75.html rename to code/web/docs/ams/html/search/files_75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_75.js b/code/web/docs/ams/html/search/files_75.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_75.js rename to code/web/docs/ams/html/search/files_75.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_77.html b/code/web/docs/ams/html/search/files_77.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_77.html rename to code/web/docs/ams/html/search/files_77.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/files_77.js b/code/web/docs/ams/html/search/files_77.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/files_77.js rename to code/web/docs/ams/html/search/files_77.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_5f.html b/code/web/docs/ams/html/search/functions_5f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_5f.html rename to code/web/docs/ams/html/search/functions_5f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_5f.js b/code/web/docs/ams/html/search/functions_5f.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_5f.js rename to code/web/docs/ams/html/search/functions_5f.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_61.html b/code/web/docs/ams/html/search/functions_61.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_61.html rename to code/web/docs/ams/html/search/functions_61.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_61.js b/code/web/docs/ams/html/search/functions_61.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_61.js rename to code/web/docs/ams/html/search/functions_61.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_63.html b/code/web/docs/ams/html/search/functions_63.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_63.html rename to code/web/docs/ams/html/search/functions_63.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_63.js b/code/web/docs/ams/html/search/functions_63.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_63.js rename to code/web/docs/ams/html/search/functions_63.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_64.html b/code/web/docs/ams/html/search/functions_64.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_64.html rename to code/web/docs/ams/html/search/functions_64.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_64.js b/code/web/docs/ams/html/search/functions_64.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_64.js rename to code/web/docs/ams/html/search/functions_64.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_65.html b/code/web/docs/ams/html/search/functions_65.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_65.html rename to code/web/docs/ams/html/search/functions_65.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_65.js b/code/web/docs/ams/html/search/functions_65.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_65.js rename to code/web/docs/ams/html/search/functions_65.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_66.html b/code/web/docs/ams/html/search/functions_66.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_66.html rename to code/web/docs/ams/html/search/functions_66.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_66.js b/code/web/docs/ams/html/search/functions_66.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_66.js rename to code/web/docs/ams/html/search/functions_66.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_67.html b/code/web/docs/ams/html/search/functions_67.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_67.html rename to code/web/docs/ams/html/search/functions_67.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_67.js b/code/web/docs/ams/html/search/functions_67.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_67.js rename to code/web/docs/ams/html/search/functions_67.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_68.html b/code/web/docs/ams/html/search/functions_68.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_68.html rename to code/web/docs/ams/html/search/functions_68.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_68.js b/code/web/docs/ams/html/search/functions_68.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_68.js rename to code/web/docs/ams/html/search/functions_68.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_69.html b/code/web/docs/ams/html/search/functions_69.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_69.html rename to code/web/docs/ams/html/search/functions_69.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_69.js b/code/web/docs/ams/html/search/functions_69.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_69.js rename to code/web/docs/ams/html/search/functions_69.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6c.html b/code/web/docs/ams/html/search/functions_6c.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6c.html rename to code/web/docs/ams/html/search/functions_6c.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6c.js b/code/web/docs/ams/html/search/functions_6c.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6c.js rename to code/web/docs/ams/html/search/functions_6c.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6d.html b/code/web/docs/ams/html/search/functions_6d.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6d.html rename to code/web/docs/ams/html/search/functions_6d.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6d.js b/code/web/docs/ams/html/search/functions_6d.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6d.js rename to code/web/docs/ams/html/search/functions_6d.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6e.html b/code/web/docs/ams/html/search/functions_6e.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6e.html rename to code/web/docs/ams/html/search/functions_6e.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6e.js b/code/web/docs/ams/html/search/functions_6e.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6e.js rename to code/web/docs/ams/html/search/functions_6e.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6f.html b/code/web/docs/ams/html/search/functions_6f.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6f.html rename to code/web/docs/ams/html/search/functions_6f.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6f.js b/code/web/docs/ams/html/search/functions_6f.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_6f.js rename to code/web/docs/ams/html/search/functions_6f.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_72.html b/code/web/docs/ams/html/search/functions_72.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_72.html rename to code/web/docs/ams/html/search/functions_72.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_72.js b/code/web/docs/ams/html/search/functions_72.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_72.js rename to code/web/docs/ams/html/search/functions_72.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_73.html b/code/web/docs/ams/html/search/functions_73.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_73.html rename to code/web/docs/ams/html/search/functions_73.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_73.js b/code/web/docs/ams/html/search/functions_73.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_73.js rename to code/web/docs/ams/html/search/functions_73.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_74.html b/code/web/docs/ams/html/search/functions_74.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_74.html rename to code/web/docs/ams/html/search/functions_74.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_74.js b/code/web/docs/ams/html/search/functions_74.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_74.js rename to code/web/docs/ams/html/search/functions_74.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_75.html b/code/web/docs/ams/html/search/functions_75.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_75.html rename to code/web/docs/ams/html/search/functions_75.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_75.js b/code/web/docs/ams/html/search/functions_75.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_75.js rename to code/web/docs/ams/html/search/functions_75.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_76.html b/code/web/docs/ams/html/search/functions_76.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_76.html rename to code/web/docs/ams/html/search/functions_76.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_76.js b/code/web/docs/ams/html/search/functions_76.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_76.js rename to code/web/docs/ams/html/search/functions_76.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_77.html b/code/web/docs/ams/html/search/functions_77.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_77.html rename to code/web/docs/ams/html/search/functions_77.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_77.js b/code/web/docs/ams/html/search/functions_77.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/functions_77.js rename to code/web/docs/ams/html/search/functions_77.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/mag_sel.png b/code/web/docs/ams/html/search/mag_sel.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/mag_sel.png rename to code/web/docs/ams/html/search/mag_sel.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/nomatches.html b/code/web/docs/ams/html/search/nomatches.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/nomatches.html rename to code/web/docs/ams/html/search/nomatches.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/search.css b/code/web/docs/ams/html/search/search.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/search.css rename to code/web/docs/ams/html/search/search.css diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/search.js b/code/web/docs/ams/html/search/search.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/search.js rename to code/web/docs/ams/html/search/search.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/search_l.png b/code/web/docs/ams/html/search/search_l.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/search_l.png rename to code/web/docs/ams/html/search/search_l.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/search_m.png b/code/web/docs/ams/html/search/search_m.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/search_m.png rename to code/web/docs/ams/html/search/search_m.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/search_r.png b/code/web/docs/ams/html/search/search_r.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/search_r.png rename to code/web/docs/ams/html/search/search_r.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/variables_24.html b/code/web/docs/ams/html/search/variables_24.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/variables_24.html rename to code/web/docs/ams/html/search/variables_24.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/search/variables_24.js b/code/web/docs/ams/html/search/variables_24.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/search/variables_24.js rename to code/web/docs/ams/html/search/variables_24.js diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/sgroup__list_8php.html b/code/web/docs/ams/html/sgroup__list_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/sgroup__list_8php.html rename to code/web/docs/ams/html/sgroup__list_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__queue_8php.html b/code/web/docs/ams/html/show__queue_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__queue_8php.html rename to code/web/docs/ams/html/show__queue_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__reply_8php.html b/code/web/docs/ams/html/show__reply_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__reply_8php.html rename to code/web/docs/ams/html/show__reply_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__sgroup_8php.html b/code/web/docs/ams/html/show__sgroup_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__sgroup_8php.html rename to code/web/docs/ams/html/show__sgroup_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket_8php.html b/code/web/docs/ams/html/show__ticket_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket_8php.html rename to code/web/docs/ams/html/show__ticket_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket__info_8php.html b/code/web/docs/ams/html/show__ticket__info_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket__info_8php.html rename to code/web/docs/ams/html/show__ticket__info_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket__log_8php.html b/code/web/docs/ams/html/show__ticket__log_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/show__ticket__log_8php.html rename to code/web/docs/ams/html/show__ticket__log_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/support__group_8php.html b/code/web/docs/ams/html/support__group_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/support__group_8php.html rename to code/web/docs/ams/html/support__group_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/sync_8php.html b/code/web/docs/ams/html/sync_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/sync_8php.html rename to code/web/docs/ams/html/sync_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/sync__cron_8php.html b/code/web/docs/ams/html/sync__cron_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/sync__cron_8php.html rename to code/web/docs/ams/html/sync__cron_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/syncing_8php.html b/code/web/docs/ams/html/syncing_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/syncing_8php.html rename to code/web/docs/ams/html/syncing_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/tab_a.png b/code/web/docs/ams/html/tab_a.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/tab_a.png rename to code/web/docs/ams/html/tab_a.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/tab_b.png b/code/web/docs/ams/html/tab_b.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/tab_b.png rename to code/web/docs/ams/html/tab_b.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/tab_h.png b/code/web/docs/ams/html/tab_h.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/tab_h.png rename to code/web/docs/ams/html/tab_h.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/tab_s.png b/code/web/docs/ams/html/tab_s.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/tab_s.png rename to code/web/docs/ams/html/tab_s.png diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/tabs.css b/code/web/docs/ams/html/tabs.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/tabs.css rename to code/web/docs/ams/html/tabs.css diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket_8php.html b/code/web/docs/ams/html/ticket_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket_8php.html rename to code/web/docs/ams/html/ticket_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__category_8php.html b/code/web/docs/ams/html/ticket__category_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__category_8php.html rename to code/web/docs/ams/html/ticket__category_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__content_8php.html b/code/web/docs/ams/html/ticket__content_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__content_8php.html rename to code/web/docs/ams/html/ticket__content_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__info_8php.html b/code/web/docs/ams/html/ticket__info_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__info_8php.html rename to code/web/docs/ams/html/ticket__info_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__log_8php.html b/code/web/docs/ams/html/ticket__log_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__log_8php.html rename to code/web/docs/ams/html/ticket__log_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__queue_8php.html b/code/web/docs/ams/html/ticket__queue_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__queue_8php.html rename to code/web/docs/ams/html/ticket__queue_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__queue__handler_8php.html b/code/web/docs/ams/html/ticket__queue__handler_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__queue__handler_8php.html rename to code/web/docs/ams/html/ticket__queue__handler_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__reply_8php.html b/code/web/docs/ams/html/ticket__reply_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__reply_8php.html rename to code/web/docs/ams/html/ticket__reply_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/ticket__user_8php.html b/code/web/docs/ams/html/ticket__user_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/ticket__user_8php.html rename to code/web/docs/ams/html/ticket__user_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/todo.html b/code/web/docs/ams/html/todo.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/todo.html rename to code/web/docs/ams/html/todo.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/userlist_8php.html b/code/web/docs/ams/html/userlist_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/userlist_8php.html rename to code/web/docs/ams/html/userlist_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/users_8php.html b/code/web/docs/ams/html/users_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/users_8php.html rename to code/web/docs/ams/html/users_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/www_2config_8php.html b/code/web/docs/ams/html/www_2config_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/www_2config_8php.html rename to code/web/docs/ams/html/www_2config_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2autoload_2webusers_8php.html b/code/web/docs/ams/html/www_2html_2autoload_2webusers_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2autoload_2webusers_8php.html rename to code/web/docs/ams/html/www_2html_2autoload_2webusers_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2logout_8php.html b/code/web/docs/ams/html/www_2html_2inc_2logout_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2logout_8php.html rename to code/web/docs/ams/html/www_2html_2inc_2logout_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2settings_8php.html b/code/web/docs/ams/html/www_2html_2inc_2settings_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2settings_8php.html rename to code/web/docs/ams/html/www_2html_2inc_2settings_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2show__user_8php.html b/code/web/docs/ams/html/www_2html_2inc_2show__user_8php.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams_docs/html/www_2html_2inc_2show__user_8php.html rename to code/web/docs/ams/html/www_2html_2inc_2show__user_8php.html diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/.plugincache.php.swp b/code/web/private_php/ams/autoload/.plugincache.php.swp similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/.plugincache.php.swp rename to code/web/private_php/ams/autoload/.plugincache.php.swp diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/assigned.php b/code/web/private_php/ams/autoload/assigned.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/assigned.php rename to code/web/private_php/ams/autoload/assigned.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/dblayer.php b/code/web/private_php/ams/autoload/dblayer.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/dblayer.php rename to code/web/private_php/ams/autoload/dblayer.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/forwarded.php b/code/web/private_php/ams/autoload/forwarded.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/forwarded.php rename to code/web/private_php/ams/autoload/forwarded.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php b/code/web/private_php/ams/autoload/gui_elements.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php rename to code/web/private_php/ams/autoload/gui_elements.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/web/private_php/ams/autoload/helpers.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php rename to code/web/private_php/ams/autoload/helpers.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/in_support_group.php b/code/web/private_php/ams/autoload/in_support_group.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/in_support_group.php rename to code/web/private_php/ams/autoload/in_support_group.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php b/code/web/private_php/ams/autoload/mail_handler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php rename to code/web/private_php/ams/autoload/mail_handler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mycrypt.php b/code/web/private_php/ams/autoload/mycrypt.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mycrypt.php rename to code/web/private_php/ams/autoload/mycrypt.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/pagination.php b/code/web/private_php/ams/autoload/pagination.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/pagination.php rename to code/web/private_php/ams/autoload/pagination.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php b/code/web/private_php/ams/autoload/plugincache.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php rename to code/web/private_php/ams/autoload/plugincache.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/querycache.php b/code/web/private_php/ams/autoload/querycache.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/querycache.php rename to code/web/private_php/ams/autoload/querycache.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/rest_api.php b/code/web/private_php/ams/autoload/rest_api.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/rest_api.php rename to code/web/private_php/ams/autoload/rest_api.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/support_group.php b/code/web/private_php/ams/autoload/support_group.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/support_group.php rename to code/web/private_php/ams/autoload/support_group.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sync.php b/code/web/private_php/ams/autoload/sync.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sync.php rename to code/web/private_php/ams/autoload/sync.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php b/code/web/private_php/ams/autoload/ticket.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php rename to code/web/private_php/ams/autoload/ticket.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_category.php b/code/web/private_php/ams/autoload/ticket_category.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_category.php rename to code/web/private_php/ams/autoload/ticket_category.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_content.php b/code/web/private_php/ams/autoload/ticket_content.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_content.php rename to code/web/private_php/ams/autoload/ticket_content.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_info.php b/code/web/private_php/ams/autoload/ticket_info.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_info.php rename to code/web/private_php/ams/autoload/ticket_info.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php b/code/web/private_php/ams/autoload/ticket_log.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php rename to code/web/private_php/ams/autoload/ticket_log.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_queue.php b/code/web/private_php/ams/autoload/ticket_queue.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_queue.php rename to code/web/private_php/ams/autoload/ticket_queue.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_queue_handler.php b/code/web/private_php/ams/autoload/ticket_queue_handler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_queue_handler.php rename to code/web/private_php/ams/autoload/ticket_queue_handler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_reply.php b/code/web/private_php/ams/autoload/ticket_reply.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_reply.php rename to code/web/private_php/ams/autoload/ticket_reply.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_user.php b/code/web/private_php/ams/autoload/ticket_user.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_user.php rename to code/web/private_php/ams/autoload/ticket_user.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php b/code/web/private_php/ams/autoload/users.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php rename to code/web/private_php/ams/autoload/users.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/configs/ams_lib.conf b/code/web/private_php/ams/configs/ams_lib.conf similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/configs/ams_lib.conf rename to code/web/private_php/ams/configs/ams_lib.conf diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/configs/ingame_layout.ini b/code/web/private_php/ams/configs/ingame_layout.ini similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/configs/ingame_layout.ini rename to code/web/private_php/ams/configs/ingame_layout.ini diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/cron/mail_cron.php b/code/web/private_php/ams/cron/mail_cron.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/cron/mail_cron.php rename to code/web/private_php/ams/cron/mail_cron.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/cron/sync_cron.php b/code/web/private_php/ams/cron/sync_cron.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/cron/sync_cron.php rename to code/web/private_php/ams/cron/sync_cron.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/client.png b/code/web/private_php/ams/img/info/client.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/client.png rename to code/web/private_php/ams/img/info/client.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/connect.png b/code/web/private_php/ams/img/info/connect.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/connect.png rename to code/web/private_php/ams/img/info/connect.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/cpuid.png b/code/web/private_php/ams/img/info/cpuid.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/cpuid.png rename to code/web/private_php/ams/img/info/cpuid.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/ht.png b/code/web/private_php/ams/img/info/ht.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/ht.png rename to code/web/private_php/ams/img/info/ht.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/local.png b/code/web/private_php/ams/img/info/local.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/local.png rename to code/web/private_php/ams/img/info/local.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/mask.png b/code/web/private_php/ams/img/info/mask.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/mask.png rename to code/web/private_php/ams/img/info/mask.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/memory.png b/code/web/private_php/ams/img/info/memory.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/memory.png rename to code/web/private_php/ams/img/info/memory.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/nel.png b/code/web/private_php/ams/img/info/nel.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/nel.png rename to code/web/private_php/ams/img/info/nel.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/os.png b/code/web/private_php/ams/img/info/os.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/os.png rename to code/web/private_php/ams/img/info/os.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/patch.png b/code/web/private_php/ams/img/info/patch.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/patch.png rename to code/web/private_php/ams/img/info/patch.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/position.png b/code/web/private_php/ams/img/info/position.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/position.png rename to code/web/private_php/ams/img/info/position.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/processor.png b/code/web/private_php/ams/img/info/processor.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/processor.png rename to code/web/private_php/ams/img/info/processor.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/server.png b/code/web/private_php/ams/img/info/server.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/server.png rename to code/web/private_php/ams/img/info/server.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/shard.png b/code/web/private_php/ams/img/info/shard.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/shard.png rename to code/web/private_php/ams/img/info/shard.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/user.png b/code/web/private_php/ams/img/info/user.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/user.png rename to code/web/private_php/ams/img/info/user.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/view.png b/code/web/private_php/ams/img/info/view.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/view.png rename to code/web/private_php/ams/img/info/view.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl b/code/web/private_php/ams/ingame_templates/createticket.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl rename to code/web/private_php/ams/ingame_templates/createticket.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl b/code/web/private_php/ams/ingame_templates/dashboard.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl rename to code/web/private_php/ams/ingame_templates/dashboard.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/index.tpl b/code/web/private_php/ams/ingame_templates/index.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/index.tpl rename to code/web/private_php/ams/ingame_templates/index.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl b/code/web/private_php/ams/ingame_templates/layout.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl rename to code/web/private_php/ams/ingame_templates/layout.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl b/code/web/private_php/ams/ingame_templates/layout_admin.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl rename to code/web/private_php/ams/ingame_templates/layout_admin.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl b/code/web/private_php/ams/ingame_templates/layout_mod.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl rename to code/web/private_php/ams/ingame_templates/layout_mod.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl b/code/web/private_php/ams/ingame_templates/layout_user.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl rename to code/web/private_php/ams/ingame_templates/layout_user.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl b/code/web/private_php/ams/ingame_templates/login.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl rename to code/web/private_php/ams/ingame_templates/login.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl b/code/web/private_php/ams/ingame_templates/register.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl rename to code/web/private_php/ams/ingame_templates/register.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl b/code/web/private_php/ams/ingame_templates/settings.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl rename to code/web/private_php/ams/ingame_templates/settings.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl b/code/web/private_php/ams/ingame_templates/sgroup_list.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl rename to code/web/private_php/ams/ingame_templates/sgroup_list.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl b/code/web/private_php/ams/ingame_templates/show_queue.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl rename to code/web/private_php/ams/ingame_templates/show_queue.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl b/code/web/private_php/ams/ingame_templates/show_reply.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl rename to code/web/private_php/ams/ingame_templates/show_reply.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl b/code/web/private_php/ams/ingame_templates/show_sgroup.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl rename to code/web/private_php/ams/ingame_templates/show_sgroup.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl b/code/web/private_php/ams/ingame_templates/show_ticket.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl rename to code/web/private_php/ams/ingame_templates/show_ticket.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl b/code/web/private_php/ams/ingame_templates/show_ticket_info.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl rename to code/web/private_php/ams/ingame_templates/show_ticket_info.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl b/code/web/private_php/ams/ingame_templates/show_ticket_log.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl rename to code/web/private_php/ams/ingame_templates/show_ticket_log.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl b/code/web/private_php/ams/ingame_templates/show_user.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl rename to code/web/private_php/ams/ingame_templates/show_user.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl b/code/web/private_php/ams/ingame_templates/userlist.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl rename to code/web/private_php/ams/ingame_templates/userlist.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php b/code/web/private_php/ams/libinclude.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php rename to code/web/private_php/ams/libinclude.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/.info b/code/web/private_php/ams/plugins/API_key_management/.info similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/.info rename to code/web/private_php/ams/plugins/API_key_management/.info diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/API_key_management.php b/code/web/private_php/ams/plugins/API_key_management/API_key_management.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/API_key_management.php rename to code/web/private_php/ams/plugins/API_key_management/API_key_management.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/generate_key.php b/code/web/private_php/ams/plugins/API_key_management/generate_key.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/generate_key.php rename to code/web/private_php/ams/plugins/API_key_management/generate_key.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/templates/gen_key.tpl b/code/web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/templates/gen_key.tpl rename to code/web/private_php/ams/plugins/API_key_management/templates/gen_key.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/templates/index.tpl b/code/web/private_php/ams/plugins/API_key_management/templates/index.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/API_key_management/templates/index.tpl rename to code/web/private_php/ams/plugins/API_key_management/templates/index.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/.info b/code/web/private_php/ams/plugins/Achievements/.info similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/.info rename to code/web/private_php/ams/plugins/Achievements/.info diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/Achievements.php b/code/web/private_php/ams/plugins/Achievements/Achievements.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/Achievements.php rename to code/web/private_php/ams/plugins/Achievements/Achievements.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/templates/index.tpl b/code/web/private_php/ams/plugins/Achievements/templates/index.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/Achievements/templates/index.tpl rename to code/web/private_php/ams/plugins/Achievements/templates/index.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.apc.php b/code/web/private_php/ams/plugins/cacheresource.apc.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.apc.php rename to code/web/private_php/ams/plugins/cacheresource.apc.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.memcache.php b/code/web/private_php/ams/plugins/cacheresource.memcache.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.memcache.php rename to code/web/private_php/ams/plugins/cacheresource.memcache.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.mysql.php b/code/web/private_php/ams/plugins/cacheresource.mysql.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/cacheresource.mysql.php rename to code/web/private_php/ams/plugins/cacheresource.mysql.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.extendsall.php b/code/web/private_php/ams/plugins/resource.extendsall.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.extendsall.php rename to code/web/private_php/ams/plugins/resource.extendsall.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.mysql.php b/code/web/private_php/ams/plugins/resource.mysql.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.mysql.php rename to code/web/private_php/ams/plugins/resource.mysql.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.mysqls.php b/code/web/private_php/ams/plugins/resource.mysqls.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/plugins/resource.mysqls.php rename to code/web/private_php/ams/plugins/resource.mysqls.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/README b/code/web/private_php/ams/smarty/README similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/README rename to code/web/private_php/ams/smarty/README diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_2_BC_NOTES.txt b/code/web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_2_BC_NOTES.txt rename to code/web/private_php/ams/smarty/SMARTY_2_BC_NOTES.txt diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_3.0_BC_NOTES.txt b/code/web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_3.0_BC_NOTES.txt rename to code/web/private_php/ams/smarty/SMARTY_3.0_BC_NOTES.txt diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_3.1_NOTES.txt b/code/web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/SMARTY_3.1_NOTES.txt rename to code/web/private_php/ams/smarty/SMARTY_3.1_NOTES.txt diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/change_log.txt b/code/web/private_php/ams/smarty/change_log.txt similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/change_log.txt rename to code/web/private_php/ams/smarty/change_log.txt diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/Smarty.class.php b/code/web/private_php/ams/smarty/libs/Smarty.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/Smarty.class.php rename to code/web/private_php/ams/smarty/libs/Smarty.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/SmartyBC.class.php b/code/web/private_php/ams/smarty/libs/SmartyBC.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/SmartyBC.class.php rename to code/web/private_php/ams/smarty/libs/SmartyBC.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/debug.tpl b/code/web/private_php/ams/smarty/libs/debug.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/debug.tpl rename to code/web/private_php/ams/smarty/libs/debug.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/block.textformat.php b/code/web/private_php/ams/smarty/libs/plugins/block.textformat.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/block.textformat.php rename to code/web/private_php/ams/smarty/libs/plugins/block.textformat.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.counter.php b/code/web/private_php/ams/smarty/libs/plugins/function.counter.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.counter.php rename to code/web/private_php/ams/smarty/libs/plugins/function.counter.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.cycle.php b/code/web/private_php/ams/smarty/libs/plugins/function.cycle.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.cycle.php rename to code/web/private_php/ams/smarty/libs/plugins/function.cycle.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.fetch.php b/code/web/private_php/ams/smarty/libs/plugins/function.fetch.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.fetch.php rename to code/web/private_php/ams/smarty/libs/plugins/function.fetch.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_checkboxes.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_checkboxes.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_checkboxes.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_image.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_image.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_image.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_image.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_options.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_options.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_options.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_options.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_radios.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_radios.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_radios.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_radios.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_select_date.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_select_date.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_select_date.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_select_date.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_select_time.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_select_time.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_select_time.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_select_time.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_table.php b/code/web/private_php/ams/smarty/libs/plugins/function.html_table.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.html_table.php rename to code/web/private_php/ams/smarty/libs/plugins/function.html_table.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.mailto.php b/code/web/private_php/ams/smarty/libs/plugins/function.mailto.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.mailto.php rename to code/web/private_php/ams/smarty/libs/plugins/function.mailto.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.math.php b/code/web/private_php/ams/smarty/libs/plugins/function.math.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/function.math.php rename to code/web/private_php/ams/smarty/libs/plugins/function.math.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.capitalize.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.capitalize.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.capitalize.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.date_format.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.date_format.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.date_format.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.date_format.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.debug_print_var.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.debug_print_var.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.debug_print_var.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.escape.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.escape.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.escape.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.escape.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.regex_replace.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.regex_replace.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.regex_replace.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.replace.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.replace.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.replace.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.replace.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.spacify.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.spacify.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.spacify.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.spacify.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.truncate.php b/code/web/private_php/ams/smarty/libs/plugins/modifier.truncate.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifier.truncate.php rename to code/web/private_php/ams/smarty/libs/plugins/modifier.truncate.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.cat.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.cat.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.cat.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_characters.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_characters.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_characters.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_paragraphs.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_paragraphs.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_sentences.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_sentences.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_sentences.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_words.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.count_words.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.count_words.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.default.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.default.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.default.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.escape.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.escape.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.escape.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.from_charset.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.from_charset.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.from_charset.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.indent.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.indent.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.indent.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.lower.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.lower.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.lower.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.noprint.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.noprint.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.noprint.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.string_format.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.string_format.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.string_format.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.strip.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.strip.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.strip_tags.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.strip_tags.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.strip_tags.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.to_charset.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.to_charset.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.to_charset.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.unescape.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.unescape.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.unescape.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.upper.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.upper.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.upper.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.wordwrap.php b/code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/modifiercompiler.wordwrap.php rename to code/web/private_php/ams/smarty/libs/plugins/modifiercompiler.wordwrap.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/outputfilter.trimwhitespace.php b/code/web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/outputfilter.trimwhitespace.php rename to code/web/private_php/ams/smarty/libs/plugins/outputfilter.trimwhitespace.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.escape_special_chars.php b/code/web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.escape_special_chars.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.escape_special_chars.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.literal_compiler_param.php b/code/web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.literal_compiler_param.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.literal_compiler_param.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.make_timestamp.php b/code/web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.make_timestamp.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.make_timestamp.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_str_replace.php b/code/web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_str_replace.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.mb_str_replace.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_unicode.php b/code/web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_unicode.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.mb_unicode.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_wordwrap.php b/code/web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/shared.mb_wordwrap.php rename to code/web/private_php/ams/smarty/libs/plugins/shared.mb_wordwrap.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/code/web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/plugins/variablefilter.htmlspecialchars.php rename to code/web/private_php/ams/smarty/libs/plugins/variablefilter.htmlspecialchars.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource_custom.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_custom.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_config_source.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_config_source.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_config_source.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_append.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_append.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_append.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_assign.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_assign.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_block.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_block.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_block.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_break.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_break.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_break.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_call.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_call.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_call.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_capture.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_capture.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_config_load.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_config_load.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_continue.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_continue.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_debug.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_debug.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_eval.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_eval.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_extends.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_extends.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_for.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_for.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_for.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_foreach.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_foreach.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_function.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_function.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_function.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_if.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_if.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_if.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_include.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_include.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_include_php.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_include_php.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_insert.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_insert.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_nocache.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_nocache.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_section.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_section.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_section.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_while.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compile_while.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compile_while.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compilebase.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_compilebase.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_compilebase.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_config.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_config.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_configfilelexer.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfilelexer.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_configfileparser.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_configfileparser.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_data.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_data.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_data.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_debug.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_debug.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_debug.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_filter_handler.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_filter_handler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_function_call_handler.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_function_call_handler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_get_include_path.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_get_include_path.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_nocache_insert.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_nocache_insert.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_parsetree.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_parsetree.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_parsetree.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_eval.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_eval.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_extends.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_extends.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_file.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_file.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_file.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_php.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_php.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_php.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_registered.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_registered.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_stream.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_stream.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_string.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_resource_string.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_resource_string.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_template.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_template.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_template.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatebase.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatebase.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templatelexer.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatelexer.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templateparser.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_templateparser.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templateparser.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_utility.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_utility.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_utility.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_write_file.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_internal_write_file.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_write_file.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_custom.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_custom.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_custom.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_recompiled.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_recompiled.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_recompiled.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_resource_uncompiled.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_resource_uncompiled.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_security.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_security.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/smarty/libs/sysplugins/smarty_security.php rename to code/web/private_php/ams/smarty/libs/sysplugins/smarty_security.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/web/private_php/ams/translations/en.ini similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini rename to code/web/private_php/ams/translations/en.ini diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini b/code/web/private_php/ams/translations/fr.ini similarity index 52% rename from code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini rename to code/web/private_php/ams/translations/fr.ini index b1e80440f..2f709530d 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini +++ b/code/web/private_php/ams/translations/fr.ini @@ -2,36 +2,36 @@ ; Comments start with ';', as in php.ini [ams_content] -ams_title="Ryzom Account Mangement System" +ams_title="Système de Gestion de Comptes de Ryzom" [dashboard] -home_title = "Presentation" -home_info = "Bienvenue sur le Ryzom Core - Account Management System" +home_title = "Présentation" +home_info = "Bienvenue dans le Système de Gestion de Comptes de Ryzom Core" [settings] [forgot_password] -title = "Oubliez votre passport?" -forgot_password_message = "Entrer votre email address pour reseter le passport!" -email_tag = "Email Address" -email_tooltip = "le emailaddress liee au compte dont vous avez oublie le mot de passe." +title = "Vous avez oublié votre mot de passe ?" +forgot_password_message = "Veuillez entrer votre adresse email pour réinitiliser le mot de passe !" +email_tag = "Adresse email" +email_tooltip = "L'adresse email liée au compte dont vous avez oublié le mot de passe." email_default = "Email" -email_doesnt_exist = "C'est emailaddress ne correspond pas a n'importe quel utilisateur!" -email_sent = "Un e-mail avec des instructions a ete envoye a l'adresse email!" -register_message =" Inscrivez-vous Si vous n'avez pas encore de compte, creez-en un " +email_doesnt_exist = "Cette adresse email ne correspond à aucun utilisateur !" +email_sent = "Un message avec les instructions a été envoyé à l'adresse email !" +register_message ="Inscrivez-vous Si vous n'avez pas encore de compte, créez-en un " here = "ici" -login_message = "vous pouvez toujours fait au bon chance a " +login_message = "Vous pouvez toujours essayer de vous identifier en cliquant sur " [reset_password] -title = "reset votre email" -reset_password_message = "Entrer votre nouveaux mot de passe!" +title = "Réinitialiser votre mot de passe" +reset_password_message = "Veuillez entrer votre nouveau mot de passe !" -password_tag = "desire Mot de passe:" -password_tooltip = "Prendre un mot de passe dificille, il faut etre 5-20 caracteres" -password_message = "mot de passe doit être 5-20 caractères." +password_tag = "Nouveau mot de passe :" +password_tooltip = "Saisir un mot de passe complexe (il doit faire entre 5 et 20 caractètes)" +password_message = "Le mot de passe doit faire entre 5 et 20 caractères." password_default = "Mot de passe" -cpassword_tag = "Confirmer le mot de passe:" +cpassword_tag = "Confirmer le mot de passe :" cpassword_message = "Retapez votre mot de passe" cpassword_tooltip = "Retapez votre mot de passe" cpassword_default = "Re-entrer mot de passe" @@ -41,7 +41,7 @@ syncing_title = "LibDB-Query Liste" syncing_info = "Ici vous pouvez voir la liste complete des elements dans le tableau libdb-Query. Vous pouvez facilement supprimer des elements et appuyant sur 'Synchroniser', vous pouvez commencer le processus de synchronisation manuellement!" syncing_sync = "Synchroniser" shard_online = "Le shard semble etre ligne , la synchronisation manuellement est possible: " -shard_offline = "Le shard semble etre deconnecte , la synchronisation manuellement n' est pas possible!" +shard_offline = "Le shard semble etre deconnecte , la synchronisation manuellement n' est pas possible !" members = "Membres" id = "ID" type = "Categorie" @@ -65,28 +65,28 @@ not_assigned = "Ne rien" [show_queue] not_assigned = "Libre" -success_assigned = "Ce billet est succesfull assignee!" -success_unassigned = "Ce billet est succesful unassignee!" -ticket_not_existing = "ce billet n'existe pas!" -ticket_already_assigned = "Ce billet est deja assigne a quelqu'un autre" +success_assigned = "Ce billet a été correctement assigné !" +success_unassigned = "Ce billet a été correctement désasigné !" +ticket_not_existing = "ce billet n'existe pas !" +ticket_already_assigned = "Ce billet est déjà assignè à quelqu'un autre" ticket_not_assigned = "Ce billet n'est assigne pas" public_sgroup = "Publique" [show_sgroup] -add_to_group_success = "ce user est ajoute sur la groupe!" -user_already_added = "cet user est deja membre de la groupe!" -group_not_existing = "cet Groupe n' existe pas!" -user_not_existing = "cet user n'existe pas" +add_to_group_success = "ce user est ajoute sur la groupe !" +user_already_added = "cet user est deja membre de la groupe !" +group_not_existing = "Ce groupe n'existe pas !" +user_not_existing = "Cet utilisateur n'existe pas" not_mod_or_admin = "C'est possible d'ajoute seulement des mods et admins!" modify_mail_of_group_success = "Les parametres de messagerie du Groupe d'appui ont ete modifies!" -email_not_valid = "L'adresse email de groupe est invalide!" -no_password_given = "Soyez conscient qu'il n'y avait aucun mot de passe remplie, de sorte que le mot de passe est atm vide!" +email_not_valid = "L'adresse email de groupe est invalide !" +no_password_given = "Soyez conscient qu'il n'y avait aucun mot de passe remplie, de sorte que le mot de passe est atm vide !" [sgroup_list] -group_success = "le group est cree!" -group_name_taken = "le nom pour le group est deja utilise!" -group_tag_taken = "le tag pour le group est deja utilise!" +group_success = "le group est cree !" +group_name_taken = "le nom pour le group est deja utilise !" +group_tag_taken = "le tag pour le group est deja utilise !" group_size_error = "le nom doit etre 4-20 chars et le tag 2-4!" [createticket] @@ -112,50 +112,50 @@ group_size_error = "le nom doit etre 4-20 chars et le tag 2-4!" title404 = "Pas
trouvez!" title403 = "Interdit!" error_message404 = "Ce page que vous cherchez n'existe pas." -error_message403 = "Vous n'avez pas permission d'access ce page!" +error_message403 = "Vous n'avez pas permission d'access ce page !" go_home = "Allez au main page" [userlist] -userlist_info = "bienvenue sur le userlist page!" +userlist_info = "bienvenue sur le userlist page !" [login] -login_info = "S'il vous plait vous connecter avec votre Email/nom d'utilisateur et mot de passe." +login_info = "Veuillez vous connecter avec votre email/nom d'utilisateur et mot de passe." login_error_message = "Le remplie Email/nom d'utilisateur / mot de passe ne sont pas correctes!" -login_register_message =" Inscrivez-vous Si vous n'avez pas encore de compte, creez-en un" +login_register_message ="Inscrivez-vous Si vous n'avez pas encore de compte, créez-en un" login_here = "ici" -login_forgot_password_message = "Dans le cas ou vous avez oublie votre mot de passe, cliquez" +login_forgot_password_message = "Si vous avez oublié votre mot de passe, cliquez" [logout] -logout_message = "Vous avez été déconnecté avec succès!" +logout_message = "Vous avez été déconnecté avec succès !" login_title = "Identifier" -login_timer = "Vous serez redirigé vers la page de connexion à " -login_text = "Ou cliquez ici si vous ne voulez pas attendre!" +login_timer = "Vous serez redirigé vers la page de connexion à " +login_text = "Ou cliquez ici si vous ne voulez pas attendre !" [reset_success] logout_message = "Vous avez changez votre passport bien!" login_title = "Identifier" -login_timer = "Vous serez redirigé vers la page de connexion à " -login_text = "Ou cliquez ici si vous ne voulez pas attendre!" +login_timer = "Vous serez redirigé vers la page de connexion à " +login_text = "Ou cliquez ici si vous ne voulez pas attendre !" [register_feedback] -status_ok = "Vous vous êtes inscrit comme un patron!" -status_shardoffline = "Il semble que le shard est déconnecté, vous pouvez utiliser le web-compte, mais vous devrez attendre pour le tesson." -status_liboffline = "Vous ne pouvez pas enregistrer un compte à l'heure actuelle" +status_ok = "Vous vous êtes inscrit comme un patron!" +status_shardoffline = "Il semble que le shard est déconnecté, vous pouvez utiliser le web-compte, mais vous devrez attendre pour le tesson." +status_liboffline = "Vous ne pouvez pas enregistrer un compte à l'heure actuelle" login_title = "Identifier" -login_timer = "Vous serez redirigé vers la page de connexion à " -login_text = "Ou cliquez ici si vous ne voulez pas attendre!" +login_timer = "Vous serez redirigé vers la page de connexion à " +login_text = "Ou cliquez ici si vous ne voulez pas attendre !" [register] title = "RYZOM base dans ENREGISTREMENT DU JEU" welcome_message = "Bienvenue! S'il vous plait remplissez les champs ci-dessous pour obtenir votre nouveau compte de base de Ryzom:" username_tag = "Nom d'utilisateur desire:" -username_tooltip = "5-12 caractères et de chiffres minuscules. Le login (nom d'utilisateur) que vous créez ici sera votre nom de connexion. Le nom de vos personnages de jeu sera choisi plus tard." +username_tooltip = "5-12 caractères et de chiffres minuscules. Le login (nom d'utilisateur) que vous créez ici sera votre nom de connexion. Le nom de vos personnages de jeu sera choisi plus tard." username_default = "Nom d'utilisateur" password_tag = "desire Mot de passe:" password_tooltip = "Prendre un mot de passe dificille, il faut etre 5-20 caracteres" -password_message = "mot de passe doit être 5-20 caractères." +password_message = "mot de passe doit être 5-20 caractères." password_default = "Mot de passe" cpassword_tag = "Confirmer le mot de passe:" @@ -164,8 +164,8 @@ cpassword_tooltip = "Retapez votre mot de passe" cpassword_default = "Re-entrer mot de passe" email_tag= "email adresse" -email_tooltip = "Adresse de courriel (pour qui un email de confirmation vous sera envoyé):" -email_message = "Veuillez vérifier que l'adresse e-mail que vous entrez ici est valable et restera valable à l'avenir. Elle ne sera utilisée que pour gérer votre compte de base de Ryzom." +email_tooltip = "Adresse de courriel (pour qui un email de confirmation vous sera envoyé):" +email_message = "Veuillez vérifier que l'adresse e-mail que vous entrez ici est valable et restera valable à l'avenir. Elle ne sera utilisée que pour gérer votre compte de base de Ryzom." email_default = "email" tac_tag1 = "OUI, j'accepte les " @@ -202,27 +202,27 @@ Vous ne pouvez pas repondre a ce message pour repondre directement sur le billet ;WARNAUTHOR ;========================================================================== -email_subject_warn_author = "Quelqu'un a essayé de répondre à votre billet: [Ticket #" -email_body_warn_author_1 = "Quelqu'un a essayé de répondre à votre billet: " -email_body_warn_author_2 = " en envoyant un courriel à partir de " -email_body_warn_author_3 = " ! Veuillez utiliser l'adresse e-mail correspondant à votre compte si vous souhaitez réponse automatique. +email_subject_warn_author = "Quelqu'un a essayé de répondre à votre billet: [Ticket #" +email_body_warn_author_1 = "Quelqu'un a essayé de répondre à votre billet: " +email_body_warn_author_2 = " en envoyant un courriel à partir de " +email_body_warn_author_3 = " ! Veuillez utiliser l'adresse e-mail correspondant à votre compte si vous souhaitez réponse automatique. Si " -email_body_warn_author_4 = " n'est pas l'une de vos adresses e-mail, s'il vous plaît contactez-nous en répondant à ce billet!" +email_body_warn_author_4 = " n'est pas l'une de vos adresses e-mail, s'il vous plaît contactez-nous en répondant à ce billet!" ;WARNSENDER ;========================================================================== -email_subject_warn_sender = "Vous avez tenté de répondre à quelqu'un billet elses!" -email_body_warn_sender = "Il semble que vous avez essayé de répondre à quelqu'un billet elses, copiez l'adresse e-mail correspondant à ce compte! +email_subject_warn_sender = "Vous avez tenté de répondre à quelqu'un billet elses!" +email_body_warn_sender = "Il semble que vous avez essayé de répondre à quelqu'un billet elses, copiez l'adresse e-mail correspondant à ce compte! -Cet acte est notifié au propriétaire du billet de vrai! " +Cet acte est notifié au propriétaire du billet de vrai! " ;WARNUNKNOWNENDER ;========================================================================== -email_subject_warn_unknown_sender = "Vous avez tenté de répondre à la billetterie de quelqu'un!" -email_body_warn_unknown_sender = "Il semble que vous avez essayé de répondre à la billetterie de quelqu'un, mais cette adresse e-mail n'est pas liée à un compte, veuillez utiliser l'adresse e-mail correspondant à ce compte! +email_subject_warn_unknown_sender = "Vous avez tenté de répondre à la billetterie de quelqu'un!" +email_body_warn_unknown_sender = "Il semble que vous avez essayé de répondre à la billetterie de quelqu'un, mais cette adresse e-mail n'est pas liée à un compte, veuillez utiliser l'adresse e-mail correspondant à ce compte! -Cet acte est notifié au propriétaire du billet de vrai!" +Cet acte est notifié au propriétaire du billet de vrai!" ;=========================================================================== ;FORGOTPASSWORD diff --git a/code/ryzom/tools/server/admin/common.php b/code/web/public_php/admin/common.php similarity index 100% rename from code/ryzom/tools/server/admin/common.php rename to code/web/public_php/admin/common.php diff --git a/code/ryzom/tools/server/admin/crons/cron_harddisk.php b/code/web/public_php/admin/crons/cron_harddisk.php similarity index 100% rename from code/ryzom/tools/server/admin/crons/cron_harddisk.php rename to code/web/public_php/admin/crons/cron_harddisk.php diff --git a/code/ryzom/tools/server/admin/crons/cron_harddisk.sh b/code/web/public_php/admin/crons/cron_harddisk.sh similarity index 100% rename from code/ryzom/tools/server/admin/crons/cron_harddisk.sh rename to code/web/public_php/admin/crons/cron_harddisk.sh diff --git a/code/ryzom/tools/server/admin/crons/index.html b/code/web/public_php/admin/crons/index.html similarity index 100% rename from code/ryzom/tools/server/admin/crons/index.html rename to code/web/public_php/admin/crons/index.html diff --git a/code/ryzom/tools/server/admin/functions_auth.php b/code/web/public_php/admin/functions_auth.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_auth.php rename to code/web/public_php/admin/functions_auth.php diff --git a/code/ryzom/tools/server/admin/functions_common.php b/code/web/public_php/admin/functions_common.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_common.php rename to code/web/public_php/admin/functions_common.php diff --git a/code/ryzom/tools/server/admin/functions_mysql.php b/code/web/public_php/admin/functions_mysql.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_mysql.php rename to code/web/public_php/admin/functions_mysql.php diff --git a/code/ryzom/tools/server/admin/functions_mysqli.php b/code/web/public_php/admin/functions_mysqli.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_mysqli.php rename to code/web/public_php/admin/functions_mysqli.php diff --git a/code/ryzom/tools/server/admin/functions_tool_administration.php b/code/web/public_php/admin/functions_tool_administration.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_administration.php rename to code/web/public_php/admin/functions_tool_administration.php diff --git a/code/ryzom/tools/server/admin/functions_tool_applications.php b/code/web/public_php/admin/functions_tool_applications.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_applications.php rename to code/web/public_php/admin/functions_tool_applications.php diff --git a/code/ryzom/tools/server/admin/functions_tool_event_entities.php b/code/web/public_php/admin/functions_tool_event_entities.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_event_entities.php rename to code/web/public_php/admin/functions_tool_event_entities.php diff --git a/code/ryzom/tools/server/admin/functions_tool_graphs.php b/code/web/public_php/admin/functions_tool_graphs.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_graphs.php rename to code/web/public_php/admin/functions_tool_graphs.php diff --git a/code/ryzom/tools/server/admin/functions_tool_guild_locator.php b/code/web/public_php/admin/functions_tool_guild_locator.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_guild_locator.php rename to code/web/public_php/admin/functions_tool_guild_locator.php diff --git a/code/ryzom/tools/server/admin/functions_tool_log_analyser.php b/code/web/public_php/admin/functions_tool_log_analyser.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_log_analyser.php rename to code/web/public_php/admin/functions_tool_log_analyser.php diff --git a/code/ryzom/tools/server/admin/functions_tool_main.php b/code/web/public_php/admin/functions_tool_main.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_main.php rename to code/web/public_php/admin/functions_tool_main.php diff --git a/code/ryzom/tools/server/admin/functions_tool_mfs.php b/code/web/public_php/admin/functions_tool_mfs.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_mfs.php rename to code/web/public_php/admin/functions_tool_mfs.php diff --git a/code/ryzom/tools/server/admin/functions_tool_notes.php b/code/web/public_php/admin/functions_tool_notes.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_notes.php rename to code/web/public_php/admin/functions_tool_notes.php diff --git a/code/ryzom/tools/server/admin/functions_tool_player_locator.php b/code/web/public_php/admin/functions_tool_player_locator.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_player_locator.php rename to code/web/public_php/admin/functions_tool_player_locator.php diff --git a/code/ryzom/tools/server/admin/functions_tool_preferences.php b/code/web/public_php/admin/functions_tool_preferences.php similarity index 100% rename from code/ryzom/tools/server/admin/functions_tool_preferences.php rename to code/web/public_php/admin/functions_tool_preferences.php diff --git a/code/ryzom/tools/server/admin/graphs_output/placeholder b/code/web/public_php/admin/graphs_output/placeholder similarity index 100% rename from code/ryzom/tools/server/admin/graphs_output/placeholder rename to code/web/public_php/admin/graphs_output/placeholder diff --git a/code/ryzom/tools/server/admin/imgs/bg_live.png b/code/web/public_php/admin/imgs/bg_live.png similarity index 100% rename from code/ryzom/tools/server/admin/imgs/bg_live.png rename to code/web/public_php/admin/imgs/bg_live.png diff --git a/code/ryzom/tools/server/admin/imgs/getfirefox.png b/code/web/public_php/admin/imgs/getfirefox.png similarity index 100% rename from code/ryzom/tools/server/admin/imgs/getfirefox.png rename to code/web/public_php/admin/imgs/getfirefox.png diff --git a/code/ryzom/tools/server/admin/imgs/icon_admin.gif b/code/web/public_php/admin/imgs/icon_admin.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_admin.gif rename to code/web/public_php/admin/imgs/icon_admin.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_entity.gif b/code/web/public_php/admin/imgs/icon_entity.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_entity.gif rename to code/web/public_php/admin/imgs/icon_entity.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_graphs.gif b/code/web/public_php/admin/imgs/icon_graphs.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_graphs.gif rename to code/web/public_php/admin/imgs/icon_graphs.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_guild_locator.gif b/code/web/public_php/admin/imgs/icon_guild_locator.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_guild_locator.gif rename to code/web/public_php/admin/imgs/icon_guild_locator.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_log_analyser.gif b/code/web/public_php/admin/imgs/icon_log_analyser.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_log_analyser.gif rename to code/web/public_php/admin/imgs/icon_log_analyser.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_logout.gif b/code/web/public_php/admin/imgs/icon_logout.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_logout.gif rename to code/web/public_php/admin/imgs/icon_logout.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_main.gif b/code/web/public_php/admin/imgs/icon_main.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_main.gif rename to code/web/public_php/admin/imgs/icon_main.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_notes.gif b/code/web/public_php/admin/imgs/icon_notes.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_notes.gif rename to code/web/public_php/admin/imgs/icon_notes.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_player_locator.gif b/code/web/public_php/admin/imgs/icon_player_locator.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_player_locator.gif rename to code/web/public_php/admin/imgs/icon_player_locator.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_preferences.gif b/code/web/public_php/admin/imgs/icon_preferences.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_preferences.gif rename to code/web/public_php/admin/imgs/icon_preferences.gif diff --git a/code/ryzom/tools/server/admin/imgs/icon_unknown.png b/code/web/public_php/admin/imgs/icon_unknown.png similarity index 100% rename from code/ryzom/tools/server/admin/imgs/icon_unknown.png rename to code/web/public_php/admin/imgs/icon_unknown.png diff --git a/code/ryzom/tools/server/admin/imgs/nel.gif b/code/web/public_php/admin/imgs/nel.gif similarity index 100% rename from code/ryzom/tools/server/admin/imgs/nel.gif rename to code/web/public_php/admin/imgs/nel.gif diff --git a/code/ryzom/tools/server/admin/index.php b/code/web/public_php/admin/index.php similarity index 100% rename from code/ryzom/tools/server/admin/index.php rename to code/web/public_php/admin/index.php diff --git a/code/ryzom/tools/server/admin/jpgraph/flags.dat b/code/web/public_php/admin/jpgraph/flags.dat similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/flags.dat rename to code/web/public_php/admin/jpgraph/flags.dat diff --git a/code/ryzom/tools/server/admin/jpgraph/flags_thumb100x100.dat b/code/web/public_php/admin/jpgraph/flags_thumb100x100.dat similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/flags_thumb100x100.dat rename to code/web/public_php/admin/jpgraph/flags_thumb100x100.dat diff --git a/code/ryzom/tools/server/admin/jpgraph/flags_thumb35x35.dat b/code/web/public_php/admin/jpgraph/flags_thumb35x35.dat similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/flags_thumb35x35.dat rename to code/web/public_php/admin/jpgraph/flags_thumb35x35.dat diff --git a/code/ryzom/tools/server/admin/jpgraph/flags_thumb60x60.dat b/code/web/public_php/admin/jpgraph/flags_thumb60x60.dat similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/flags_thumb60x60.dat rename to code/web/public_php/admin/jpgraph/flags_thumb60x60.dat diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_balls.inc b/code/web/public_php/admin/jpgraph/imgdata_balls.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_balls.inc rename to code/web/public_php/admin/jpgraph/imgdata_balls.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_bevels.inc b/code/web/public_php/admin/jpgraph/imgdata_bevels.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_bevels.inc rename to code/web/public_php/admin/jpgraph/imgdata_bevels.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_diamonds.inc b/code/web/public_php/admin/jpgraph/imgdata_diamonds.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_diamonds.inc rename to code/web/public_php/admin/jpgraph/imgdata_diamonds.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_pushpins.inc b/code/web/public_php/admin/jpgraph/imgdata_pushpins.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_pushpins.inc rename to code/web/public_php/admin/jpgraph/imgdata_pushpins.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_squares.inc b/code/web/public_php/admin/jpgraph/imgdata_squares.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_squares.inc rename to code/web/public_php/admin/jpgraph/imgdata_squares.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/imgdata_stars.inc b/code/web/public_php/admin/jpgraph/imgdata_stars.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/imgdata_stars.inc rename to code/web/public_php/admin/jpgraph/imgdata_stars.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/jpg-config.inc b/code/web/public_php/admin/jpgraph/jpg-config.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpg-config.inc rename to code/web/public_php/admin/jpgraph/jpg-config.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph.php b/code/web/public_php/admin/jpgraph/jpgraph.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph.php rename to code/web/public_php/admin/jpgraph/jpgraph.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_antispam-digits.php b/code/web/public_php/admin/jpgraph/jpgraph_antispam-digits.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_antispam-digits.php rename to code/web/public_php/admin/jpgraph/jpgraph_antispam-digits.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_antispam.php b/code/web/public_php/admin/jpgraph/jpgraph_antispam.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_antispam.php rename to code/web/public_php/admin/jpgraph/jpgraph_antispam.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_bar.php b/code/web/public_php/admin/jpgraph/jpgraph_bar.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_bar.php rename to code/web/public_php/admin/jpgraph/jpgraph_bar.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_canvas.php b/code/web/public_php/admin/jpgraph/jpgraph_canvas.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_canvas.php rename to code/web/public_php/admin/jpgraph/jpgraph_canvas.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_canvtools.php b/code/web/public_php/admin/jpgraph/jpgraph_canvtools.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_canvtools.php rename to code/web/public_php/admin/jpgraph/jpgraph_canvtools.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_date.php b/code/web/public_php/admin/jpgraph/jpgraph_date.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_date.php rename to code/web/public_php/admin/jpgraph/jpgraph_date.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_error.php b/code/web/public_php/admin/jpgraph/jpgraph_error.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_error.php rename to code/web/public_php/admin/jpgraph/jpgraph_error.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_flags.php b/code/web/public_php/admin/jpgraph/jpgraph_flags.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_flags.php rename to code/web/public_php/admin/jpgraph/jpgraph_flags.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php b/code/web/public_php/admin/jpgraph/jpgraph_gantt.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php rename to code/web/public_php/admin/jpgraph/jpgraph_gantt.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_gb2312.php b/code/web/public_php/admin/jpgraph/jpgraph_gb2312.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_gb2312.php rename to code/web/public_php/admin/jpgraph/jpgraph_gb2312.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_gradient.php b/code/web/public_php/admin/jpgraph/jpgraph_gradient.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_gradient.php rename to code/web/public_php/admin/jpgraph/jpgraph_gradient.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_iconplot.php b/code/web/public_php/admin/jpgraph/jpgraph_iconplot.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_iconplot.php rename to code/web/public_php/admin/jpgraph/jpgraph_iconplot.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_imgtrans.php b/code/web/public_php/admin/jpgraph/jpgraph_imgtrans.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_imgtrans.php rename to code/web/public_php/admin/jpgraph/jpgraph_imgtrans.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_line.php b/code/web/public_php/admin/jpgraph/jpgraph_line.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_line.php rename to code/web/public_php/admin/jpgraph/jpgraph_line.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_log.php b/code/web/public_php/admin/jpgraph/jpgraph_log.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_log.php rename to code/web/public_php/admin/jpgraph/jpgraph_log.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php b/code/web/public_php/admin/jpgraph/jpgraph_pie.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php rename to code/web/public_php/admin/jpgraph/jpgraph_pie.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie3d.php b/code/web/public_php/admin/jpgraph/jpgraph_pie3d.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_pie3d.php rename to code/web/public_php/admin/jpgraph/jpgraph_pie3d.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_plotband.php b/code/web/public_php/admin/jpgraph/jpgraph_plotband.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_plotband.php rename to code/web/public_php/admin/jpgraph/jpgraph_plotband.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_plotmark.inc b/code/web/public_php/admin/jpgraph/jpgraph_plotmark.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_plotmark.inc rename to code/web/public_php/admin/jpgraph/jpgraph_plotmark.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_polar.php b/code/web/public_php/admin/jpgraph/jpgraph_polar.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_polar.php rename to code/web/public_php/admin/jpgraph/jpgraph_polar.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_radar.php b/code/web/public_php/admin/jpgraph/jpgraph_radar.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_radar.php rename to code/web/public_php/admin/jpgraph/jpgraph_radar.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_regstat.php b/code/web/public_php/admin/jpgraph/jpgraph_regstat.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_regstat.php rename to code/web/public_php/admin/jpgraph/jpgraph_regstat.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_scatter.php b/code/web/public_php/admin/jpgraph/jpgraph_scatter.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_scatter.php rename to code/web/public_php/admin/jpgraph/jpgraph_scatter.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_stock.php b/code/web/public_php/admin/jpgraph/jpgraph_stock.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_stock.php rename to code/web/public_php/admin/jpgraph/jpgraph_stock.php diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_utils.inc b/code/web/public_php/admin/jpgraph/jpgraph_utils.inc similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/jpgraph_utils.inc rename to code/web/public_php/admin/jpgraph/jpgraph_utils.inc diff --git a/code/ryzom/tools/server/admin/jpgraph/lang/en.inc.php b/code/web/public_php/admin/jpgraph/lang/en.inc.php similarity index 100% rename from code/ryzom/tools/server/admin/jpgraph/lang/en.inc.php rename to code/web/public_php/admin/jpgraph/lang/en.inc.php diff --git a/code/ryzom/tools/server/admin/logs/empty.txt b/code/web/public_php/admin/logs/empty.txt similarity index 100% rename from code/ryzom/tools/server/admin/logs/empty.txt rename to code/web/public_php/admin/logs/empty.txt diff --git a/code/ryzom/tools/server/admin/nel/admin_modules_itf.php b/code/web/public_php/admin/nel/admin_modules_itf.php similarity index 100% rename from code/ryzom/tools/server/admin/nel/admin_modules_itf.php rename to code/web/public_php/admin/nel/admin_modules_itf.php diff --git a/code/ryzom/tools/server/admin/nel/nel_message.php b/code/web/public_php/admin/nel/nel_message.php similarity index 100% rename from code/ryzom/tools/server/admin/nel/nel_message.php rename to code/web/public_php/admin/nel/nel_message.php diff --git a/code/ryzom/tools/server/admin/neltool.css b/code/web/public_php/admin/neltool.css similarity index 100% rename from code/ryzom/tools/server/admin/neltool.css rename to code/web/public_php/admin/neltool.css diff --git a/code/ryzom/tools/server/admin/overlib/handgrab.gif b/code/web/public_php/admin/overlib/handgrab.gif similarity index 100% rename from code/ryzom/tools/server/admin/overlib/handgrab.gif rename to code/web/public_php/admin/overlib/handgrab.gif diff --git a/code/ryzom/tools/server/admin/overlib/makemini.pl b/code/web/public_php/admin/overlib/makemini.pl similarity index 100% rename from code/ryzom/tools/server/admin/overlib/makemini.pl rename to code/web/public_php/admin/overlib/makemini.pl diff --git a/code/ryzom/tools/server/admin/overlib/overlib.js b/code/web/public_php/admin/overlib/overlib.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib.js rename to code/web/public_php/admin/overlib/overlib.js diff --git a/code/ryzom/tools/server/admin/overlib/overlib_anchor.js b/code/web/public_php/admin/overlib/overlib_anchor.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib_anchor.js rename to code/web/public_php/admin/overlib/overlib_anchor.js diff --git a/code/ryzom/tools/server/admin/overlib/overlib_anchor_mini.js b/code/web/public_php/admin/overlib/overlib_anchor_mini.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib_anchor_mini.js rename to code/web/public_php/admin/overlib/overlib_anchor_mini.js diff --git a/code/ryzom/tools/server/admin/overlib/overlib_draggable.js b/code/web/public_php/admin/overlib/overlib_draggable.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib_draggable.js rename to code/web/public_php/admin/overlib/overlib_draggable.js diff --git a/code/ryzom/tools/server/admin/overlib/overlib_draggable_mini.js b/code/web/public_php/admin/overlib/overlib_draggable_mini.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib_draggable_mini.js rename to code/web/public_php/admin/overlib/overlib_draggable_mini.js diff --git a/code/ryzom/tools/server/admin/overlib/overlib_mini.js b/code/web/public_php/admin/overlib/overlib_mini.js similarity index 100% rename from code/ryzom/tools/server/admin/overlib/overlib_mini.js rename to code/web/public_php/admin/overlib/overlib_mini.js diff --git a/code/ryzom/tools/server/admin/scripts/index.html b/code/web/public_php/admin/scripts/index.html similarity index 100% rename from code/ryzom/tools/server/admin/scripts/index.html rename to code/web/public_php/admin/scripts/index.html diff --git a/code/ryzom/tools/server/admin/scripts/restart_sequence.php b/code/web/public_php/admin/scripts/restart_sequence.php similarity index 100% rename from code/ryzom/tools/server/admin/scripts/restart_sequence.php rename to code/web/public_php/admin/scripts/restart_sequence.php diff --git a/code/ryzom/tools/server/admin/scripts/run_script.sh b/code/web/public_php/admin/scripts/run_script.sh similarity index 100% rename from code/ryzom/tools/server/admin/scripts/run_script.sh rename to code/web/public_php/admin/scripts/run_script.sh diff --git a/code/ryzom/tools/server/admin/smarty/Config_File.class.php b/code/web/public_php/admin/smarty/Config_File.class.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/Config_File.class.php rename to code/web/public_php/admin/smarty/Config_File.class.php diff --git a/code/ryzom/tools/server/admin/smarty/Smarty.class.php b/code/web/public_php/admin/smarty/Smarty.class.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/Smarty.class.php rename to code/web/public_php/admin/smarty/Smarty.class.php diff --git a/code/ryzom/tools/server/admin/smarty/Smarty_Compiler.class.php b/code/web/public_php/admin/smarty/Smarty_Compiler.class.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/Smarty_Compiler.class.php rename to code/web/public_php/admin/smarty/Smarty_Compiler.class.php diff --git a/code/ryzom/tools/server/admin/smarty/debug.tpl b/code/web/public_php/admin/smarty/debug.tpl similarity index 100% rename from code/ryzom/tools/server/admin/smarty/debug.tpl rename to code/web/public_php/admin/smarty/debug.tpl diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.assemble_plugin_filepath.php b/code/web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.assemble_plugin_filepath.php rename to code/web/public_php/admin/smarty/internals/core.assemble_plugin_filepath.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.assign_smarty_interface.php b/code/web/public_php/admin/smarty/internals/core.assign_smarty_interface.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.assign_smarty_interface.php rename to code/web/public_php/admin/smarty/internals/core.assign_smarty_interface.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.create_dir_structure.php b/code/web/public_php/admin/smarty/internals/core.create_dir_structure.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.create_dir_structure.php rename to code/web/public_php/admin/smarty/internals/core.create_dir_structure.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.display_debug_console.php b/code/web/public_php/admin/smarty/internals/core.display_debug_console.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.display_debug_console.php rename to code/web/public_php/admin/smarty/internals/core.display_debug_console.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.get_include_path.php b/code/web/public_php/admin/smarty/internals/core.get_include_path.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.get_include_path.php rename to code/web/public_php/admin/smarty/internals/core.get_include_path.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.get_microtime.php b/code/web/public_php/admin/smarty/internals/core.get_microtime.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.get_microtime.php rename to code/web/public_php/admin/smarty/internals/core.get_microtime.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.get_php_resource.php b/code/web/public_php/admin/smarty/internals/core.get_php_resource.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.get_php_resource.php rename to code/web/public_php/admin/smarty/internals/core.get_php_resource.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.is_secure.php b/code/web/public_php/admin/smarty/internals/core.is_secure.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.is_secure.php rename to code/web/public_php/admin/smarty/internals/core.is_secure.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.is_trusted.php b/code/web/public_php/admin/smarty/internals/core.is_trusted.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.is_trusted.php rename to code/web/public_php/admin/smarty/internals/core.is_trusted.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.load_plugins.php b/code/web/public_php/admin/smarty/internals/core.load_plugins.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.load_plugins.php rename to code/web/public_php/admin/smarty/internals/core.load_plugins.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.load_resource_plugin.php b/code/web/public_php/admin/smarty/internals/core.load_resource_plugin.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.load_resource_plugin.php rename to code/web/public_php/admin/smarty/internals/core.load_resource_plugin.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.process_cached_inserts.php b/code/web/public_php/admin/smarty/internals/core.process_cached_inserts.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.process_cached_inserts.php rename to code/web/public_php/admin/smarty/internals/core.process_cached_inserts.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.process_compiled_include.php b/code/web/public_php/admin/smarty/internals/core.process_compiled_include.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.process_compiled_include.php rename to code/web/public_php/admin/smarty/internals/core.process_compiled_include.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.read_cache_file.php b/code/web/public_php/admin/smarty/internals/core.read_cache_file.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.read_cache_file.php rename to code/web/public_php/admin/smarty/internals/core.read_cache_file.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.rm_auto.php b/code/web/public_php/admin/smarty/internals/core.rm_auto.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.rm_auto.php rename to code/web/public_php/admin/smarty/internals/core.rm_auto.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.rmdir.php b/code/web/public_php/admin/smarty/internals/core.rmdir.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.rmdir.php rename to code/web/public_php/admin/smarty/internals/core.rmdir.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.run_insert_handler.php b/code/web/public_php/admin/smarty/internals/core.run_insert_handler.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.run_insert_handler.php rename to code/web/public_php/admin/smarty/internals/core.run_insert_handler.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.smarty_include_php.php b/code/web/public_php/admin/smarty/internals/core.smarty_include_php.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.smarty_include_php.php rename to code/web/public_php/admin/smarty/internals/core.smarty_include_php.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.write_cache_file.php b/code/web/public_php/admin/smarty/internals/core.write_cache_file.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.write_cache_file.php rename to code/web/public_php/admin/smarty/internals/core.write_cache_file.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.write_compiled_include.php b/code/web/public_php/admin/smarty/internals/core.write_compiled_include.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.write_compiled_include.php rename to code/web/public_php/admin/smarty/internals/core.write_compiled_include.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.write_compiled_resource.php b/code/web/public_php/admin/smarty/internals/core.write_compiled_resource.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.write_compiled_resource.php rename to code/web/public_php/admin/smarty/internals/core.write_compiled_resource.php diff --git a/code/ryzom/tools/server/admin/smarty/internals/core.write_file.php b/code/web/public_php/admin/smarty/internals/core.write_file.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/internals/core.write_file.php rename to code/web/public_php/admin/smarty/internals/core.write_file.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/block.textformat.php b/code/web/public_php/admin/smarty/plugins/block.textformat.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/block.textformat.php rename to code/web/public_php/admin/smarty/plugins/block.textformat.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/compiler.assign.php b/code/web/public_php/admin/smarty/plugins/compiler.assign.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/compiler.assign.php rename to code/web/public_php/admin/smarty/plugins/compiler.assign.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.assign_debug_info.php b/code/web/public_php/admin/smarty/plugins/function.assign_debug_info.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.assign_debug_info.php rename to code/web/public_php/admin/smarty/plugins/function.assign_debug_info.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.config_load.php b/code/web/public_php/admin/smarty/plugins/function.config_load.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.config_load.php rename to code/web/public_php/admin/smarty/plugins/function.config_load.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.counter.php b/code/web/public_php/admin/smarty/plugins/function.counter.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.counter.php rename to code/web/public_php/admin/smarty/plugins/function.counter.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.cycle.php b/code/web/public_php/admin/smarty/plugins/function.cycle.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.cycle.php rename to code/web/public_php/admin/smarty/plugins/function.cycle.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.debug.php b/code/web/public_php/admin/smarty/plugins/function.debug.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.debug.php rename to code/web/public_php/admin/smarty/plugins/function.debug.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.eval.php b/code/web/public_php/admin/smarty/plugins/function.eval.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.eval.php rename to code/web/public_php/admin/smarty/plugins/function.eval.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.fetch.php b/code/web/public_php/admin/smarty/plugins/function.fetch.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.fetch.php rename to code/web/public_php/admin/smarty/plugins/function.fetch.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_checkboxes.php b/code/web/public_php/admin/smarty/plugins/function.html_checkboxes.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_checkboxes.php rename to code/web/public_php/admin/smarty/plugins/function.html_checkboxes.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_image.php b/code/web/public_php/admin/smarty/plugins/function.html_image.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_image.php rename to code/web/public_php/admin/smarty/plugins/function.html_image.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_options.php b/code/web/public_php/admin/smarty/plugins/function.html_options.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_options.php rename to code/web/public_php/admin/smarty/plugins/function.html_options.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_radios.php b/code/web/public_php/admin/smarty/plugins/function.html_radios.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_radios.php rename to code/web/public_php/admin/smarty/plugins/function.html_radios.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_select_date.php b/code/web/public_php/admin/smarty/plugins/function.html_select_date.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_select_date.php rename to code/web/public_php/admin/smarty/plugins/function.html_select_date.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_select_time.php b/code/web/public_php/admin/smarty/plugins/function.html_select_time.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_select_time.php rename to code/web/public_php/admin/smarty/plugins/function.html_select_time.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.html_table.php b/code/web/public_php/admin/smarty/plugins/function.html_table.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.html_table.php rename to code/web/public_php/admin/smarty/plugins/function.html_table.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.mailto.php b/code/web/public_php/admin/smarty/plugins/function.mailto.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.mailto.php rename to code/web/public_php/admin/smarty/plugins/function.mailto.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.math.php b/code/web/public_php/admin/smarty/plugins/function.math.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.math.php rename to code/web/public_php/admin/smarty/plugins/function.math.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.popup.php b/code/web/public_php/admin/smarty/plugins/function.popup.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.popup.php rename to code/web/public_php/admin/smarty/plugins/function.popup.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.popup_init.php b/code/web/public_php/admin/smarty/plugins/function.popup_init.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.popup_init.php rename to code/web/public_php/admin/smarty/plugins/function.popup_init.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/function.substr.php b/code/web/public_php/admin/smarty/plugins/function.substr.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/function.substr.php rename to code/web/public_php/admin/smarty/plugins/function.substr.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.capitalize.php b/code/web/public_php/admin/smarty/plugins/modifier.capitalize.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.capitalize.php rename to code/web/public_php/admin/smarty/plugins/modifier.capitalize.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.cat.php b/code/web/public_php/admin/smarty/plugins/modifier.cat.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.cat.php rename to code/web/public_php/admin/smarty/plugins/modifier.cat.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.count_characters.php b/code/web/public_php/admin/smarty/plugins/modifier.count_characters.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.count_characters.php rename to code/web/public_php/admin/smarty/plugins/modifier.count_characters.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.count_paragraphs.php b/code/web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.count_paragraphs.php rename to code/web/public_php/admin/smarty/plugins/modifier.count_paragraphs.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.count_sentences.php b/code/web/public_php/admin/smarty/plugins/modifier.count_sentences.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.count_sentences.php rename to code/web/public_php/admin/smarty/plugins/modifier.count_sentences.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.count_words.php b/code/web/public_php/admin/smarty/plugins/modifier.count_words.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.count_words.php rename to code/web/public_php/admin/smarty/plugins/modifier.count_words.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.date_format.php b/code/web/public_php/admin/smarty/plugins/modifier.date_format.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.date_format.php rename to code/web/public_php/admin/smarty/plugins/modifier.date_format.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.debug_print_var.php b/code/web/public_php/admin/smarty/plugins/modifier.debug_print_var.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.debug_print_var.php rename to code/web/public_php/admin/smarty/plugins/modifier.debug_print_var.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.default.php b/code/web/public_php/admin/smarty/plugins/modifier.default.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.default.php rename to code/web/public_php/admin/smarty/plugins/modifier.default.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.escape.php b/code/web/public_php/admin/smarty/plugins/modifier.escape.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.escape.php rename to code/web/public_php/admin/smarty/plugins/modifier.escape.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.indent.php b/code/web/public_php/admin/smarty/plugins/modifier.indent.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.indent.php rename to code/web/public_php/admin/smarty/plugins/modifier.indent.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.lower.php b/code/web/public_php/admin/smarty/plugins/modifier.lower.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.lower.php rename to code/web/public_php/admin/smarty/plugins/modifier.lower.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.nl2br.php b/code/web/public_php/admin/smarty/plugins/modifier.nl2br.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.nl2br.php rename to code/web/public_php/admin/smarty/plugins/modifier.nl2br.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.regex_replace.php b/code/web/public_php/admin/smarty/plugins/modifier.regex_replace.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.regex_replace.php rename to code/web/public_php/admin/smarty/plugins/modifier.regex_replace.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.replace.php b/code/web/public_php/admin/smarty/plugins/modifier.replace.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.replace.php rename to code/web/public_php/admin/smarty/plugins/modifier.replace.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.spacify.php b/code/web/public_php/admin/smarty/plugins/modifier.spacify.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.spacify.php rename to code/web/public_php/admin/smarty/plugins/modifier.spacify.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.string_format.php b/code/web/public_php/admin/smarty/plugins/modifier.string_format.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.string_format.php rename to code/web/public_php/admin/smarty/plugins/modifier.string_format.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.strip.php b/code/web/public_php/admin/smarty/plugins/modifier.strip.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.strip.php rename to code/web/public_php/admin/smarty/plugins/modifier.strip.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.strip_tags.php b/code/web/public_php/admin/smarty/plugins/modifier.strip_tags.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.strip_tags.php rename to code/web/public_php/admin/smarty/plugins/modifier.strip_tags.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.truncate.php b/code/web/public_php/admin/smarty/plugins/modifier.truncate.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.truncate.php rename to code/web/public_php/admin/smarty/plugins/modifier.truncate.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.upper.php b/code/web/public_php/admin/smarty/plugins/modifier.upper.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.upper.php rename to code/web/public_php/admin/smarty/plugins/modifier.upper.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/modifier.wordwrap.php b/code/web/public_php/admin/smarty/plugins/modifier.wordwrap.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/modifier.wordwrap.php rename to code/web/public_php/admin/smarty/plugins/modifier.wordwrap.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/outputfilter.trimwhitespace.php b/code/web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/outputfilter.trimwhitespace.php rename to code/web/public_php/admin/smarty/plugins/outputfilter.trimwhitespace.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/shared.escape_special_chars.php b/code/web/public_php/admin/smarty/plugins/shared.escape_special_chars.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/shared.escape_special_chars.php rename to code/web/public_php/admin/smarty/plugins/shared.escape_special_chars.php diff --git a/code/ryzom/tools/server/admin/smarty/plugins/shared.make_timestamp.php b/code/web/public_php/admin/smarty/plugins/shared.make_timestamp.php similarity index 100% rename from code/ryzom/tools/server/admin/smarty/plugins/shared.make_timestamp.php rename to code/web/public_php/admin/smarty/plugins/shared.make_timestamp.php diff --git a/code/ryzom/tools/server/admin/templates/default/_index.tpl b/code/web/public_php/admin/templates/default/_index.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/_index.tpl rename to code/web/public_php/admin/templates/default/_index.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/index.tpl b/code/web/public_php/admin/templates/default/index.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/index.tpl rename to code/web/public_php/admin/templates/default/index.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/index_login.tpl b/code/web/public_php/admin/templates/default/index_login.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/index_login.tpl rename to code/web/public_php/admin/templates/default/index_login.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/index_restart_sequence.tpl b/code/web/public_php/admin/templates/default/index_restart_sequence.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/index_restart_sequence.tpl rename to code/web/public_php/admin/templates/default/index_restart_sequence.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/page_footer.tpl b/code/web/public_php/admin/templates/default/page_footer.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/page_footer.tpl rename to code/web/public_php/admin/templates/default/page_footer.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/page_footer_light.tpl b/code/web/public_php/admin/templates/default/page_footer_light.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/page_footer_light.tpl rename to code/web/public_php/admin/templates/default/page_footer_light.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/page_header.tpl b/code/web/public_php/admin/templates/default/page_header.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/page_header.tpl rename to code/web/public_php/admin/templates/default/page_header.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/page_header_light.tpl b/code/web/public_php/admin/templates/default/page_header_light.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/page_header_light.tpl rename to code/web/public_php/admin/templates/default/page_header_light.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_actions.tpl b/code/web/public_php/admin/templates/default/tool_actions.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_actions.tpl rename to code/web/public_php/admin/templates/default/tool_actions.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration.tpl b/code/web/public_php/admin/templates/default/tool_administration.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration.tpl rename to code/web/public_php/admin/templates/default/tool_administration.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_applications.tpl b/code/web/public_php/admin/templates/default/tool_administration_applications.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_applications.tpl rename to code/web/public_php/admin/templates/default/tool_administration_applications.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_domains.tpl b/code/web/public_php/admin/templates/default/tool_administration_domains.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_domains.tpl rename to code/web/public_php/admin/templates/default/tool_administration_domains.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_groups.tpl b/code/web/public_php/admin/templates/default/tool_administration_groups.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_groups.tpl rename to code/web/public_php/admin/templates/default/tool_administration_groups.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_logs.tpl b/code/web/public_php/admin/templates/default/tool_administration_logs.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_logs.tpl rename to code/web/public_php/admin/templates/default/tool_administration_logs.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_restarts.tpl b/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_restarts.tpl rename to code/web/public_php/admin/templates/default/tool_administration_restarts.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_shards.tpl b/code/web/public_php/admin/templates/default/tool_administration_shards.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_shards.tpl rename to code/web/public_php/admin/templates/default/tool_administration_shards.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_users.tpl b/code/web/public_php/admin/templates/default/tool_administration_users.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_users.tpl rename to code/web/public_php/admin/templates/default/tool_administration_users.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_administration_users.tpl.backup b/code/web/public_php/admin/templates/default/tool_administration_users.tpl.backup similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_administration_users.tpl.backup rename to code/web/public_php/admin/templates/default/tool_administration_users.tpl.backup diff --git a/code/ryzom/tools/server/admin/templates/default/tool_event_entities.tpl b/code/web/public_php/admin/templates/default/tool_event_entities.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_event_entities.tpl rename to code/web/public_php/admin/templates/default/tool_event_entities.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_graphs.tpl b/code/web/public_php/admin/templates/default/tool_graphs.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_graphs.tpl rename to code/web/public_php/admin/templates/default/tool_graphs.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_graphs_ccu.tpl b/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_graphs_ccu.tpl rename to code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_graphs_hires.tpl b/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_graphs_hires.tpl rename to code/web/public_php/admin/templates/default/tool_graphs_hires.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_graphs_tech.tpl b/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_graphs_tech.tpl rename to code/web/public_php/admin/templates/default/tool_graphs_tech.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_guild_locator.tpl b/code/web/public_php/admin/templates/default/tool_guild_locator.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_guild_locator.tpl rename to code/web/public_php/admin/templates/default/tool_guild_locator.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_log_analyser.tpl b/code/web/public_php/admin/templates/default/tool_log_analyser.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_log_analyser.tpl rename to code/web/public_php/admin/templates/default/tool_log_analyser.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_log_analyser_file_view.tpl b/code/web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_log_analyser_file_view.tpl rename to code/web/public_php/admin/templates/default/tool_log_analyser_file_view.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_mfs.tpl b/code/web/public_php/admin/templates/default/tool_mfs.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_mfs.tpl rename to code/web/public_php/admin/templates/default/tool_mfs.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_notes.tpl b/code/web/public_php/admin/templates/default/tool_notes.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_notes.tpl rename to code/web/public_php/admin/templates/default/tool_notes.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_player_locator.tpl b/code/web/public_php/admin/templates/default/tool_player_locator.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_player_locator.tpl rename to code/web/public_php/admin/templates/default/tool_player_locator.tpl diff --git a/code/ryzom/tools/server/admin/templates/default/tool_preferences.tpl b/code/web/public_php/admin/templates/default/tool_preferences.tpl similarity index 100% rename from code/ryzom/tools/server/admin/templates/default/tool_preferences.tpl rename to code/web/public_php/admin/templates/default/tool_preferences.tpl diff --git a/code/ryzom/tools/server/admin/templates/default_c/placeholder b/code/web/public_php/admin/templates/default_c/placeholder similarity index 100% rename from code/ryzom/tools/server/admin/templates/default_c/placeholder rename to code/web/public_php/admin/templates/default_c/placeholder diff --git a/code/ryzom/tools/server/admin/tool_actions.php b/code/web/public_php/admin/tool_actions.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_actions.php rename to code/web/public_php/admin/tool_actions.php diff --git a/code/ryzom/tools/server/admin/tool_administration.php b/code/web/public_php/admin/tool_administration.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_administration.php rename to code/web/public_php/admin/tool_administration.php diff --git a/code/ryzom/tools/server/admin/tool_event_entities.php b/code/web/public_php/admin/tool_event_entities.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_event_entities.php rename to code/web/public_php/admin/tool_event_entities.php diff --git a/code/ryzom/tools/server/admin/tool_graphs.php b/code/web/public_php/admin/tool_graphs.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_graphs.php rename to code/web/public_php/admin/tool_graphs.php diff --git a/code/ryzom/tools/server/admin/tool_guild_locator.php b/code/web/public_php/admin/tool_guild_locator.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_guild_locator.php rename to code/web/public_php/admin/tool_guild_locator.php diff --git a/code/ryzom/tools/server/admin/tool_log_analyser.php b/code/web/public_php/admin/tool_log_analyser.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_log_analyser.php rename to code/web/public_php/admin/tool_log_analyser.php diff --git a/code/ryzom/tools/server/admin/tool_mfs.php b/code/web/public_php/admin/tool_mfs.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_mfs.php rename to code/web/public_php/admin/tool_mfs.php diff --git a/code/ryzom/tools/server/admin/tool_notes.php b/code/web/public_php/admin/tool_notes.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_notes.php rename to code/web/public_php/admin/tool_notes.php diff --git a/code/ryzom/tools/server/admin/tool_player_locator.php b/code/web/public_php/admin/tool_player_locator.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_player_locator.php rename to code/web/public_php/admin/tool_player_locator.php diff --git a/code/ryzom/tools/server/admin/tool_preferences.php b/code/web/public_php/admin/tool_preferences.php similarity index 100% rename from code/ryzom/tools/server/admin/tool_preferences.php rename to code/web/public_php/admin/tool_preferences.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/README.md b/code/web/public_php/ams/README.md similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/README.md rename to code/web/public_php/ams/README.md diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php b/code/web/public_php/ams/autoload/webusers.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php rename to code/web/public_php/ams/autoload/webusers.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder b/code/web/public_php/ams/cache/placeholder similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder rename to code/web/public_php/ams/cache/placeholder diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/configs/ams_lib.conf b/code/web/public_php/ams/configs/ams_lib.conf similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/configs/ams_lib.conf rename to code/web/public_php/ams/configs/ams_lib.conf diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-cerulean.css b/code/web/public_php/ams/css/bootstrap-cerulean.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-cerulean.css rename to code/web/public_php/ams/css/bootstrap-cerulean.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-classic.css b/code/web/public_php/ams/css/bootstrap-classic.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-classic.css rename to code/web/public_php/ams/css/bootstrap-classic.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-classic.min.css b/code/web/public_php/ams/css/bootstrap-classic.min.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-classic.min.css rename to code/web/public_php/ams/css/bootstrap-classic.min.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-cyborg.css b/code/web/public_php/ams/css/bootstrap-cyborg.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-cyborg.css rename to code/web/public_php/ams/css/bootstrap-cyborg.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-journal.css b/code/web/public_php/ams/css/bootstrap-journal.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-journal.css rename to code/web/public_php/ams/css/bootstrap-journal.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-redy.css b/code/web/public_php/ams/css/bootstrap-redy.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-redy.css rename to code/web/public_php/ams/css/bootstrap-redy.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-responsive.css b/code/web/public_php/ams/css/bootstrap-responsive.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-responsive.css rename to code/web/public_php/ams/css/bootstrap-responsive.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-responsive.min.css b/code/web/public_php/ams/css/bootstrap-responsive.min.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-responsive.min.css rename to code/web/public_php/ams/css/bootstrap-responsive.min.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-simplex.css b/code/web/public_php/ams/css/bootstrap-simplex.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-simplex.css rename to code/web/public_php/ams/css/bootstrap-simplex.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-slate.css b/code/web/public_php/ams/css/bootstrap-slate.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-slate.css rename to code/web/public_php/ams/css/bootstrap-slate.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-spacelab.css b/code/web/public_php/ams/css/bootstrap-spacelab.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-spacelab.css rename to code/web/public_php/ams/css/bootstrap-spacelab.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-united.css b/code/web/public_php/ams/css/bootstrap-united.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/bootstrap-united.css rename to code/web/public_php/ams/css/bootstrap-united.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css b/code/web/public_php/ams/css/charisma-app.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css rename to code/web/public_php/ams/css/charisma-app.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/chosen.css b/code/web/public_php/ams/css/chosen.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/chosen.css rename to code/web/public_php/ams/css/chosen.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/colorbox.css b/code/web/public_php/ams/css/colorbox.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/colorbox.css rename to code/web/public_php/ams/css/colorbox.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css b/code/web/public_php/ams/css/custom.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css rename to code/web/public_php/ams/css/custom.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/elfinder.min.css b/code/web/public_php/ams/css/elfinder.min.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/elfinder.min.css rename to code/web/public_php/ams/css/elfinder.min.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/elfinder.theme.css b/code/web/public_php/ams/css/elfinder.theme.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/elfinder.theme.css rename to code/web/public_php/ams/css/elfinder.theme.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/fullcalendar.css b/code/web/public_php/ams/css/fullcalendar.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/fullcalendar.css rename to code/web/public_php/ams/css/fullcalendar.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/fullcalendar.print.css b/code/web/public_php/ams/css/fullcalendar.print.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/fullcalendar.print.css rename to code/web/public_php/ams/css/fullcalendar.print.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/jquery-ui-1.8.21.custom.css b/code/web/public_php/ams/css/jquery-ui-1.8.21.custom.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/jquery-ui-1.8.21.custom.css rename to code/web/public_php/ams/css/jquery-ui-1.8.21.custom.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.cleditor.css b/code/web/public_php/ams/css/jquery.cleditor.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.cleditor.css rename to code/web/public_php/ams/css/jquery.cleditor.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.iphone.toggle.css b/code/web/public_php/ams/css/jquery.iphone.toggle.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.iphone.toggle.css rename to code/web/public_php/ams/css/jquery.iphone.toggle.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.noty.css b/code/web/public_php/ams/css/jquery.noty.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/jquery.noty.css rename to code/web/public_php/ams/css/jquery.noty.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/noty_theme_default.css b/code/web/public_php/ams/css/noty_theme_default.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/noty_theme_default.css rename to code/web/public_php/ams/css/noty_theme_default.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/opa-icons.css b/code/web/public_php/ams/css/opa-icons.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/opa-icons.css rename to code/web/public_php/ams/css/opa-icons.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/uniform.default.css b/code/web/public_php/ams/css/uniform.default.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/uniform.default.css rename to code/web/public_php/ams/css/uniform.default.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/uploadify.css b/code/web/public_php/ams/css/uploadify.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/css/uploadify.css rename to code/web/public_php/ams/css/uploadify.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/assets/images/html_structure.png b/code/web/public_php/ams/doc/assets/images/html_structure.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/assets/images/html_structure.png rename to code/web/public_php/ams/doc/assets/images/html_structure.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/assets/images/image_1.png b/code/web/public_php/ams/doc/assets/images/image_1.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/assets/images/image_1.png rename to code/web/public_php/ams/doc/assets/images/image_1.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/css/documenter_style.css b/code/web/public_php/ams/doc/css/documenter_style.css similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/css/documenter_style.css rename to code/web/public_php/ams/doc/css/documenter_style.css diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/info.png b/code/web/public_php/ams/doc/css/img/info.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/info.png rename to code/web/public_php/ams/doc/css/img/info.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/pre_bg.png b/code/web/public_php/ams/doc/css/img/pre_bg.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/pre_bg.png rename to code/web/public_php/ams/doc/css/img/pre_bg.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/warning.png b/code/web/public_php/ams/doc/css/img/warning.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/css/img/warning.png rename to code/web/public_php/ams/doc/css/img/warning.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/favicon.ico b/code/web/public_php/ams/doc/favicon.ico similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/favicon.ico rename to code/web/public_php/ams/doc/favicon.ico diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/index.html b/code/web/public_php/ams/doc/index.html similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/index.html rename to code/web/public_php/ams/doc/index.html diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.1.6.4.js b/code/web/public_php/ams/doc/js/jquery.1.6.4.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.1.6.4.js rename to code/web/public_php/ams/doc/js/jquery.1.6.4.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.easing.js b/code/web/public_php/ams/doc/js/jquery.easing.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.easing.js rename to code/web/public_php/ams/doc/js/jquery.easing.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.scrollTo-1.4.2-min.js b/code/web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/js/jquery.scrollTo-1.4.2-min.js rename to code/web/public_php/ams/doc/js/jquery.scrollTo-1.4.2-min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/doc/js/script.js b/code/web/public_php/ams/doc/js/script.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/doc/js/script.js rename to code/web/public_php/ams/doc/js/script.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/activate_plugin.php b/code/web/public_php/ams/func/activate_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/activate_plugin.php rename to code/web/public_php/ams/func/activate_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php b/code/web/public_php/ams/func/add_sgroup.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php rename to code/web/public_php/ams/func/add_sgroup.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php b/code/web/public_php/ams/func/add_user.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php rename to code/web/public_php/ams/func/add_user.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php b/code/web/public_php/ams/func/add_user_to_sgroup.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php rename to code/web/public_php/ams/func/add_user_to_sgroup.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php b/code/web/public_php/ams/func/change_info.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php rename to code/web/public_php/ams/func/change_info.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php b/code/web/public_php/ams/func/change_mail.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php rename to code/web/public_php/ams/func/change_mail.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php b/code/web/public_php/ams/func/change_password.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php rename to code/web/public_php/ams/func/change_password.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php b/code/web/public_php/ams/func/change_receivemail.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php rename to code/web/public_php/ams/func/change_receivemail.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php b/code/web/public_php/ams/func/create_ticket.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php rename to code/web/public_php/ams/func/create_ticket.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/deactivate_plugin.php b/code/web/public_php/ams/func/deactivate_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/deactivate_plugin.php rename to code/web/public_php/ams/func/deactivate_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/delete_plugin.php b/code/web/public_php/ams/func/delete_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/delete_plugin.php rename to code/web/public_php/ams/func/delete_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/forgot_password.php b/code/web/public_php/ams/func/forgot_password.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/forgot_password.php rename to code/web/public_php/ams/func/forgot_password.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/install_plugin.php b/code/web/public_php/ams/func/install_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/install_plugin.php rename to code/web/public_php/ams/func/install_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/login.php b/code/web/public_php/ams/func/login.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/login.php rename to code/web/public_php/ams/func/login.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php b/code/web/public_php/ams/func/modify_email_of_sgroup.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php rename to code/web/public_php/ams/func/modify_email_of_sgroup.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php b/code/web/public_php/ams/func/reply_on_ticket.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php rename to code/web/public_php/ams/func/reply_on_ticket.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/reset_password.php b/code/web/public_php/ams/func/reset_password.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/reset_password.php rename to code/web/public_php/ams/func/reset_password.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/update_plugin.php b/code/web/public_php/ams/func/update_plugin.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/func/update_plugin.php rename to code/web/public_php/ams/func/update_plugin.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-1.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-1.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-1.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-2.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-2.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-2.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-3.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-3.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-3.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-4.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-4.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-4.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-5.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-5.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-5.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-6.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-6.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-6.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-7.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-7.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-7.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-8.gif b/code/web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ajax-loaders/ajax-loader-8.gif rename to code/web/public_php/ams/img/ajax-loaders/ajax-loader-8.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/arrows-active.png b/code/web/public_php/ams/img/arrows-active.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/arrows-active.png rename to code/web/public_php/ams/img/arrows-active.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/arrows-normal.png b/code/web/public_php/ams/img/arrows-normal.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/arrows-normal.png rename to code/web/public_php/ams/img/arrows-normal.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/bg-input-focus.png b/code/web/public_php/ams/img/bg-input-focus.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/bg-input-focus.png rename to code/web/public_php/ams/img/bg-input-focus.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/bg-input.png b/code/web/public_php/ams/img/bg-input.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/bg-input.png rename to code/web/public_php/ams/img/bg-input.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/border.png b/code/web/public_php/ams/img/border.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/border.png rename to code/web/public_php/ams/img/border.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/buttons.gif b/code/web/public_php/ams/img/buttons.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/buttons.gif rename to code/web/public_php/ams/img/buttons.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/cancel-off.png b/code/web/public_php/ams/img/cancel-off.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/cancel-off.png rename to code/web/public_php/ams/img/cancel-off.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/cancel-on.png b/code/web/public_php/ams/img/cancel-on.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/cancel-on.png rename to code/web/public_php/ams/img/cancel-on.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/chosen-sprite.png b/code/web/public_php/ams/img/chosen-sprite.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/chosen-sprite.png rename to code/web/public_php/ams/img/chosen-sprite.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/controls.png b/code/web/public_php/ams/img/controls.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/controls.png rename to code/web/public_php/ams/img/controls.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/crop.gif b/code/web/public_php/ams/img/crop.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/crop.gif rename to code/web/public_php/ams/img/crop.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/dialogs.png b/code/web/public_php/ams/img/dialogs.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/dialogs.png rename to code/web/public_php/ams/img/dialogs.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/en.png b/code/web/public_php/ams/img/en.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/en.png rename to code/web/public_php/ams/img/en.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/error_bg.png b/code/web/public_php/ams/img/error_bg.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/error_bg.png rename to code/web/public_php/ams/img/error_bg.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/favicon.ico b/code/web/public_php/ams/img/favicon.ico similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/favicon.ico rename to code/web/public_php/ams/img/favicon.ico diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/fr.png b/code/web/public_php/ams/img/fr.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/fr.png rename to code/web/public_php/ams/img/fr.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/glyphicons-halflings-white.png b/code/web/public_php/ams/img/glyphicons-halflings-white.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/glyphicons-halflings-white.png rename to code/web/public_php/ams/img/glyphicons-halflings-white.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/glyphicons-halflings.png b/code/web/public_php/ams/img/glyphicons-halflings.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/glyphicons-halflings.png rename to code/web/public_php/ams/img/glyphicons-halflings.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/icons-big.png b/code/web/public_php/ams/img/icons-big.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/icons-big.png rename to code/web/public_php/ams/img/icons-big.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/icons-small.png b/code/web/public_php/ams/img/icons-small.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/icons-small.png rename to code/web/public_php/ams/img/icons-small.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png b/code/web/public_php/ams/img/info/client.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png rename to code/web/public_php/ams/img/info/client.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png b/code/web/public_php/ams/img/info/connect.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png rename to code/web/public_php/ams/img/info/connect.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png b/code/web/public_php/ams/img/info/cpuid.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png rename to code/web/public_php/ams/img/info/cpuid.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png b/code/web/public_php/ams/img/info/ht.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png rename to code/web/public_php/ams/img/info/ht.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png b/code/web/public_php/ams/img/info/local.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png rename to code/web/public_php/ams/img/info/local.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png b/code/web/public_php/ams/img/info/mask.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png rename to code/web/public_php/ams/img/info/mask.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png b/code/web/public_php/ams/img/info/memory.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png rename to code/web/public_php/ams/img/info/memory.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png b/code/web/public_php/ams/img/info/nel.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png rename to code/web/public_php/ams/img/info/nel.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png b/code/web/public_php/ams/img/info/os.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png rename to code/web/public_php/ams/img/info/os.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png b/code/web/public_php/ams/img/info/patch.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png rename to code/web/public_php/ams/img/info/patch.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png b/code/web/public_php/ams/img/info/position.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png rename to code/web/public_php/ams/img/info/position.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png b/code/web/public_php/ams/img/info/processor.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png rename to code/web/public_php/ams/img/info/processor.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png b/code/web/public_php/ams/img/info/server.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png rename to code/web/public_php/ams/img/info/server.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png b/code/web/public_php/ams/img/info/shard.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png rename to code/web/public_php/ams/img/info/shard.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png b/code/web/public_php/ams/img/info/user.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png rename to code/web/public_php/ams/img/info/user.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png b/code/web/public_php/ams/img/info/view.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png rename to code/web/public_php/ams/img/info/view.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/off.png b/code/web/public_php/ams/img/iphone-style-checkboxes/off.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/off.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/off.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/on.png b/code/web/public_php/ams/img/iphone-style-checkboxes/on.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/on.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/on.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider.png b/code/web/public_php/ams/img/iphone-style-checkboxes/slider.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/slider.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_center.png b/code/web/public_php/ams/img/iphone-style-checkboxes/slider_center.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_center.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/slider_center.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_left.png b/code/web/public_php/ams/img/iphone-style-checkboxes/slider_left.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_left.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/slider_left.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_right.png b/code/web/public_php/ams/img/iphone-style-checkboxes/slider_right.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/iphone-style-checkboxes/slider_right.png rename to code/web/public_php/ams/img/iphone-style-checkboxes/slider_right.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/loading.gif b/code/web/public_php/ams/img/loading.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/loading.gif rename to code/web/public_php/ams/img/loading.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/loading_background.png b/code/web/public_php/ams/img/loading_background.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/loading_background.png rename to code/web/public_php/ams/img/loading_background.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/logo.png b/code/web/public_php/ams/img/logo.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/logo.png rename to code/web/public_php/ams/img/logo.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/logo20.png b/code/web/public_php/ams/img/logo20.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/logo20.png rename to code/web/public_php/ams/img/logo20.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/mainlogo.png b/code/web/public_php/ams/img/mainlogo.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/mainlogo.png rename to code/web/public_php/ams/img/mainlogo.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-black16.png b/code/web/public_php/ams/img/opa-icons-black16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-black16.png rename to code/web/public_php/ams/img/opa-icons-black16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-black32.png b/code/web/public_php/ams/img/opa-icons-black32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-black32.png rename to code/web/public_php/ams/img/opa-icons-black32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-blue16.png b/code/web/public_php/ams/img/opa-icons-blue16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-blue16.png rename to code/web/public_php/ams/img/opa-icons-blue16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-blue32.png b/code/web/public_php/ams/img/opa-icons-blue32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-blue32.png rename to code/web/public_php/ams/img/opa-icons-blue32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-color16.png b/code/web/public_php/ams/img/opa-icons-color16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-color16.png rename to code/web/public_php/ams/img/opa-icons-color16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-color32.png b/code/web/public_php/ams/img/opa-icons-color32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-color32.png rename to code/web/public_php/ams/img/opa-icons-color32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-darkgray16.png b/code/web/public_php/ams/img/opa-icons-darkgray16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-darkgray16.png rename to code/web/public_php/ams/img/opa-icons-darkgray16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-darkgray32.png b/code/web/public_php/ams/img/opa-icons-darkgray32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-darkgray32.png rename to code/web/public_php/ams/img/opa-icons-darkgray32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-gray16.png b/code/web/public_php/ams/img/opa-icons-gray16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-gray16.png rename to code/web/public_php/ams/img/opa-icons-gray16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-gray32.png b/code/web/public_php/ams/img/opa-icons-gray32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-gray32.png rename to code/web/public_php/ams/img/opa-icons-gray32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-green16.png b/code/web/public_php/ams/img/opa-icons-green16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-green16.png rename to code/web/public_php/ams/img/opa-icons-green16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-green32.png b/code/web/public_php/ams/img/opa-icons-green32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-green32.png rename to code/web/public_php/ams/img/opa-icons-green32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-orange16.png b/code/web/public_php/ams/img/opa-icons-orange16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-orange16.png rename to code/web/public_php/ams/img/opa-icons-orange16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-orange32.png b/code/web/public_php/ams/img/opa-icons-orange32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-orange32.png rename to code/web/public_php/ams/img/opa-icons-orange32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-red16.png b/code/web/public_php/ams/img/opa-icons-red16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-red16.png rename to code/web/public_php/ams/img/opa-icons-red16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-red32.png b/code/web/public_php/ams/img/opa-icons-red32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-red32.png rename to code/web/public_php/ams/img/opa-icons-red32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-white16.png b/code/web/public_php/ams/img/opa-icons-white16.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-white16.png rename to code/web/public_php/ams/img/opa-icons-white16.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-white32.png b/code/web/public_php/ams/img/opa-icons-white32.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/opa-icons-white32.png rename to code/web/public_php/ams/img/opa-icons-white32.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/progress.gif b/code/web/public_php/ams/img/progress.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/progress.gif rename to code/web/public_php/ams/img/progress.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/qrcode.png b/code/web/public_php/ams/img/qrcode.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/qrcode.png rename to code/web/public_php/ams/img/qrcode.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/qrcode136.png b/code/web/public_php/ams/img/qrcode136.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/qrcode136.png rename to code/web/public_php/ams/img/qrcode136.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/quicklook-bg.png b/code/web/public_php/ams/img/quicklook-bg.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/quicklook-bg.png rename to code/web/public_php/ams/img/quicklook-bg.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/quicklook-icons.png b/code/web/public_php/ams/img/quicklook-icons.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/quicklook-icons.png rename to code/web/public_php/ams/img/quicklook-icons.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/resize.png b/code/web/public_php/ams/img/resize.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/resize.png rename to code/web/public_php/ams/img/resize.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore.png b/code/web/public_php/ams/img/ryzomcore.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore.png rename to code/web/public_php/ams/img/ryzomcore.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore_166_62.png b/code/web/public_php/ams/img/ryzomcore_166_62.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore_166_62.png rename to code/web/public_php/ams/img/ryzomcore_166_62.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomlogo.psd b/code/web/public_php/ams/img/ryzomlogo.psd similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomlogo.psd rename to code/web/public_php/ams/img/ryzomlogo.psd diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomtop.png b/code/web/public_php/ams/img/ryzomtop.png old mode 100755 new mode 100644 similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomtop.png rename to code/web/public_php/ams/img/ryzomtop.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/spinner-mini.gif b/code/web/public_php/ams/img/spinner-mini.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/spinner-mini.gif rename to code/web/public_php/ams/img/spinner-mini.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/sprite.png b/code/web/public_php/ams/img/sprite.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/sprite.png rename to code/web/public_php/ams/img/sprite.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/star-half.png b/code/web/public_php/ams/img/star-half.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/star-half.png rename to code/web/public_php/ams/img/star-half.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/star-off.png b/code/web/public_php/ams/img/star-off.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/star-off.png rename to code/web/public_php/ams/img/star-off.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/star-on.png b/code/web/public_php/ams/img/star-on.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/star-on.png rename to code/web/public_php/ams/img/star-on.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/thumb.png b/code/web/public_php/ams/img/thumb.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/thumb.png rename to code/web/public_php/ams/img/thumb.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/toolbar.gif b/code/web/public_php/ams/img/toolbar.gif similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/toolbar.gif rename to code/web/public_php/ams/img/toolbar.gif diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/toolbar.png b/code/web/public_php/ams/img/toolbar.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/toolbar.png rename to code/web/public_php/ams/img/toolbar.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_flat_0_aaaaaa_40x100.png b/code/web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_flat_0_aaaaaa_40x100.png rename to code/web/public_php/ams/img/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_flat_75_ffffff_40x100.png b/code/web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_flat_75_ffffff_40x100.png rename to code/web/public_php/ams/img/ui-bg_flat_75_ffffff_40x100.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_55_fbf9ee_1x400.png b/code/web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_55_fbf9ee_1x400.png rename to code/web/public_php/ams/img/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_65_ffffff_1x400.png b/code/web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_65_ffffff_1x400.png rename to code/web/public_php/ams/img/ui-bg_glass_65_ffffff_1x400.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_75_dadada_1x400.png b/code/web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_75_dadada_1x400.png rename to code/web/public_php/ams/img/ui-bg_glass_75_dadada_1x400.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_75_e6e6e6_1x400.png b/code/web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_75_e6e6e6_1x400.png rename to code/web/public_php/ams/img/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_95_fef1ec_1x400.png b/code/web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_glass_95_fef1ec_1x400.png rename to code/web/public_php/ams/img/ui-bg_glass_95_fef1ec_1x400.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_highlight-soft_75_cccccc_1x100.png b/code/web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-bg_highlight-soft_75_cccccc_1x100.png rename to code/web/public_php/ams/img/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_222222_256x240.png b/code/web/public_php/ams/img/ui-icons_222222_256x240.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_222222_256x240.png rename to code/web/public_php/ams/img/ui-icons_222222_256x240.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_2e83ff_256x240.png b/code/web/public_php/ams/img/ui-icons_2e83ff_256x240.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_2e83ff_256x240.png rename to code/web/public_php/ams/img/ui-icons_2e83ff_256x240.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_454545_256x240.png b/code/web/public_php/ams/img/ui-icons_454545_256x240.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_454545_256x240.png rename to code/web/public_php/ams/img/ui-icons_454545_256x240.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_888888_256x240.png b/code/web/public_php/ams/img/ui-icons_888888_256x240.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_888888_256x240.png rename to code/web/public_php/ams/img/ui-icons_888888_256x240.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_cd0a0a_256x240.png b/code/web/public_php/ams/img/ui-icons_cd0a0a_256x240.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/ui-icons_cd0a0a_256x240.png rename to code/web/public_php/ams/img/ui-icons_cd0a0a_256x240.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/uploadify-cancel.png b/code/web/public_php/ams/img/uploadify-cancel.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/uploadify-cancel.png rename to code/web/public_php/ams/img/uploadify-cancel.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php b/code/web/public_php/ams/inc/change_permission.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php rename to code/web/public_php/ams/inc/change_permission.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php b/code/web/public_php/ams/inc/createticket.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php rename to code/web/public_php/ams/inc/createticket.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php b/code/web/public_php/ams/inc/dashboard.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php rename to code/web/public_php/ams/inc/dashboard.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/error.php b/code/web/public_php/ams/inc/error.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/error.php rename to code/web/public_php/ams/inc/error.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/forgot_password.php b/code/web/public_php/ams/inc/forgot_password.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/forgot_password.php rename to code/web/public_php/ams/inc/forgot_password.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php b/code/web/public_php/ams/inc/login.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php rename to code/web/public_php/ams/inc/login.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/logout.php b/code/web/public_php/ams/inc/logout.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/logout.php rename to code/web/public_php/ams/inc/logout.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/plugins.php b/code/web/public_php/ams/inc/plugins.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/plugins.php rename to code/web/public_php/ams/inc/plugins.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/plugins_update.php b/code/web/public_php/ams/inc/plugins_update.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/plugins_update.php rename to code/web/public_php/ams/inc/plugins_update.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/register.php b/code/web/public_php/ams/inc/register.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/register.php rename to code/web/public_php/ams/inc/register.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/reset_password.php b/code/web/public_php/ams/inc/reset_password.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/reset_password.php rename to code/web/public_php/ams/inc/reset_password.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php b/code/web/public_php/ams/inc/settings.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php rename to code/web/public_php/ams/inc/settings.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php b/code/web/public_php/ams/inc/sgroup_list.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php rename to code/web/public_php/ams/inc/sgroup_list.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php b/code/web/public_php/ams/inc/show_queue.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php rename to code/web/public_php/ams/inc/show_queue.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php b/code/web/public_php/ams/inc/show_reply.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php rename to code/web/public_php/ams/inc/show_reply.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php b/code/web/public_php/ams/inc/show_sgroup.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php rename to code/web/public_php/ams/inc/show_sgroup.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php b/code/web/public_php/ams/inc/show_ticket.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php rename to code/web/public_php/ams/inc/show_ticket.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php b/code/web/public_php/ams/inc/show_ticket_info.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php rename to code/web/public_php/ams/inc/show_ticket_info.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php b/code/web/public_php/ams/inc/show_ticket_log.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php rename to code/web/public_php/ams/inc/show_ticket_log.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php b/code/web/public_php/ams/inc/show_user.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php rename to code/web/public_php/ams/inc/show_user.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/syncing.php b/code/web/public_php/ams/inc/syncing.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/syncing.php rename to code/web/public_php/ams/inc/syncing.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php b/code/web/public_php/ams/inc/userlist.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php rename to code/web/public_php/ams/inc/userlist.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index.php b/code/web/public_php/ams/index.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/index.php rename to code/web/public_php/ams/index.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/web/public_php/ams/installer/libsetup.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php rename to code/web/public_php/ams/installer/libsetup.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-alert.js b/code/web/public_php/ams/js/bootstrap-alert.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-alert.js rename to code/web/public_php/ams/js/bootstrap-alert.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-button.js b/code/web/public_php/ams/js/bootstrap-button.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-button.js rename to code/web/public_php/ams/js/bootstrap-button.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-carousel.js b/code/web/public_php/ams/js/bootstrap-carousel.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-carousel.js rename to code/web/public_php/ams/js/bootstrap-carousel.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-collapse.js b/code/web/public_php/ams/js/bootstrap-collapse.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-collapse.js rename to code/web/public_php/ams/js/bootstrap-collapse.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-dropdown.js b/code/web/public_php/ams/js/bootstrap-dropdown.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-dropdown.js rename to code/web/public_php/ams/js/bootstrap-dropdown.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-modal.js b/code/web/public_php/ams/js/bootstrap-modal.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-modal.js rename to code/web/public_php/ams/js/bootstrap-modal.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-popover.js b/code/web/public_php/ams/js/bootstrap-popover.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-popover.js rename to code/web/public_php/ams/js/bootstrap-popover.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-scrollspy.js b/code/web/public_php/ams/js/bootstrap-scrollspy.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-scrollspy.js rename to code/web/public_php/ams/js/bootstrap-scrollspy.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tab.js b/code/web/public_php/ams/js/bootstrap-tab.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tab.js rename to code/web/public_php/ams/js/bootstrap-tab.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-toggle.js b/code/web/public_php/ams/js/bootstrap-toggle.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-toggle.js rename to code/web/public_php/ams/js/bootstrap-toggle.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tooltip.js b/code/web/public_php/ams/js/bootstrap-tooltip.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tooltip.js rename to code/web/public_php/ams/js/bootstrap-tooltip.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tour.js b/code/web/public_php/ams/js/bootstrap-tour.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-tour.js rename to code/web/public_php/ams/js/bootstrap-tour.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-transition.js b/code/web/public_php/ams/js/bootstrap-transition.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-transition.js rename to code/web/public_php/ams/js/bootstrap-transition.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-typeahead.js b/code/web/public_php/ams/js/bootstrap-typeahead.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/bootstrap-typeahead.js rename to code/web/public_php/ams/js/bootstrap-typeahead.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js b/code/web/public_php/ams/js/charisma.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js rename to code/web/public_php/ams/js/charisma.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/excanvas.js b/code/web/public_php/ams/js/excanvas.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/excanvas.js rename to code/web/public_php/ams/js/excanvas.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/fullcalendar.min.js b/code/web/public_php/ams/js/fullcalendar.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/fullcalendar.min.js rename to code/web/public_php/ams/js/fullcalendar.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js b/code/web/public_php/ams/js/help.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/help.js rename to code/web/public_php/ams/js/help.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery-1.7.2.min.js b/code/web/public_php/ams/js/jquery-1.7.2.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery-1.7.2.min.js rename to code/web/public_php/ams/js/jquery-1.7.2.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery-ui-1.8.21.custom.min.js b/code/web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery-ui-1.8.21.custom.min.js rename to code/web/public_php/ams/js/jquery-ui-1.8.21.custom.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.autogrow-textarea.js b/code/web/public_php/ams/js/jquery.autogrow-textarea.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.autogrow-textarea.js rename to code/web/public_php/ams/js/jquery.autogrow-textarea.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.chosen.min.js b/code/web/public_php/ams/js/jquery.chosen.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.chosen.min.js rename to code/web/public_php/ams/js/jquery.chosen.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.cleditor.min.js b/code/web/public_php/ams/js/jquery.cleditor.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.cleditor.min.js rename to code/web/public_php/ams/js/jquery.cleditor.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.colorbox.min.js b/code/web/public_php/ams/js/jquery.colorbox.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.colorbox.min.js rename to code/web/public_php/ams/js/jquery.colorbox.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.cookie.js b/code/web/public_php/ams/js/jquery.cookie.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.cookie.js rename to code/web/public_php/ams/js/jquery.cookie.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.dataTables.min.js b/code/web/public_php/ams/js/jquery.dataTables.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.dataTables.min.js rename to code/web/public_php/ams/js/jquery.dataTables.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.elfinder.min.js b/code/web/public_php/ams/js/jquery.elfinder.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.elfinder.min.js rename to code/web/public_php/ams/js/jquery.elfinder.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.min.js b/code/web/public_php/ams/js/jquery.flot.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.min.js rename to code/web/public_php/ams/js/jquery.flot.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.pie.min.js b/code/web/public_php/ams/js/jquery.flot.pie.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.pie.min.js rename to code/web/public_php/ams/js/jquery.flot.pie.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.resize.min.js b/code/web/public_php/ams/js/jquery.flot.resize.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.resize.min.js rename to code/web/public_php/ams/js/jquery.flot.resize.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.stack.js b/code/web/public_php/ams/js/jquery.flot.stack.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.flot.stack.js rename to code/web/public_php/ams/js/jquery.flot.stack.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.history.js b/code/web/public_php/ams/js/jquery.history.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.history.js rename to code/web/public_php/ams/js/jquery.history.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.iphone.toggle.js b/code/web/public_php/ams/js/jquery.iphone.toggle.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.iphone.toggle.js rename to code/web/public_php/ams/js/jquery.iphone.toggle.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.js b/code/web/public_php/ams/js/jquery.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.js rename to code/web/public_php/ams/js/jquery.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.noty.js b/code/web/public_php/ams/js/jquery.noty.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.noty.js rename to code/web/public_php/ams/js/jquery.noty.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.raty.min.js b/code/web/public_php/ams/js/jquery.raty.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.raty.min.js rename to code/web/public_php/ams/js/jquery.raty.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.uniform.min.js b/code/web/public_php/ams/js/jquery.uniform.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.uniform.min.js rename to code/web/public_php/ams/js/jquery.uniform.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.uploadify-3.1.min.js b/code/web/public_php/ams/js/jquery.uploadify-3.1.min.js similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/js/jquery.uploadify-3.1.min.js rename to code/web/public_php/ams/js/jquery.uploadify-3.1.min.js diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/license.txt b/code/web/public_php/ams/license.txt similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/license.txt rename to code/web/public_php/ams/license.txt diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/check-exists.php b/code/web/public_php/ams/misc/check-exists.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/check-exists.php rename to code/web/public_php/ams/misc/check-exists.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/MySQLStorage.sql b/code/web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/MySQLStorage.sql rename to code/web/public_php/ams/misc/elfinder-connector/MySQLStorage.sql diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/connector.php b/code/web/public_php/ams/misc/elfinder-connector/connector.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/connector.php rename to code/web/public_php/ams/misc/elfinder-connector/connector.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinder.class.php b/code/web/public_php/ams/misc/elfinder-connector/elFinder.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinder.class.php rename to code/web/public_php/ams/misc/elfinder-connector/elFinder.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderConnector.class.php b/code/web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderConnector.class.php rename to code/web/public_php/ams/misc/elfinder-connector/elFinderConnector.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeDriver.class.php b/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeDriver.class.php rename to code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeDriver.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php b/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php rename to code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeLocalFileSystem.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeMySQL.class.php b/code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/elFinderVolumeMySQL.class.php rename to code/web/public_php/ams/misc/elfinder-connector/elFinderVolumeMySQL.class.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/mime.types b/code/web/public_php/ams/misc/elfinder-connector/mime.types similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/elfinder-connector/mime.types rename to code/web/public_php/ams/misc/elfinder-connector/mime.types diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/uploadify.php b/code/web/public_php/ams/misc/uploadify.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/uploadify.php rename to code/web/public_php/ams/misc/uploadify.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/misc/uploadify.swf b/code/web/public_php/ams/misc/uploadify.swf similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/misc/uploadify.swf rename to code/web/public_php/ams/misc/uploadify.swf diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/DBScheme.png b/code/web/public_php/ams/sql/DBScheme.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/sql/DBScheme.png rename to code/web/public_php/ams/sql/DBScheme.png diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/db.sql b/code/web/public_php/ams/sql/db.sql similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/sql/db.sql rename to code/web/public_php/ams/sql/db.sql diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/importusers.php b/code/web/public_php/ams/sql/importusers.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/sql/importusers.php rename to code/web/public_php/ams/sql/importusers.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/ticketsql.sql b/code/web/public_php/ams/sql/ticketsql.sql similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/sql/ticketsql.sql rename to code/web/public_php/ams/sql/ticketsql.sql diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/ticketsystemmodel.mwb b/code/web/public_php/ams/sql/ticketsystemmodel.mwb similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/sql/ticketsystemmodel.mwb rename to code/web/public_php/ams/sql/ticketsystemmodel.mwb diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/createticket.tpl b/code/web/public_php/ams/templates/createticket.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/createticket.tpl rename to code/web/public_php/ams/templates/createticket.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/dashboard.tpl b/code/web/public_php/ams/templates/dashboard.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/dashboard.tpl rename to code/web/public_php/ams/templates/dashboard.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl b/code/web/public_php/ams/templates/error.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/error.tpl rename to code/web/public_php/ams/templates/error.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl b/code/web/public_php/ams/templates/forgot_password.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl rename to code/web/public_php/ams/templates/forgot_password.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/homebackup.tpl b/code/web/public_php/ams/templates/homebackup.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/homebackup.tpl rename to code/web/public_php/ams/templates/homebackup.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl b/code/web/public_php/ams/templates/install.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl rename to code/web/public_php/ams/templates/install.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/install_plugin.tpl b/code/web/public_php/ams/templates/install_plugin.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/install_plugin.tpl rename to code/web/public_php/ams/templates/install_plugin.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl rename to code/web/public_php/ams/templates/layout.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl b/code/web/public_php/ams/templates/layout_admin.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl rename to code/web/public_php/ams/templates/layout_admin.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl b/code/web/public_php/ams/templates/layout_mod.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl rename to code/web/public_php/ams/templates/layout_mod.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl b/code/web/public_php/ams/templates/layout_plugin.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl rename to code/web/public_php/ams/templates/layout_plugin.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl b/code/web/public_php/ams/templates/layout_user.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl rename to code/web/public_php/ams/templates/layout_user.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl b/code/web/public_php/ams/templates/login.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl rename to code/web/public_php/ams/templates/login.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl b/code/web/public_php/ams/templates/logout.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl rename to code/web/public_php/ams/templates/logout.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/plugins.tpl b/code/web/public_php/ams/templates/plugins.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/plugins.tpl rename to code/web/public_php/ams/templates/plugins.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/plugins_update.tpl b/code/web/public_php/ams/templates/plugins_update.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/plugins_update.tpl rename to code/web/public_php/ams/templates/plugins_update.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl b/code/web/public_php/ams/templates/register.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl rename to code/web/public_php/ams/templates/register.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl b/code/web/public_php/ams/templates/register_feedback.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl rename to code/web/public_php/ams/templates/register_feedback.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl b/code/web/public_php/ams/templates/reset_password.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl rename to code/web/public_php/ams/templates/reset_password.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl b/code/web/public_php/ams/templates/reset_success.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl rename to code/web/public_php/ams/templates/reset_success.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl b/code/web/public_php/ams/templates/settings.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl rename to code/web/public_php/ams/templates/settings.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/sgroup_list.tpl b/code/web/public_php/ams/templates/sgroup_list.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/sgroup_list.tpl rename to code/web/public_php/ams/templates/sgroup_list.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_queue.tpl b/code/web/public_php/ams/templates/show_queue.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_queue.tpl rename to code/web/public_php/ams/templates/show_queue.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl b/code/web/public_php/ams/templates/show_reply.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl rename to code/web/public_php/ams/templates/show_reply.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_sgroup.tpl b/code/web/public_php/ams/templates/show_sgroup.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_sgroup.tpl rename to code/web/public_php/ams/templates/show_sgroup.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl b/code/web/public_php/ams/templates/show_ticket.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl rename to code/web/public_php/ams/templates/show_ticket.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl b/code/web/public_php/ams/templates/show_ticket_info.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl rename to code/web/public_php/ams/templates/show_ticket_info.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_log.tpl b/code/web/public_php/ams/templates/show_ticket_log.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_log.tpl rename to code/web/public_php/ams/templates/show_ticket_log.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl b/code/web/public_php/ams/templates/show_user.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl rename to code/web/public_php/ams/templates/show_user.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/syncing.tpl b/code/web/public_php/ams/templates/syncing.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/syncing.tpl rename to code/web/public_php/ams/templates/syncing.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl b/code/web/public_php/ams/templates/userlist.tpl similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl rename to code/web/public_php/ams/templates/userlist.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder b/code/web/public_php/ams/templates_c/placeholder similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder rename to code/web/public_php/ams/templates_c/placeholder diff --git a/code/web/api/client/auth.php b/code/web/public_php/api/client/auth.php similarity index 100% rename from code/web/api/client/auth.php rename to code/web/public_php/api/client/auth.php diff --git a/code/web/api/client/config.php.default b/code/web/public_php/api/client/config.php.default similarity index 100% rename from code/web/api/client/config.php.default rename to code/web/public_php/api/client/config.php.default diff --git a/code/web/api/client/time.php b/code/web/public_php/api/client/time.php similarity index 100% rename from code/web/api/client/time.php rename to code/web/public_php/api/client/time.php diff --git a/code/web/api/client/user.php b/code/web/public_php/api/client/user.php similarity index 100% rename from code/web/api/client/user.php rename to code/web/public_php/api/client/user.php diff --git a/code/web/api/client/utils.php b/code/web/public_php/api/client/utils.php similarity index 100% rename from code/web/api/client/utils.php rename to code/web/public_php/api/client/utils.php diff --git a/code/web/api/common/actionPage.php b/code/web/public_php/api/common/actionPage.php similarity index 100% rename from code/web/api/common/actionPage.php rename to code/web/public_php/api/common/actionPage.php diff --git a/code/web/api/common/auth.php b/code/web/public_php/api/common/auth.php similarity index 100% rename from code/web/api/common/auth.php rename to code/web/public_php/api/common/auth.php diff --git a/code/web/api/common/bbCode.php b/code/web/public_php/api/common/bbCode.php similarity index 100% rename from code/web/api/common/bbCode.php rename to code/web/public_php/api/common/bbCode.php diff --git a/code/web/api/common/config.php.default b/code/web/public_php/api/common/config.php.default similarity index 100% rename from code/web/api/common/config.php.default rename to code/web/public_php/api/common/config.php.default diff --git a/code/web/api/common/db_defs.php b/code/web/public_php/api/common/db_defs.php similarity index 100% rename from code/web/api/common/db_defs.php rename to code/web/public_php/api/common/db_defs.php diff --git a/code/web/api/common/db_lib.php b/code/web/public_php/api/common/db_lib.php similarity index 100% rename from code/web/api/common/db_lib.php rename to code/web/public_php/api/common/db_lib.php diff --git a/code/web/api/common/dfm.php b/code/web/public_php/api/common/dfm.php similarity index 100% rename from code/web/api/common/dfm.php rename to code/web/public_php/api/common/dfm.php diff --git a/code/web/api/common/logger.php b/code/web/public_php/api/common/logger.php similarity index 100% rename from code/web/api/common/logger.php rename to code/web/public_php/api/common/logger.php diff --git a/code/web/api/common/render.php b/code/web/public_php/api/common/render.php similarity index 100% rename from code/web/api/common/render.php rename to code/web/public_php/api/common/render.php diff --git a/code/web/api/common/ryform.php b/code/web/public_php/api/common/ryform.php similarity index 100% rename from code/web/api/common/ryform.php rename to code/web/public_php/api/common/ryform.php diff --git a/code/web/api/common/ryformBases.php b/code/web/public_php/api/common/ryformBases.php similarity index 100% rename from code/web/api/common/ryformBases.php rename to code/web/public_php/api/common/ryformBases.php diff --git a/code/web/api/common/time.php b/code/web/public_php/api/common/time.php similarity index 100% rename from code/web/api/common/time.php rename to code/web/public_php/api/common/time.php diff --git a/code/web/api/common/user.php b/code/web/public_php/api/common/user.php similarity index 100% rename from code/web/api/common/user.php rename to code/web/public_php/api/common/user.php diff --git a/code/web/api/common/utils.php b/code/web/public_php/api/common/utils.php similarity index 100% rename from code/web/api/common/utils.php rename to code/web/public_php/api/common/utils.php diff --git a/code/web/api/common/xml_utils.php b/code/web/public_php/api/common/xml_utils.php similarity index 100% rename from code/web/api/common/xml_utils.php rename to code/web/public_php/api/common/xml_utils.php diff --git a/code/web/api/data/css/ryzom_iphone.css b/code/web/public_php/api/data/css/ryzom_iphone.css similarity index 100% rename from code/web/api/data/css/ryzom_iphone.css rename to code/web/public_php/api/data/css/ryzom_iphone.css diff --git a/code/web/api/data/css/ryzom_ui.css b/code/web/public_php/api/data/css/ryzom_ui.css similarity index 100% rename from code/web/api/data/css/ryzom_ui.css rename to code/web/public_php/api/data/css/ryzom_ui.css diff --git a/code/web/api/data/css/skin_b.gif b/code/web/public_php/api/data/css/skin_b.gif similarity index 100% rename from code/web/api/data/css/skin_b.gif rename to code/web/public_php/api/data/css/skin_b.gif diff --git a/code/web/api/data/css/skin_bl.gif b/code/web/public_php/api/data/css/skin_bl.gif similarity index 100% rename from code/web/api/data/css/skin_bl.gif rename to code/web/public_php/api/data/css/skin_bl.gif diff --git a/code/web/api/data/css/skin_blank.png b/code/web/public_php/api/data/css/skin_blank.png similarity index 100% rename from code/web/api/data/css/skin_blank.png rename to code/web/public_php/api/data/css/skin_blank.png diff --git a/code/web/api/data/css/skin_blank_inner.png b/code/web/public_php/api/data/css/skin_blank_inner.png similarity index 100% rename from code/web/api/data/css/skin_blank_inner.png rename to code/web/public_php/api/data/css/skin_blank_inner.png diff --git a/code/web/api/data/css/skin_br.gif b/code/web/public_php/api/data/css/skin_br.gif similarity index 100% rename from code/web/api/data/css/skin_br.gif rename to code/web/public_php/api/data/css/skin_br.gif diff --git a/code/web/api/data/css/skin_header_l.gif b/code/web/public_php/api/data/css/skin_header_l.gif similarity index 100% rename from code/web/api/data/css/skin_header_l.gif rename to code/web/public_php/api/data/css/skin_header_l.gif diff --git a/code/web/api/data/css/skin_header_m.gif b/code/web/public_php/api/data/css/skin_header_m.gif similarity index 100% rename from code/web/api/data/css/skin_header_m.gif rename to code/web/public_php/api/data/css/skin_header_m.gif diff --git a/code/web/api/data/css/skin_header_r.gif b/code/web/public_php/api/data/css/skin_header_r.gif similarity index 100% rename from code/web/api/data/css/skin_header_r.gif rename to code/web/public_php/api/data/css/skin_header_r.gif diff --git a/code/web/api/data/css/skin_l.gif b/code/web/public_php/api/data/css/skin_l.gif similarity index 100% rename from code/web/api/data/css/skin_l.gif rename to code/web/public_php/api/data/css/skin_l.gif diff --git a/code/web/api/data/css/skin_r.gif b/code/web/public_php/api/data/css/skin_r.gif similarity index 100% rename from code/web/api/data/css/skin_r.gif rename to code/web/public_php/api/data/css/skin_r.gif diff --git a/code/web/api/data/css/skin_t.gif b/code/web/public_php/api/data/css/skin_t.gif similarity index 100% rename from code/web/api/data/css/skin_t.gif rename to code/web/public_php/api/data/css/skin_t.gif diff --git a/code/web/api/data/css/skin_tl.gif b/code/web/public_php/api/data/css/skin_tl.gif similarity index 100% rename from code/web/api/data/css/skin_tl.gif rename to code/web/public_php/api/data/css/skin_tl.gif diff --git a/code/web/api/data/css/skin_tr.gif b/code/web/public_php/api/data/css/skin_tr.gif similarity index 100% rename from code/web/api/data/css/skin_tr.gif rename to code/web/public_php/api/data/css/skin_tr.gif diff --git a/code/web/api/data/icons/add_app.png b/code/web/public_php/api/data/icons/add_app.png similarity index 100% rename from code/web/api/data/icons/add_app.png rename to code/web/public_php/api/data/icons/add_app.png diff --git a/code/web/api/data/icons/edit.png b/code/web/public_php/api/data/icons/edit.png similarity index 100% rename from code/web/api/data/icons/edit.png rename to code/web/public_php/api/data/icons/edit.png diff --git a/code/web/api/data/icons/edit_16.png b/code/web/public_php/api/data/icons/edit_16.png similarity index 100% rename from code/web/api/data/icons/edit_16.png rename to code/web/public_php/api/data/icons/edit_16.png diff --git a/code/web/api/data/icons/no_action.png b/code/web/public_php/api/data/icons/no_action.png similarity index 100% rename from code/web/api/data/icons/no_action.png rename to code/web/public_php/api/data/icons/no_action.png diff --git a/code/web/api/data/icons/spe_com.png b/code/web/public_php/api/data/icons/spe_com.png similarity index 100% rename from code/web/api/data/icons/spe_com.png rename to code/web/public_php/api/data/icons/spe_com.png diff --git a/code/web/api/data/img/backgrounds/parchemin.png b/code/web/public_php/api/data/img/backgrounds/parchemin.png similarity index 100% rename from code/web/api/data/img/backgrounds/parchemin.png rename to code/web/public_php/api/data/img/backgrounds/parchemin.png diff --git a/code/web/api/data/img/bg.jpg b/code/web/public_php/api/data/img/bg.jpg similarity index 100% rename from code/web/api/data/img/bg.jpg rename to code/web/public_php/api/data/img/bg.jpg diff --git a/code/web/api/data/img/bordure.png b/code/web/public_php/api/data/img/bordure.png similarity index 100% rename from code/web/api/data/img/bordure.png rename to code/web/public_php/api/data/img/bordure.png diff --git a/code/web/api/data/img/lang/de.png b/code/web/public_php/api/data/img/lang/de.png similarity index 100% rename from code/web/api/data/img/lang/de.png rename to code/web/public_php/api/data/img/lang/de.png diff --git a/code/web/api/data/img/lang/en.png b/code/web/public_php/api/data/img/lang/en.png similarity index 100% rename from code/web/api/data/img/lang/en.png rename to code/web/public_php/api/data/img/lang/en.png diff --git a/code/web/api/data/img/lang/es.png b/code/web/public_php/api/data/img/lang/es.png similarity index 100% rename from code/web/api/data/img/lang/es.png rename to code/web/public_php/api/data/img/lang/es.png diff --git a/code/web/api/data/img/lang/fr.png b/code/web/public_php/api/data/img/lang/fr.png similarity index 100% rename from code/web/api/data/img/lang/fr.png rename to code/web/public_php/api/data/img/lang/fr.png diff --git a/code/web/api/data/img/lang/ru.png b/code/web/public_php/api/data/img/lang/ru.png similarity index 100% rename from code/web/api/data/img/lang/ru.png rename to code/web/public_php/api/data/img/lang/ru.png diff --git a/code/web/api/data/img/logo.gif b/code/web/public_php/api/data/img/logo.gif similarity index 100% rename from code/web/api/data/img/logo.gif rename to code/web/public_php/api/data/img/logo.gif diff --git a/code/web/api/data/js/combobox.js b/code/web/public_php/api/data/js/combobox.js similarity index 100% rename from code/web/api/data/js/combobox.js rename to code/web/public_php/api/data/js/combobox.js diff --git a/code/web/api/data/js/jquery-1.7.1.js b/code/web/public_php/api/data/js/jquery-1.7.1.js similarity index 100% rename from code/web/api/data/js/jquery-1.7.1.js rename to code/web/public_php/api/data/js/jquery-1.7.1.js diff --git a/code/web/api/data/js/tab.js b/code/web/public_php/api/data/js/tab.js similarity index 100% rename from code/web/api/data/js/tab.js rename to code/web/public_php/api/data/js/tab.js diff --git a/code/web/api/data/ryzom/guild_png/.htaccess b/code/web/public_php/api/data/ryzom/guild_png/.htaccess similarity index 100% rename from code/web/api/data/ryzom/guild_png/.htaccess rename to code/web/public_php/api/data/ryzom/guild_png/.htaccess diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_00_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_00_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_00_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_00_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_00_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_01_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_01_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_01_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_01_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_01_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_02_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_02_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_02_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_02_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_02_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_03_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_03_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_03_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_03_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_03_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_04_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_04_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_04_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_04_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_04_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_05_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_05_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_05_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_05_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_05_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_06_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_06_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_06_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_06_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_06_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_07_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_07_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_07_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_07_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_07_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_08_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_08_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_08_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_08_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_08_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_09_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_09_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_09_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_09_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_09_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_10_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_10_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_10_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_10_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_10_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_11_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_11_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_11_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_11_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_11_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_12_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_12_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_12_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_12_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_12_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_13_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_13_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_13_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_13_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_13_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_14_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_14_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_b_14_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_b_14_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_b_14_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_00_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_00_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_00_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_00_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_00_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_01_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_01_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_01_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_01_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_01_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_02_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_02_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_02_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_02_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_02_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_03_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_03_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_03_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_03_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_03_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_04_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_04_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_04_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_04_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_04_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_05_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_05_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_05_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_05_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_05_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_06_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_06_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_06_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_06_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_06_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_07_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_07_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_07_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_07_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_07_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_08_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_08_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_08_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_08_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_08_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_09_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_09_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_09_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_09_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_09_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_10_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_10_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_10_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_10_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_10_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_11_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_11_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_11_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_11_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_11_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_12_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_12_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_12_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_12_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_12_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_13_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_13_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_13_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_13_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_13_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_14_1.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_14_1.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_1.png diff --git a/code/web/api/data/ryzom/guild_png/guild_back_s_14_2.png b/code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_back_s_14_2.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_back_s_14_2.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_00.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_00.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_00.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_01.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_01.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_01.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_02.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_02.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_02.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_03.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_03.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_03.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_04.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_04.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_04.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_05.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_05.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_05.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_06.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_06.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_06.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_07.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_07.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_07.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_08.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_08.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_08.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_09.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_09.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_09.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_10.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_10.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_10.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_11.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_11.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_11.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_12.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_12.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_12.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_13.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_13.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_13.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_14.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_14.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_14.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_15.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_15.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_15.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_16.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_16.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_16.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_17.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_17.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_17.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_18.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_18.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_18.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_19.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_19.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_19.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_20.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_20.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_20.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_21.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_21.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_21.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_22.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_22.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_22.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_23.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_23.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_23.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_24.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_24.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_24.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_25.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_25.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_25.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_26.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_26.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_26.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_27.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_27.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_27.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_28.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_28.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_28.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_29.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_29.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_29.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_30.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_30.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_30.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_31.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_31.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_31.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_32.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_32.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_32.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_33.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_33.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_33.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_34.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_34.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_34.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_35.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_35.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_35.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_36.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_36.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_36.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_37.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_37.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_37.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_38.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_38.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_38.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_39.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_39.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_39.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_40.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_40.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_40.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_41.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_41.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_41.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_42.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_42.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_42.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_b_43.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_b_43.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_b_43.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_00.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_00.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_00.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_01.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_01.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_01.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_02.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_02.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_02.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_03.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_03.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_03.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_04.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_04.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_04.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_05.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_05.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_05.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_06.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_06.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_06.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_07.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_07.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_07.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_08.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_08.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_08.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_09.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_09.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_09.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_10.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_10.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_10.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_11.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_11.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_11.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_12.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_12.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_12.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_13.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_13.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_13.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_14.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_14.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_14.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_15.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_15.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_15.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_16.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_16.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_16.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_17.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_17.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_17.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_18.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_18.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_18.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_19.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_19.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_19.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_20.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_20.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_20.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_21.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_21.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_21.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_22.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_22.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_22.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_23.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_23.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_23.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_24.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_24.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_24.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_25.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_25.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_25.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_26.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_26.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_26.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_27.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_27.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_27.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_28.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_28.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_28.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_29.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_29.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_29.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_30.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_30.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_30.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_31.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_31.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_31.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_32.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_32.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_32.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_33.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_33.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_33.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_34.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_34.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_34.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_35.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_35.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_35.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_36.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_36.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_36.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_37.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_37.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_37.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_38.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_38.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_38.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_39.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_39.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_39.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_40.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_40.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_40.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_41.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_41.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_41.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_42.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_42.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_42.png diff --git a/code/web/api/data/ryzom/guild_png/guild_symbol_s_43.png b/code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png similarity index 100% rename from code/web/api/data/ryzom/guild_png/guild_symbol_s_43.png rename to code/web/public_php/api/data/ryzom/guild_png/guild_symbol_s_43.png diff --git a/code/web/api/data/ryzom/interface/1h_over.png b/code/web/public_php/api/data/ryzom/interface/1h_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/1h_over.png rename to code/web/public_php/api/data/ryzom/interface/1h_over.png diff --git a/code/web/api/data/ryzom/interface/2h_over.png b/code/web/public_php/api/data/ryzom/interface/2h_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/2h_over.png rename to code/web/public_php/api/data/ryzom/interface/2h_over.png diff --git a/code/web/api/data/ryzom/interface/am_logo.png b/code/web/public_php/api/data/ryzom/interface/am_logo.png similarity index 100% rename from code/web/api/data/ryzom/interface/am_logo.png rename to code/web/public_php/api/data/ryzom/interface/am_logo.png diff --git a/code/web/api/data/ryzom/interface/ar_armpad.png b/code/web/public_php/api/data/ryzom/interface/ar_armpad.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_armpad.png rename to code/web/public_php/api/data/ryzom/interface/ar_armpad.png diff --git a/code/web/api/data/ryzom/interface/ar_armpad_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_armpad_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_armpad_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_armpad_mask.png diff --git a/code/web/api/data/ryzom/interface/ar_botte.png b/code/web/public_php/api/data/ryzom/interface/ar_botte.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_botte.png rename to code/web/public_php/api/data/ryzom/interface/ar_botte.png diff --git a/code/web/api/data/ryzom/interface/ar_botte_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_botte_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_botte_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_botte_mask.png diff --git a/code/web/api/data/ryzom/interface/ar_gilet.png b/code/web/public_php/api/data/ryzom/interface/ar_gilet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_gilet.png rename to code/web/public_php/api/data/ryzom/interface/ar_gilet.png diff --git a/code/web/api/data/ryzom/interface/ar_gilet_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_gilet_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_gilet_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_gilet_mask.png diff --git a/code/web/api/data/ryzom/interface/ar_hand.png b/code/web/public_php/api/data/ryzom/interface/ar_hand.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_hand.png rename to code/web/public_php/api/data/ryzom/interface/ar_hand.png diff --git a/code/web/api/data/ryzom/interface/ar_hand_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_hand_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_hand_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_hand_mask.png diff --git a/code/web/api/data/ryzom/interface/ar_helmet.png b/code/web/public_php/api/data/ryzom/interface/ar_helmet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_helmet.png rename to code/web/public_php/api/data/ryzom/interface/ar_helmet.png diff --git a/code/web/api/data/ryzom/interface/ar_helmet_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_helmet_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_helmet_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_helmet_mask.png diff --git a/code/web/api/data/ryzom/interface/ar_pantabotte.png b/code/web/public_php/api/data/ryzom/interface/ar_pantabotte.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_pantabotte.png rename to code/web/public_php/api/data/ryzom/interface/ar_pantabotte.png diff --git a/code/web/api/data/ryzom/interface/ar_pantabotte_mask.png b/code/web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ar_pantabotte_mask.png rename to code/web/public_php/api/data/ryzom/interface/ar_pantabotte_mask.png diff --git a/code/web/api/data/ryzom/interface/asc_exit.png b/code/web/public_php/api/data/ryzom/interface/asc_exit.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_exit.png rename to code/web/public_php/api/data/ryzom/interface/asc_exit.png diff --git a/code/web/api/data/ryzom/interface/asc_rolemastercraft.png b/code/web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_rolemastercraft.png rename to code/web/public_php/api/data/ryzom/interface/asc_rolemastercraft.png diff --git a/code/web/api/data/ryzom/interface/asc_rolemasterfight.png b/code/web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_rolemasterfight.png rename to code/web/public_php/api/data/ryzom/interface/asc_rolemasterfight.png diff --git a/code/web/api/data/ryzom/interface/asc_rolemasterharvest.png b/code/web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_rolemasterharvest.png rename to code/web/public_php/api/data/ryzom/interface/asc_rolemasterharvest.png diff --git a/code/web/api/data/ryzom/interface/asc_rolemastermagic.png b/code/web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_rolemastermagic.png rename to code/web/public_php/api/data/ryzom/interface/asc_rolemastermagic.png diff --git a/code/web/api/data/ryzom/interface/asc_unknown.png b/code/web/public_php/api/data/ryzom/interface/asc_unknown.png similarity index 100% rename from code/web/api/data/ryzom/interface/asc_unknown.png rename to code/web/public_php/api/data/ryzom/interface/asc_unknown.png diff --git a/code/web/api/data/ryzom/interface/bg_downloader.png b/code/web/public_php/api/data/ryzom/interface/bg_downloader.png similarity index 100% rename from code/web/api/data/ryzom/interface/bg_downloader.png rename to code/web/public_php/api/data/ryzom/interface/bg_downloader.png diff --git a/code/web/api/data/ryzom/interface/bg_empty.png b/code/web/public_php/api/data/ryzom/interface/bg_empty.png similarity index 100% rename from code/web/api/data/ryzom/interface/bg_empty.png rename to code/web/public_php/api/data/ryzom/interface/bg_empty.png diff --git a/code/web/api/data/ryzom/interface/bk_aura.png b/code/web/public_php/api/data/ryzom/interface/bk_aura.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_aura.png rename to code/web/public_php/api/data/ryzom/interface/bk_aura.png diff --git a/code/web/api/data/ryzom/interface/bk_conso.png b/code/web/public_php/api/data/ryzom/interface/bk_conso.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_conso.png rename to code/web/public_php/api/data/ryzom/interface/bk_conso.png diff --git a/code/web/api/data/ryzom/interface/bk_consommable.png b/code/web/public_php/api/data/ryzom/interface/bk_consommable.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_consommable.png rename to code/web/public_php/api/data/ryzom/interface/bk_consommable.png diff --git a/code/web/api/data/ryzom/interface/bk_fyros.png b/code/web/public_php/api/data/ryzom/interface/bk_fyros.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_fyros.png rename to code/web/public_php/api/data/ryzom/interface/bk_fyros.png diff --git a/code/web/api/data/ryzom/interface/bk_fyros_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_fyros_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_fyros_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_fyros_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_generic.png b/code/web/public_php/api/data/ryzom/interface/bk_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_generic.png rename to code/web/public_php/api/data/ryzom/interface/bk_generic.png diff --git a/code/web/api/data/ryzom/interface/bk_generic_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_generic_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_generic_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_generic_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_goo.png b/code/web/public_php/api/data/ryzom/interface/bk_goo.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_goo.png rename to code/web/public_php/api/data/ryzom/interface/bk_goo.png diff --git a/code/web/api/data/ryzom/interface/bk_guild.png b/code/web/public_php/api/data/ryzom/interface/bk_guild.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_guild.png rename to code/web/public_php/api/data/ryzom/interface/bk_guild.png diff --git a/code/web/api/data/ryzom/interface/bk_horde.png b/code/web/public_php/api/data/ryzom/interface/bk_horde.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_horde.png rename to code/web/public_php/api/data/ryzom/interface/bk_horde.png diff --git a/code/web/api/data/ryzom/interface/bk_kami.png b/code/web/public_php/api/data/ryzom/interface/bk_kami.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_kami.png rename to code/web/public_php/api/data/ryzom/interface/bk_kami.png diff --git a/code/web/api/data/ryzom/interface/bk_karavan.png b/code/web/public_php/api/data/ryzom/interface/bk_karavan.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_karavan.png rename to code/web/public_php/api/data/ryzom/interface/bk_karavan.png diff --git a/code/web/api/data/ryzom/interface/bk_magie_noire_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_magie_noire_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_magie_noire_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_matis.png b/code/web/public_php/api/data/ryzom/interface/bk_matis.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_matis.png rename to code/web/public_php/api/data/ryzom/interface/bk_matis.png diff --git a/code/web/api/data/ryzom/interface/bk_matis_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_matis_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_matis_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_matis_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_mission.png b/code/web/public_php/api/data/ryzom/interface/bk_mission.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_mission.png rename to code/web/public_php/api/data/ryzom/interface/bk_mission.png diff --git a/code/web/api/data/ryzom/interface/bk_mission2.png b/code/web/public_php/api/data/ryzom/interface/bk_mission2.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_mission2.png rename to code/web/public_php/api/data/ryzom/interface/bk_mission2.png diff --git a/code/web/api/data/ryzom/interface/bk_outpost.png b/code/web/public_php/api/data/ryzom/interface/bk_outpost.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_outpost.png rename to code/web/public_php/api/data/ryzom/interface/bk_outpost.png diff --git a/code/web/api/data/ryzom/interface/bk_outpost_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_outpost_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_outpost_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_outpost_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_power.png b/code/web/public_php/api/data/ryzom/interface/bk_power.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_power.png rename to code/web/public_php/api/data/ryzom/interface/bk_power.png diff --git a/code/web/api/data/ryzom/interface/bk_primes.png b/code/web/public_php/api/data/ryzom/interface/bk_primes.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_primes.png rename to code/web/public_php/api/data/ryzom/interface/bk_primes.png diff --git a/code/web/api/data/ryzom/interface/bk_service.png b/code/web/public_php/api/data/ryzom/interface/bk_service.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_service.png rename to code/web/public_php/api/data/ryzom/interface/bk_service.png diff --git a/code/web/api/data/ryzom/interface/bk_training.png b/code/web/public_php/api/data/ryzom/interface/bk_training.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_training.png rename to code/web/public_php/api/data/ryzom/interface/bk_training.png diff --git a/code/web/api/data/ryzom/interface/bk_tryker.png b/code/web/public_php/api/data/ryzom/interface/bk_tryker.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_tryker.png rename to code/web/public_php/api/data/ryzom/interface/bk_tryker.png diff --git a/code/web/api/data/ryzom/interface/bk_tryker_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_tryker_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_tryker_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_tryker_brick.png diff --git a/code/web/api/data/ryzom/interface/bk_zorai.png b/code/web/public_php/api/data/ryzom/interface/bk_zorai.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_zorai.png rename to code/web/public_php/api/data/ryzom/interface/bk_zorai.png diff --git a/code/web/api/data/ryzom/interface/bk_zorai_brick.png b/code/web/public_php/api/data/ryzom/interface/bk_zorai_brick.png similarity index 100% rename from code/web/api/data/ryzom/interface/bk_zorai_brick.png rename to code/web/public_php/api/data/ryzom/interface/bk_zorai_brick.png diff --git a/code/web/api/data/ryzom/interface/brick_default.png b/code/web/public_php/api/data/ryzom/interface/brick_default.png similarity index 100% rename from code/web/api/data/ryzom/interface/brick_default.png rename to code/web/public_php/api/data/ryzom/interface/brick_default.png diff --git a/code/web/api/data/ryzom/interface/building_state_24x24.png b/code/web/public_php/api/data/ryzom/interface/building_state_24x24.png similarity index 100% rename from code/web/api/data/ryzom/interface/building_state_24x24.png rename to code/web/public_php/api/data/ryzom/interface/building_state_24x24.png diff --git a/code/web/api/data/ryzom/interface/cb_main_nue.png b/code/web/public_php/api/data/ryzom/interface/cb_main_nue.png similarity index 100% rename from code/web/api/data/ryzom/interface/cb_main_nue.png rename to code/web/public_php/api/data/ryzom/interface/cb_main_nue.png diff --git a/code/web/api/data/ryzom/interface/ch_back.png b/code/web/public_php/api/data/ryzom/interface/ch_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/ch_back.png rename to code/web/public_php/api/data/ryzom/interface/ch_back.png diff --git a/code/web/api/data/ryzom/interface/charge.png b/code/web/public_php/api/data/ryzom/interface/charge.png similarity index 100% rename from code/web/api/data/ryzom/interface/charge.png rename to code/web/public_php/api/data/ryzom/interface/charge.png diff --git a/code/web/api/data/ryzom/interface/clef.png b/code/web/public_php/api/data/ryzom/interface/clef.png similarity index 100% rename from code/web/api/data/ryzom/interface/clef.png rename to code/web/public_php/api/data/ryzom/interface/clef.png diff --git a/code/web/api/data/ryzom/interface/conso_branche.png b/code/web/public_php/api/data/ryzom/interface/conso_branche.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_branche.png rename to code/web/public_php/api/data/ryzom/interface/conso_branche.png diff --git a/code/web/api/data/ryzom/interface/conso_branche_mask.png b/code/web/public_php/api/data/ryzom/interface/conso_branche_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_branche_mask.png rename to code/web/public_php/api/data/ryzom/interface/conso_branche_mask.png diff --git a/code/web/api/data/ryzom/interface/conso_fleur.png b/code/web/public_php/api/data/ryzom/interface/conso_fleur.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_fleur.png rename to code/web/public_php/api/data/ryzom/interface/conso_fleur.png diff --git a/code/web/api/data/ryzom/interface/conso_fleur_mask.png b/code/web/public_php/api/data/ryzom/interface/conso_fleur_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_fleur_mask.png rename to code/web/public_php/api/data/ryzom/interface/conso_fleur_mask.png diff --git a/code/web/api/data/ryzom/interface/conso_grappe.png b/code/web/public_php/api/data/ryzom/interface/conso_grappe.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_grappe.png rename to code/web/public_php/api/data/ryzom/interface/conso_grappe.png diff --git a/code/web/api/data/ryzom/interface/conso_grappe_mask.png b/code/web/public_php/api/data/ryzom/interface/conso_grappe_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_grappe_mask.png rename to code/web/public_php/api/data/ryzom/interface/conso_grappe_mask.png diff --git a/code/web/api/data/ryzom/interface/conso_nectar.png b/code/web/public_php/api/data/ryzom/interface/conso_nectar.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_nectar.png rename to code/web/public_php/api/data/ryzom/interface/conso_nectar.png diff --git a/code/web/api/data/ryzom/interface/conso_nectar_mask.png b/code/web/public_php/api/data/ryzom/interface/conso_nectar_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/conso_nectar_mask.png rename to code/web/public_php/api/data/ryzom/interface/conso_nectar_mask.png diff --git a/code/web/api/data/ryzom/interface/construction.png b/code/web/public_php/api/data/ryzom/interface/construction.png similarity index 100% rename from code/web/api/data/ryzom/interface/construction.png rename to code/web/public_php/api/data/ryzom/interface/construction.png diff --git a/code/web/api/data/ryzom/interface/cp_back.png b/code/web/public_php/api/data/ryzom/interface/cp_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_back.png rename to code/web/public_php/api/data/ryzom/interface/cp_back.png diff --git a/code/web/api/data/ryzom/interface/cp_over_break.png b/code/web/public_php/api/data/ryzom/interface/cp_over_break.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_over_break.png rename to code/web/public_php/api/data/ryzom/interface/cp_over_break.png diff --git a/code/web/api/data/ryzom/interface/cp_over_less.png b/code/web/public_php/api/data/ryzom/interface/cp_over_less.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_over_less.png rename to code/web/public_php/api/data/ryzom/interface/cp_over_less.png diff --git a/code/web/api/data/ryzom/interface/cp_over_more.png b/code/web/public_php/api/data/ryzom/interface/cp_over_more.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_over_more.png rename to code/web/public_php/api/data/ryzom/interface/cp_over_more.png diff --git a/code/web/api/data/ryzom/interface/cp_over_opening.png b/code/web/public_php/api/data/ryzom/interface/cp_over_opening.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_over_opening.png rename to code/web/public_php/api/data/ryzom/interface/cp_over_opening.png diff --git a/code/web/api/data/ryzom/interface/cp_over_opening_2.png b/code/web/public_php/api/data/ryzom/interface/cp_over_opening_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/cp_over_opening_2.png rename to code/web/public_php/api/data/ryzom/interface/cp_over_opening_2.png diff --git a/code/web/api/data/ryzom/interface/cristal_ammo.png b/code/web/public_php/api/data/ryzom/interface/cristal_ammo.png similarity index 100% rename from code/web/api/data/ryzom/interface/cristal_ammo.png rename to code/web/public_php/api/data/ryzom/interface/cristal_ammo.png diff --git a/code/web/api/data/ryzom/interface/cristal_generic.png b/code/web/public_php/api/data/ryzom/interface/cristal_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/cristal_generic.png rename to code/web/public_php/api/data/ryzom/interface/cristal_generic.png diff --git a/code/web/api/data/ryzom/interface/cristal_spell.png b/code/web/public_php/api/data/ryzom/interface/cristal_spell.png similarity index 100% rename from code/web/api/data/ryzom/interface/cristal_spell.png rename to code/web/public_php/api/data/ryzom/interface/cristal_spell.png diff --git a/code/web/api/data/ryzom/interface/ef_back.png b/code/web/public_php/api/data/ryzom/interface/ef_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/ef_back.png rename to code/web/public_php/api/data/ryzom/interface/ef_back.png diff --git a/code/web/api/data/ryzom/interface/ef_over_break.png b/code/web/public_php/api/data/ryzom/interface/ef_over_break.png similarity index 100% rename from code/web/api/data/ryzom/interface/ef_over_break.png rename to code/web/public_php/api/data/ryzom/interface/ef_over_break.png diff --git a/code/web/api/data/ryzom/interface/ef_over_less.png b/code/web/public_php/api/data/ryzom/interface/ef_over_less.png similarity index 100% rename from code/web/api/data/ryzom/interface/ef_over_less.png rename to code/web/public_php/api/data/ryzom/interface/ef_over_less.png diff --git a/code/web/api/data/ryzom/interface/ef_over_more.png b/code/web/public_php/api/data/ryzom/interface/ef_over_more.png similarity index 100% rename from code/web/api/data/ryzom/interface/ef_over_more.png rename to code/web/public_php/api/data/ryzom/interface/ef_over_more.png diff --git a/code/web/api/data/ryzom/interface/fo_back.png b/code/web/public_php/api/data/ryzom/interface/fo_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/fo_back.png rename to code/web/public_php/api/data/ryzom/interface/fo_back.png diff --git a/code/web/api/data/ryzom/interface/fo_over.png b/code/web/public_php/api/data/ryzom/interface/fo_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/fo_over.png rename to code/web/public_php/api/data/ryzom/interface/fo_over.png diff --git a/code/web/api/data/ryzom/interface/fp_ammo.png b/code/web/public_php/api/data/ryzom/interface/fp_ammo.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_ammo.png rename to code/web/public_php/api/data/ryzom/interface/fp_ammo.png diff --git a/code/web/api/data/ryzom/interface/fp_armor.png b/code/web/public_php/api/data/ryzom/interface/fp_armor.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_armor.png rename to code/web/public_php/api/data/ryzom/interface/fp_armor.png diff --git a/code/web/api/data/ryzom/interface/fp_building.png b/code/web/public_php/api/data/ryzom/interface/fp_building.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_building.png rename to code/web/public_php/api/data/ryzom/interface/fp_building.png diff --git a/code/web/api/data/ryzom/interface/fp_jewel.png b/code/web/public_php/api/data/ryzom/interface/fp_jewel.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_jewel.png rename to code/web/public_php/api/data/ryzom/interface/fp_jewel.png diff --git a/code/web/api/data/ryzom/interface/fp_melee.png b/code/web/public_php/api/data/ryzom/interface/fp_melee.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_melee.png rename to code/web/public_php/api/data/ryzom/interface/fp_melee.png diff --git a/code/web/api/data/ryzom/interface/fp_over.png b/code/web/public_php/api/data/ryzom/interface/fp_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_over.png rename to code/web/public_php/api/data/ryzom/interface/fp_over.png diff --git a/code/web/api/data/ryzom/interface/fp_range.png b/code/web/public_php/api/data/ryzom/interface/fp_range.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_range.png rename to code/web/public_php/api/data/ryzom/interface/fp_range.png diff --git a/code/web/api/data/ryzom/interface/fp_shield.png b/code/web/public_php/api/data/ryzom/interface/fp_shield.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_shield.png rename to code/web/public_php/api/data/ryzom/interface/fp_shield.png diff --git a/code/web/api/data/ryzom/interface/fp_tools.png b/code/web/public_php/api/data/ryzom/interface/fp_tools.png similarity index 100% rename from code/web/api/data/ryzom/interface/fp_tools.png rename to code/web/public_php/api/data/ryzom/interface/fp_tools.png diff --git a/code/web/api/data/ryzom/interface/ge_mission_outpost_townhall.png b/code/web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png similarity index 100% rename from code/web/api/data/ryzom/interface/ge_mission_outpost_townhall.png rename to code/web/public_php/api/data/ryzom/interface/ge_mission_outpost_townhall.png diff --git a/code/web/api/data/ryzom/interface/ico_absorb_damage.png b/code/web/public_php/api/data/ryzom/interface/ico_absorb_damage.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_absorb_damage.png rename to code/web/public_php/api/data/ryzom/interface/ico_absorb_damage.png diff --git a/code/web/api/data/ryzom/interface/ico_accurate.png b/code/web/public_php/api/data/ryzom/interface/ico_accurate.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_accurate.png rename to code/web/public_php/api/data/ryzom/interface/ico_accurate.png diff --git a/code/web/api/data/ryzom/interface/ico_acid.png b/code/web/public_php/api/data/ryzom/interface/ico_acid.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_acid.png rename to code/web/public_php/api/data/ryzom/interface/ico_acid.png diff --git a/code/web/api/data/ryzom/interface/ico_aim.png b/code/web/public_php/api/data/ryzom/interface/ico_aim.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_bird_wings.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_bird_wings.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_bird_wings.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_flying_kitin_abdomen.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_arms.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_arms.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_arms.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_chest.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_chest.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_chest.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_feet.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_feet.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feet.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_feint.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_feint.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_feint.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_hands.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_hands.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_hands.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_head.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_head.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_head.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_homin_legs.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_homin_legs.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_homin_legs.png diff --git a/code/web/api/data/ryzom/interface/ico_aim_kitin_head.png b/code/web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_aim_kitin_head.png rename to code/web/public_php/api/data/ryzom/interface/ico_aim_kitin_head.png diff --git a/code/web/api/data/ryzom/interface/ico_amande.png b/code/web/public_php/api/data/ryzom/interface/ico_amande.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_amande.png rename to code/web/public_php/api/data/ryzom/interface/ico_amande.png diff --git a/code/web/api/data/ryzom/interface/ico_ammo_bullet.png b/code/web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_ammo_bullet.png rename to code/web/public_php/api/data/ryzom/interface/ico_ammo_bullet.png diff --git a/code/web/api/data/ryzom/interface/ico_ammo_jacket.png b/code/web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_ammo_jacket.png rename to code/web/public_php/api/data/ryzom/interface/ico_ammo_jacket.png diff --git a/code/web/api/data/ryzom/interface/ico_angle.png b/code/web/public_php/api/data/ryzom/interface/ico_angle.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_angle.png rename to code/web/public_php/api/data/ryzom/interface/ico_angle.png diff --git a/code/web/api/data/ryzom/interface/ico_anti_magic_shield.png b/code/web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_anti_magic_shield.png rename to code/web/public_php/api/data/ryzom/interface/ico_anti_magic_shield.png diff --git a/code/web/api/data/ryzom/interface/ico_armor.png b/code/web/public_php/api/data/ryzom/interface/ico_armor.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_clip.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_clip.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_clip.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_clip.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_heavy.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_heavy.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_heavy.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_heavy.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_kitin.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_kitin.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_kitin.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_kitin.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_light.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_light.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_light.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_light.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_medium.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_medium.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_medium.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_medium.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_penalty.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_penalty.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_penalty.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_penalty.png diff --git a/code/web/api/data/ryzom/interface/ico_armor_shell.png b/code/web/public_php/api/data/ryzom/interface/ico_armor_shell.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_armor_shell.png rename to code/web/public_php/api/data/ryzom/interface/ico_armor_shell.png diff --git a/code/web/api/data/ryzom/interface/ico_atys.png b/code/web/public_php/api/data/ryzom/interface/ico_atys.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_atys.png rename to code/web/public_php/api/data/ryzom/interface/ico_atys.png diff --git a/code/web/api/data/ryzom/interface/ico_atysian.png b/code/web/public_php/api/data/ryzom/interface/ico_atysian.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_atysian.png rename to code/web/public_php/api/data/ryzom/interface/ico_atysian.png diff --git a/code/web/api/data/ryzom/interface/ico_balance_hp.png b/code/web/public_php/api/data/ryzom/interface/ico_balance_hp.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_balance_hp.png rename to code/web/public_php/api/data/ryzom/interface/ico_balance_hp.png diff --git a/code/web/api/data/ryzom/interface/ico_barrel.png b/code/web/public_php/api/data/ryzom/interface/ico_barrel.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_barrel.png rename to code/web/public_php/api/data/ryzom/interface/ico_barrel.png diff --git a/code/web/api/data/ryzom/interface/ico_bash.png b/code/web/public_php/api/data/ryzom/interface/ico_bash.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_bash.png rename to code/web/public_php/api/data/ryzom/interface/ico_bash.png diff --git a/code/web/api/data/ryzom/interface/ico_berserk.png b/code/web/public_php/api/data/ryzom/interface/ico_berserk.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_berserk.png rename to code/web/public_php/api/data/ryzom/interface/ico_berserk.png diff --git a/code/web/api/data/ryzom/interface/ico_blade.png b/code/web/public_php/api/data/ryzom/interface/ico_blade.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_blade.png rename to code/web/public_php/api/data/ryzom/interface/ico_blade.png diff --git a/code/web/api/data/ryzom/interface/ico_bleeding.png b/code/web/public_php/api/data/ryzom/interface/ico_bleeding.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_bleeding.png rename to code/web/public_php/api/data/ryzom/interface/ico_bleeding.png diff --git a/code/web/api/data/ryzom/interface/ico_blind.png b/code/web/public_php/api/data/ryzom/interface/ico_blind.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_blind.png rename to code/web/public_php/api/data/ryzom/interface/ico_blind.png diff --git a/code/web/api/data/ryzom/interface/ico_blunt.png b/code/web/public_php/api/data/ryzom/interface/ico_blunt.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_blunt.png rename to code/web/public_php/api/data/ryzom/interface/ico_blunt.png diff --git a/code/web/api/data/ryzom/interface/ico_bomb.png b/code/web/public_php/api/data/ryzom/interface/ico_bomb.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_bomb.png rename to code/web/public_php/api/data/ryzom/interface/ico_bomb.png diff --git a/code/web/api/data/ryzom/interface/ico_cataliseur_xp.png b/code/web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_cataliseur_xp.png rename to code/web/public_php/api/data/ryzom/interface/ico_cataliseur_xp.png diff --git a/code/web/api/data/ryzom/interface/ico_celestial.png b/code/web/public_php/api/data/ryzom/interface/ico_celestial.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_celestial.png rename to code/web/public_php/api/data/ryzom/interface/ico_celestial.png diff --git a/code/web/api/data/ryzom/interface/ico_circular_attack.png b/code/web/public_php/api/data/ryzom/interface/ico_circular_attack.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_circular_attack.png rename to code/web/public_php/api/data/ryzom/interface/ico_circular_attack.png diff --git a/code/web/api/data/ryzom/interface/ico_clothes.png b/code/web/public_php/api/data/ryzom/interface/ico_clothes.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_clothes.png rename to code/web/public_php/api/data/ryzom/interface/ico_clothes.png diff --git a/code/web/api/data/ryzom/interface/ico_cold.png b/code/web/public_php/api/data/ryzom/interface/ico_cold.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_cold.png rename to code/web/public_php/api/data/ryzom/interface/ico_cold.png diff --git a/code/web/api/data/ryzom/interface/ico_concentration.png b/code/web/public_php/api/data/ryzom/interface/ico_concentration.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_concentration.png rename to code/web/public_php/api/data/ryzom/interface/ico_concentration.png diff --git a/code/web/api/data/ryzom/interface/ico_consommable_over.png b/code/web/public_php/api/data/ryzom/interface/ico_consommable_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_consommable_over.png rename to code/web/public_php/api/data/ryzom/interface/ico_consommable_over.png diff --git a/code/web/api/data/ryzom/interface/ico_constitution.png b/code/web/public_php/api/data/ryzom/interface/ico_constitution.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_constitution.png rename to code/web/public_php/api/data/ryzom/interface/ico_constitution.png diff --git a/code/web/api/data/ryzom/interface/ico_counterweight.png b/code/web/public_php/api/data/ryzom/interface/ico_counterweight.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_counterweight.png rename to code/web/public_php/api/data/ryzom/interface/ico_counterweight.png diff --git a/code/web/api/data/ryzom/interface/ico_craft_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_craft_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_craft_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_craft_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_create_sapload.png b/code/web/public_php/api/data/ryzom/interface/ico_create_sapload.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_create_sapload.png rename to code/web/public_php/api/data/ryzom/interface/ico_create_sapload.png diff --git a/code/web/api/data/ryzom/interface/ico_curse.png b/code/web/public_php/api/data/ryzom/interface/ico_curse.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_curse.png rename to code/web/public_php/api/data/ryzom/interface/ico_curse.png diff --git a/code/web/api/data/ryzom/interface/ico_debuff.png b/code/web/public_php/api/data/ryzom/interface/ico_debuff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_debuff.png rename to code/web/public_php/api/data/ryzom/interface/ico_debuff.png diff --git a/code/web/api/data/ryzom/interface/ico_debuff_resist.png b/code/web/public_php/api/data/ryzom/interface/ico_debuff_resist.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_debuff_resist.png rename to code/web/public_php/api/data/ryzom/interface/ico_debuff_resist.png diff --git a/code/web/api/data/ryzom/interface/ico_debuff_skill.png b/code/web/public_php/api/data/ryzom/interface/ico_debuff_skill.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_debuff_skill.png rename to code/web/public_php/api/data/ryzom/interface/ico_debuff_skill.png diff --git a/code/web/api/data/ryzom/interface/ico_desert.png b/code/web/public_php/api/data/ryzom/interface/ico_desert.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_desert.png rename to code/web/public_php/api/data/ryzom/interface/ico_desert.png diff --git a/code/web/api/data/ryzom/interface/ico_dexterity.png b/code/web/public_php/api/data/ryzom/interface/ico_dexterity.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_dexterity.png rename to code/web/public_php/api/data/ryzom/interface/ico_dexterity.png diff --git a/code/web/api/data/ryzom/interface/ico_disarm.png b/code/web/public_php/api/data/ryzom/interface/ico_disarm.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_disarm.png rename to code/web/public_php/api/data/ryzom/interface/ico_disarm.png diff --git a/code/web/api/data/ryzom/interface/ico_dodge.png b/code/web/public_php/api/data/ryzom/interface/ico_dodge.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_dodge.png rename to code/web/public_php/api/data/ryzom/interface/ico_dodge.png diff --git a/code/web/api/data/ryzom/interface/ico_dot.png b/code/web/public_php/api/data/ryzom/interface/ico_dot.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_dot.png rename to code/web/public_php/api/data/ryzom/interface/ico_dot.png diff --git a/code/web/api/data/ryzom/interface/ico_durability.png b/code/web/public_php/api/data/ryzom/interface/ico_durability.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_durability.png rename to code/web/public_php/api/data/ryzom/interface/ico_durability.png diff --git a/code/web/api/data/ryzom/interface/ico_electric.png b/code/web/public_php/api/data/ryzom/interface/ico_electric.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_electric.png rename to code/web/public_php/api/data/ryzom/interface/ico_electric.png diff --git a/code/web/api/data/ryzom/interface/ico_explosif.png b/code/web/public_php/api/data/ryzom/interface/ico_explosif.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_explosif.png rename to code/web/public_php/api/data/ryzom/interface/ico_explosif.png diff --git a/code/web/api/data/ryzom/interface/ico_extracting.png b/code/web/public_php/api/data/ryzom/interface/ico_extracting.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_extracting.png rename to code/web/public_php/api/data/ryzom/interface/ico_extracting.png diff --git a/code/web/api/data/ryzom/interface/ico_fear.png b/code/web/public_php/api/data/ryzom/interface/ico_fear.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fear.png rename to code/web/public_php/api/data/ryzom/interface/ico_fear.png diff --git a/code/web/api/data/ryzom/interface/ico_feint.png b/code/web/public_php/api/data/ryzom/interface/ico_feint.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_feint.png rename to code/web/public_php/api/data/ryzom/interface/ico_feint.png diff --git a/code/web/api/data/ryzom/interface/ico_fire.png b/code/web/public_php/api/data/ryzom/interface/ico_fire.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fire.png rename to code/web/public_php/api/data/ryzom/interface/ico_fire.png diff --git a/code/web/api/data/ryzom/interface/ico_firing_pin.png b/code/web/public_php/api/data/ryzom/interface/ico_firing_pin.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_firing_pin.png rename to code/web/public_php/api/data/ryzom/interface/ico_firing_pin.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_1.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_1.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_1_mask.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_1_mask.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_1_mask.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_2.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_2.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_2_mask.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_2_mask.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_2_mask.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_3.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_3.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3.png diff --git a/code/web/api/data/ryzom/interface/ico_fleur_carac_3_mask.png b/code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_fleur_carac_3_mask.png rename to code/web/public_php/api/data/ryzom/interface/ico_fleur_carac_3_mask.png diff --git a/code/web/api/data/ryzom/interface/ico_focus.png b/code/web/public_php/api/data/ryzom/interface/ico_focus.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_focus.png rename to code/web/public_php/api/data/ryzom/interface/ico_focus.png diff --git a/code/web/api/data/ryzom/interface/ico_forage_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_forage_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_forage_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_forage_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_forbid_item.png b/code/web/public_php/api/data/ryzom/interface/ico_forbid_item.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_forbid_item.png rename to code/web/public_php/api/data/ryzom/interface/ico_forbid_item.png diff --git a/code/web/api/data/ryzom/interface/ico_forest.png b/code/web/public_php/api/data/ryzom/interface/ico_forest.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_forest.png rename to code/web/public_php/api/data/ryzom/interface/ico_forest.png diff --git a/code/web/api/data/ryzom/interface/ico_foreuse.png b/code/web/public_php/api/data/ryzom/interface/ico_foreuse.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_foreuse.png rename to code/web/public_php/api/data/ryzom/interface/ico_foreuse.png diff --git a/code/web/api/data/ryzom/interface/ico_gardening.png b/code/web/public_php/api/data/ryzom/interface/ico_gardening.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_gardening.png rename to code/web/public_php/api/data/ryzom/interface/ico_gardening.png diff --git a/code/web/api/data/ryzom/interface/ico_gentle.png b/code/web/public_php/api/data/ryzom/interface/ico_gentle.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_gentle.png rename to code/web/public_php/api/data/ryzom/interface/ico_gentle.png diff --git a/code/web/api/data/ryzom/interface/ico_goo.png b/code/web/public_php/api/data/ryzom/interface/ico_goo.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_goo.png rename to code/web/public_php/api/data/ryzom/interface/ico_goo.png diff --git a/code/web/api/data/ryzom/interface/ico_gripp.png b/code/web/public_php/api/data/ryzom/interface/ico_gripp.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_gripp.png rename to code/web/public_php/api/data/ryzom/interface/ico_gripp.png diff --git a/code/web/api/data/ryzom/interface/ico_haircolor.png b/code/web/public_php/api/data/ryzom/interface/ico_haircolor.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_haircolor.png rename to code/web/public_php/api/data/ryzom/interface/ico_haircolor.png diff --git a/code/web/api/data/ryzom/interface/ico_haircut.png b/code/web/public_php/api/data/ryzom/interface/ico_haircut.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_haircut.png rename to code/web/public_php/api/data/ryzom/interface/ico_haircut.png diff --git a/code/web/api/data/ryzom/interface/ico_hammer.png b/code/web/public_php/api/data/ryzom/interface/ico_hammer.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_hammer.png rename to code/web/public_php/api/data/ryzom/interface/ico_hammer.png diff --git a/code/web/api/data/ryzom/interface/ico_harmful.png b/code/web/public_php/api/data/ryzom/interface/ico_harmful.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_harmful.png rename to code/web/public_php/api/data/ryzom/interface/ico_harmful.png diff --git a/code/web/api/data/ryzom/interface/ico_hatred.png b/code/web/public_php/api/data/ryzom/interface/ico_hatred.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_hatred.png rename to code/web/public_php/api/data/ryzom/interface/ico_hatred.png diff --git a/code/web/api/data/ryzom/interface/ico_heal.png b/code/web/public_php/api/data/ryzom/interface/ico_heal.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_heal.png rename to code/web/public_php/api/data/ryzom/interface/ico_heal.png diff --git a/code/web/api/data/ryzom/interface/ico_hit_rate.png b/code/web/public_php/api/data/ryzom/interface/ico_hit_rate.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_hit_rate.png rename to code/web/public_php/api/data/ryzom/interface/ico_hit_rate.png diff --git a/code/web/api/data/ryzom/interface/ico_incapacity.png b/code/web/public_php/api/data/ryzom/interface/ico_incapacity.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_incapacity.png rename to code/web/public_php/api/data/ryzom/interface/ico_incapacity.png diff --git a/code/web/api/data/ryzom/interface/ico_intelligence.png b/code/web/public_php/api/data/ryzom/interface/ico_intelligence.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_intelligence.png rename to code/web/public_php/api/data/ryzom/interface/ico_intelligence.png diff --git a/code/web/api/data/ryzom/interface/ico_interrupt.png b/code/web/public_php/api/data/ryzom/interface/ico_interrupt.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_interrupt.png rename to code/web/public_php/api/data/ryzom/interface/ico_interrupt.png diff --git a/code/web/api/data/ryzom/interface/ico_invulnerability.png b/code/web/public_php/api/data/ryzom/interface/ico_invulnerability.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_invulnerability.png rename to code/web/public_php/api/data/ryzom/interface/ico_invulnerability.png diff --git a/code/web/api/data/ryzom/interface/ico_jewel_stone.png b/code/web/public_php/api/data/ryzom/interface/ico_jewel_stone.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_jewel_stone.png rename to code/web/public_php/api/data/ryzom/interface/ico_jewel_stone.png diff --git a/code/web/api/data/ryzom/interface/ico_jewel_stone_support.png b/code/web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_jewel_stone_support.png rename to code/web/public_php/api/data/ryzom/interface/ico_jewel_stone_support.png diff --git a/code/web/api/data/ryzom/interface/ico_jungle.png b/code/web/public_php/api/data/ryzom/interface/ico_jungle.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_jungle.png rename to code/web/public_php/api/data/ryzom/interface/ico_jungle.png diff --git a/code/web/api/data/ryzom/interface/ico_lacustre.png b/code/web/public_php/api/data/ryzom/interface/ico_lacustre.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_lacustre.png rename to code/web/public_php/api/data/ryzom/interface/ico_lacustre.png diff --git a/code/web/api/data/ryzom/interface/ico_landmark_bonus.png b/code/web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_landmark_bonus.png rename to code/web/public_php/api/data/ryzom/interface/ico_landmark_bonus.png diff --git a/code/web/api/data/ryzom/interface/ico_level.png b/code/web/public_php/api/data/ryzom/interface/ico_level.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_level.png rename to code/web/public_php/api/data/ryzom/interface/ico_level.png diff --git a/code/web/api/data/ryzom/interface/ico_lining.png b/code/web/public_php/api/data/ryzom/interface/ico_lining.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_lining.png rename to code/web/public_php/api/data/ryzom/interface/ico_lining.png diff --git a/code/web/api/data/ryzom/interface/ico_location.png b/code/web/public_php/api/data/ryzom/interface/ico_location.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_location.png rename to code/web/public_php/api/data/ryzom/interface/ico_location.png diff --git a/code/web/api/data/ryzom/interface/ico_madness.png b/code/web/public_php/api/data/ryzom/interface/ico_madness.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_madness.png rename to code/web/public_php/api/data/ryzom/interface/ico_madness.png diff --git a/code/web/api/data/ryzom/interface/ico_magic.png b/code/web/public_php/api/data/ryzom/interface/ico_magic.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_magic.png rename to code/web/public_php/api/data/ryzom/interface/ico_magic.png diff --git a/code/web/api/data/ryzom/interface/ico_magic_action_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_magic_action_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_magic_action_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_magic_focus.png b/code/web/public_php/api/data/ryzom/interface/ico_magic_focus.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_magic_focus.png rename to code/web/public_php/api/data/ryzom/interface/ico_magic_focus.png diff --git a/code/web/api/data/ryzom/interface/ico_magic_target_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_magic_target_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_magic_target_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_melee_action_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_melee_action_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_melee_action_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_melee_target_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_melee_target_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_melee_target_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_mental.png b/code/web/public_php/api/data/ryzom/interface/ico_mental.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mental.png rename to code/web/public_php/api/data/ryzom/interface/ico_mental.png diff --git a/code/web/api/data/ryzom/interface/ico_metabolism.png b/code/web/public_php/api/data/ryzom/interface/ico_metabolism.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_metabolism.png rename to code/web/public_php/api/data/ryzom/interface/ico_metabolism.png diff --git a/code/web/api/data/ryzom/interface/ico_mezz.png b/code/web/public_php/api/data/ryzom/interface/ico_mezz.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mezz.png rename to code/web/public_php/api/data/ryzom/interface/ico_mezz.png diff --git a/code/web/api/data/ryzom/interface/ico_misfortune.png b/code/web/public_php/api/data/ryzom/interface/ico_misfortune.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_misfortune.png rename to code/web/public_php/api/data/ryzom/interface/ico_misfortune.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_art_fyros.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_art_fyros.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_art_fyros.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_art_matis.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_art_matis.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_art_matis.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_art_tryker.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_art_tryker.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_art_tryker.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_art_zorai.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_art_zorai.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_art_zorai.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_barrel.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_barrel.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_barrel.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_barrel.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_bottle.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_bottle.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_bottle.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_bottle.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_casket.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_casket.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_casket.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_casket.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_medicine.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_medicine.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_medicine.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_medicine.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_message.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_message.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_message.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_message.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_package.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_package.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_package.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_package.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_pot.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_pot.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_pot.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_pot.png diff --git a/code/web/api/data/ryzom/interface/ico_mission_purse.png b/code/web/public_php/api/data/ryzom/interface/ico_mission_purse.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_mission_purse.png rename to code/web/public_php/api/data/ryzom/interface/ico_mission_purse.png diff --git a/code/web/api/data/ryzom/interface/ico_move.png b/code/web/public_php/api/data/ryzom/interface/ico_move.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_move.png rename to code/web/public_php/api/data/ryzom/interface/ico_move.png diff --git a/code/web/api/data/ryzom/interface/ico_multi_fight.png b/code/web/public_php/api/data/ryzom/interface/ico_multi_fight.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_multi_fight.png rename to code/web/public_php/api/data/ryzom/interface/ico_multi_fight.png diff --git a/code/web/api/data/ryzom/interface/ico_multiple_spots.png b/code/web/public_php/api/data/ryzom/interface/ico_multiple_spots.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_multiple_spots.png rename to code/web/public_php/api/data/ryzom/interface/ico_multiple_spots.png diff --git a/code/web/api/data/ryzom/interface/ico_noix.png b/code/web/public_php/api/data/ryzom/interface/ico_noix.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_noix.png rename to code/web/public_php/api/data/ryzom/interface/ico_noix.png diff --git a/code/web/api/data/ryzom/interface/ico_opening_hit.png b/code/web/public_php/api/data/ryzom/interface/ico_opening_hit.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_opening_hit.png rename to code/web/public_php/api/data/ryzom/interface/ico_opening_hit.png diff --git a/code/web/api/data/ryzom/interface/ico_over_autumn.png b/code/web/public_php/api/data/ryzom/interface/ico_over_autumn.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_autumn.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_autumn.png diff --git a/code/web/api/data/ryzom/interface/ico_over_degenerated.png b/code/web/public_php/api/data/ryzom/interface/ico_over_degenerated.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_degenerated.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_degenerated.png diff --git a/code/web/api/data/ryzom/interface/ico_over_fauna.png b/code/web/public_php/api/data/ryzom/interface/ico_over_fauna.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_fauna.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_fauna.png diff --git a/code/web/api/data/ryzom/interface/ico_over_flora.png b/code/web/public_php/api/data/ryzom/interface/ico_over_flora.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_flora.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_flora.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_arms.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_arms.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_arms.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_chest.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_chest.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_chest.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_feet.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_feet.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_feet_hands.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_feet_hands.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_hands.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_feet_head.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_feet_head.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_head.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_feet_x2.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_feet_x2.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_feet_x2.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_feint_x3.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_feint_x3.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_feint_x3.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_hands.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_hands.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_hands_chest.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_hands_chest.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_chest.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_hands_head.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_hands_head.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_hands_head.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_head.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_head.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_head.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_head.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_head_x3.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_head_x3.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_head_x3.png diff --git a/code/web/api/data/ryzom/interface/ico_over_hit_legs.png b/code/web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_hit_legs.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_hit_legs.png diff --git a/code/web/api/data/ryzom/interface/ico_over_homin.png b/code/web/public_php/api/data/ryzom/interface/ico_over_homin.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_homin.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_homin.png diff --git a/code/web/api/data/ryzom/interface/ico_over_kitin.png b/code/web/public_php/api/data/ryzom/interface/ico_over_kitin.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_kitin.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_kitin.png diff --git a/code/web/api/data/ryzom/interface/ico_over_magic.png b/code/web/public_php/api/data/ryzom/interface/ico_over_magic.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_magic.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_magic.png diff --git a/code/web/api/data/ryzom/interface/ico_over_melee.png b/code/web/public_php/api/data/ryzom/interface/ico_over_melee.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_melee.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_melee.png diff --git a/code/web/api/data/ryzom/interface/ico_over_racial.png b/code/web/public_php/api/data/ryzom/interface/ico_over_racial.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_racial.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_racial.png diff --git a/code/web/api/data/ryzom/interface/ico_over_range.png b/code/web/public_php/api/data/ryzom/interface/ico_over_range.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_range.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_range.png diff --git a/code/web/api/data/ryzom/interface/ico_over_special.png b/code/web/public_php/api/data/ryzom/interface/ico_over_special.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_special.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_special.png diff --git a/code/web/api/data/ryzom/interface/ico_over_spring.png b/code/web/public_php/api/data/ryzom/interface/ico_over_spring.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_spring.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_spring.png diff --git a/code/web/api/data/ryzom/interface/ico_over_summer.png b/code/web/public_php/api/data/ryzom/interface/ico_over_summer.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_summer.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_summer.png diff --git a/code/web/api/data/ryzom/interface/ico_over_winter.png b/code/web/public_php/api/data/ryzom/interface/ico_over_winter.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_over_winter.png rename to code/web/public_php/api/data/ryzom/interface/ico_over_winter.png diff --git a/code/web/api/data/ryzom/interface/ico_parry.png b/code/web/public_php/api/data/ryzom/interface/ico_parry.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_parry.png rename to code/web/public_php/api/data/ryzom/interface/ico_parry.png diff --git a/code/web/api/data/ryzom/interface/ico_piercing.png b/code/web/public_php/api/data/ryzom/interface/ico_piercing.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_piercing.png rename to code/web/public_php/api/data/ryzom/interface/ico_piercing.png diff --git a/code/web/api/data/ryzom/interface/ico_pointe.png b/code/web/public_php/api/data/ryzom/interface/ico_pointe.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_pointe.png rename to code/web/public_php/api/data/ryzom/interface/ico_pointe.png diff --git a/code/web/api/data/ryzom/interface/ico_poison.png b/code/web/public_php/api/data/ryzom/interface/ico_poison.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_poison.png rename to code/web/public_php/api/data/ryzom/interface/ico_poison.png diff --git a/code/web/api/data/ryzom/interface/ico_power.png b/code/web/public_php/api/data/ryzom/interface/ico_power.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_power.png rename to code/web/public_php/api/data/ryzom/interface/ico_power.png diff --git a/code/web/api/data/ryzom/interface/ico_preservation.png b/code/web/public_php/api/data/ryzom/interface/ico_preservation.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_preservation.png rename to code/web/public_php/api/data/ryzom/interface/ico_preservation.png diff --git a/code/web/api/data/ryzom/interface/ico_primal.png b/code/web/public_php/api/data/ryzom/interface/ico_primal.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_primal.png rename to code/web/public_php/api/data/ryzom/interface/ico_primal.png diff --git a/code/web/api/data/ryzom/interface/ico_prime_roots.png b/code/web/public_php/api/data/ryzom/interface/ico_prime_roots.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_prime_roots.png rename to code/web/public_php/api/data/ryzom/interface/ico_prime_roots.png diff --git a/code/web/api/data/ryzom/interface/ico_private.png b/code/web/public_php/api/data/ryzom/interface/ico_private.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_private.png rename to code/web/public_php/api/data/ryzom/interface/ico_private.png diff --git a/code/web/api/data/ryzom/interface/ico_prospecting.png b/code/web/public_php/api/data/ryzom/interface/ico_prospecting.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_prospecting.png rename to code/web/public_php/api/data/ryzom/interface/ico_prospecting.png diff --git a/code/web/api/data/ryzom/interface/ico_quality.png b/code/web/public_php/api/data/ryzom/interface/ico_quality.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_quality.png rename to code/web/public_php/api/data/ryzom/interface/ico_quality.png diff --git a/code/web/api/data/ryzom/interface/ico_racine.png b/code/web/public_php/api/data/ryzom/interface/ico_racine.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_racine.png rename to code/web/public_php/api/data/ryzom/interface/ico_racine.png diff --git a/code/web/api/data/ryzom/interface/ico_range.png b/code/web/public_php/api/data/ryzom/interface/ico_range.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_range.png rename to code/web/public_php/api/data/ryzom/interface/ico_range.png diff --git a/code/web/api/data/ryzom/interface/ico_range_action_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_range_action_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_range_action_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_range_action_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_range_target_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_range_target_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_range_target_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_range_target_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_ricochet.png b/code/web/public_php/api/data/ryzom/interface/ico_ricochet.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_ricochet.png rename to code/web/public_php/api/data/ryzom/interface/ico_ricochet.png diff --git a/code/web/api/data/ryzom/interface/ico_root.png b/code/web/public_php/api/data/ryzom/interface/ico_root.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_root.png rename to code/web/public_php/api/data/ryzom/interface/ico_root.png diff --git a/code/web/api/data/ryzom/interface/ico_rot.png b/code/web/public_php/api/data/ryzom/interface/ico_rot.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_rot.png rename to code/web/public_php/api/data/ryzom/interface/ico_rot.png diff --git a/code/web/api/data/ryzom/interface/ico_safe.png b/code/web/public_php/api/data/ryzom/interface/ico_safe.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_safe.png rename to code/web/public_php/api/data/ryzom/interface/ico_safe.png diff --git a/code/web/api/data/ryzom/interface/ico_sap.png b/code/web/public_php/api/data/ryzom/interface/ico_sap.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_sap.png rename to code/web/public_php/api/data/ryzom/interface/ico_sap.png diff --git a/code/web/api/data/ryzom/interface/ico_self_damage.png b/code/web/public_php/api/data/ryzom/interface/ico_self_damage.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_self_damage.png rename to code/web/public_php/api/data/ryzom/interface/ico_self_damage.png diff --git a/code/web/api/data/ryzom/interface/ico_shaft.png b/code/web/public_php/api/data/ryzom/interface/ico_shaft.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_shaft.png rename to code/web/public_php/api/data/ryzom/interface/ico_shaft.png diff --git a/code/web/api/data/ryzom/interface/ico_shield_buff.png b/code/web/public_php/api/data/ryzom/interface/ico_shield_buff.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_shield_buff.png rename to code/web/public_php/api/data/ryzom/interface/ico_shield_buff.png diff --git a/code/web/api/data/ryzom/interface/ico_shield_up.png b/code/web/public_php/api/data/ryzom/interface/ico_shield_up.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_shield_up.png rename to code/web/public_php/api/data/ryzom/interface/ico_shield_up.png diff --git a/code/web/api/data/ryzom/interface/ico_shielding.png b/code/web/public_php/api/data/ryzom/interface/ico_shielding.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_shielding.png rename to code/web/public_php/api/data/ryzom/interface/ico_shielding.png diff --git a/code/web/api/data/ryzom/interface/ico_shockwave.png b/code/web/public_php/api/data/ryzom/interface/ico_shockwave.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_shockwave.png rename to code/web/public_php/api/data/ryzom/interface/ico_shockwave.png diff --git a/code/web/api/data/ryzom/interface/ico_sickness.png b/code/web/public_php/api/data/ryzom/interface/ico_sickness.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_sickness.png rename to code/web/public_php/api/data/ryzom/interface/ico_sickness.png diff --git a/code/web/api/data/ryzom/interface/ico_slashing.png b/code/web/public_php/api/data/ryzom/interface/ico_slashing.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_slashing.png rename to code/web/public_php/api/data/ryzom/interface/ico_slashing.png diff --git a/code/web/api/data/ryzom/interface/ico_slow.png b/code/web/public_php/api/data/ryzom/interface/ico_slow.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_slow.png rename to code/web/public_php/api/data/ryzom/interface/ico_slow.png diff --git a/code/web/api/data/ryzom/interface/ico_soft_spot.png b/code/web/public_php/api/data/ryzom/interface/ico_soft_spot.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_soft_spot.png rename to code/web/public_php/api/data/ryzom/interface/ico_soft_spot.png diff --git a/code/web/api/data/ryzom/interface/ico_source_knowledge.png b/code/web/public_php/api/data/ryzom/interface/ico_source_knowledge.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_source_knowledge.png rename to code/web/public_php/api/data/ryzom/interface/ico_source_knowledge.png diff --git a/code/web/api/data/ryzom/interface/ico_source_time.png b/code/web/public_php/api/data/ryzom/interface/ico_source_time.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_source_time.png rename to code/web/public_php/api/data/ryzom/interface/ico_source_time.png diff --git a/code/web/api/data/ryzom/interface/ico_speed.png b/code/web/public_php/api/data/ryzom/interface/ico_speed.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_speed.png rename to code/web/public_php/api/data/ryzom/interface/ico_speed.png diff --git a/code/web/api/data/ryzom/interface/ico_speeding_up.png b/code/web/public_php/api/data/ryzom/interface/ico_speeding_up.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_speeding_up.png rename to code/web/public_php/api/data/ryzom/interface/ico_speeding_up.png diff --git a/code/web/api/data/ryzom/interface/ico_spell_break.png b/code/web/public_php/api/data/ryzom/interface/ico_spell_break.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_spell_break.png rename to code/web/public_php/api/data/ryzom/interface/ico_spell_break.png diff --git a/code/web/api/data/ryzom/interface/ico_spores.png b/code/web/public_php/api/data/ryzom/interface/ico_spores.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_spores.png rename to code/web/public_php/api/data/ryzom/interface/ico_spores.png diff --git a/code/web/api/data/ryzom/interface/ico_spray.png b/code/web/public_php/api/data/ryzom/interface/ico_spray.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_spray.png rename to code/web/public_php/api/data/ryzom/interface/ico_spray.png diff --git a/code/web/api/data/ryzom/interface/ico_spying.png b/code/web/public_php/api/data/ryzom/interface/ico_spying.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_spying.png rename to code/web/public_php/api/data/ryzom/interface/ico_spying.png diff --git a/code/web/api/data/ryzom/interface/ico_stamina.png b/code/web/public_php/api/data/ryzom/interface/ico_stamina.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_stamina.png rename to code/web/public_php/api/data/ryzom/interface/ico_stamina.png diff --git a/code/web/api/data/ryzom/interface/ico_strength.png b/code/web/public_php/api/data/ryzom/interface/ico_strength.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_strength.png rename to code/web/public_php/api/data/ryzom/interface/ico_strength.png diff --git a/code/web/api/data/ryzom/interface/ico_stuffing.png b/code/web/public_php/api/data/ryzom/interface/ico_stuffing.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_stuffing.png rename to code/web/public_php/api/data/ryzom/interface/ico_stuffing.png diff --git a/code/web/api/data/ryzom/interface/ico_stunn.png b/code/web/public_php/api/data/ryzom/interface/ico_stunn.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_stunn.png rename to code/web/public_php/api/data/ryzom/interface/ico_stunn.png diff --git a/code/web/api/data/ryzom/interface/ico_task_craft.png b/code/web/public_php/api/data/ryzom/interface/ico_task_craft.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_craft.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_craft.png diff --git a/code/web/api/data/ryzom/interface/ico_task_done.png b/code/web/public_php/api/data/ryzom/interface/ico_task_done.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_done.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_done.png diff --git a/code/web/api/data/ryzom/interface/ico_task_failed.png b/code/web/public_php/api/data/ryzom/interface/ico_task_failed.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_failed.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_failed.png diff --git a/code/web/api/data/ryzom/interface/ico_task_fight.png b/code/web/public_php/api/data/ryzom/interface/ico_task_fight.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_fight.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_fight.png diff --git a/code/web/api/data/ryzom/interface/ico_task_forage.png b/code/web/public_php/api/data/ryzom/interface/ico_task_forage.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_forage.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_forage.png diff --git a/code/web/api/data/ryzom/interface/ico_task_generic.png b/code/web/public_php/api/data/ryzom/interface/ico_task_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_generic.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_generic.png diff --git a/code/web/api/data/ryzom/interface/ico_task_generic_quart.png b/code/web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_generic_quart.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_generic_quart.png diff --git a/code/web/api/data/ryzom/interface/ico_task_guild.png b/code/web/public_php/api/data/ryzom/interface/ico_task_guild.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_guild.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_guild.png diff --git a/code/web/api/data/ryzom/interface/ico_task_rite.png b/code/web/public_php/api/data/ryzom/interface/ico_task_rite.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_rite.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_rite.png diff --git a/code/web/api/data/ryzom/interface/ico_task_travel.png b/code/web/public_php/api/data/ryzom/interface/ico_task_travel.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_task_travel.png rename to code/web/public_php/api/data/ryzom/interface/ico_task_travel.png diff --git a/code/web/api/data/ryzom/interface/ico_tatoo.png b/code/web/public_php/api/data/ryzom/interface/ico_tatoo.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_tatoo.png rename to code/web/public_php/api/data/ryzom/interface/ico_tatoo.png diff --git a/code/web/api/data/ryzom/interface/ico_taunt.png b/code/web/public_php/api/data/ryzom/interface/ico_taunt.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_taunt.png rename to code/web/public_php/api/data/ryzom/interface/ico_taunt.png diff --git a/code/web/api/data/ryzom/interface/ico_time.png b/code/web/public_php/api/data/ryzom/interface/ico_time.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_time.png rename to code/web/public_php/api/data/ryzom/interface/ico_time.png diff --git a/code/web/api/data/ryzom/interface/ico_time_bonus.png b/code/web/public_php/api/data/ryzom/interface/ico_time_bonus.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_time_bonus.png rename to code/web/public_php/api/data/ryzom/interface/ico_time_bonus.png diff --git a/code/web/api/data/ryzom/interface/ico_tourbe.png b/code/web/public_php/api/data/ryzom/interface/ico_tourbe.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_tourbe.png rename to code/web/public_php/api/data/ryzom/interface/ico_tourbe.png diff --git a/code/web/api/data/ryzom/interface/ico_trigger.png b/code/web/public_php/api/data/ryzom/interface/ico_trigger.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_trigger.png rename to code/web/public_php/api/data/ryzom/interface/ico_trigger.png diff --git a/code/web/api/data/ryzom/interface/ico_umbrella.png b/code/web/public_php/api/data/ryzom/interface/ico_umbrella.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_umbrella.png rename to code/web/public_php/api/data/ryzom/interface/ico_umbrella.png diff --git a/code/web/api/data/ryzom/interface/ico_use_enchantement.png b/code/web/public_php/api/data/ryzom/interface/ico_use_enchantement.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_use_enchantement.png rename to code/web/public_php/api/data/ryzom/interface/ico_use_enchantement.png diff --git a/code/web/api/data/ryzom/interface/ico_vampire.png b/code/web/public_php/api/data/ryzom/interface/ico_vampire.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_vampire.png rename to code/web/public_php/api/data/ryzom/interface/ico_vampire.png diff --git a/code/web/api/data/ryzom/interface/ico_visibility.png b/code/web/public_php/api/data/ryzom/interface/ico_visibility.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_visibility.png rename to code/web/public_php/api/data/ryzom/interface/ico_visibility.png diff --git a/code/web/api/data/ryzom/interface/ico_war_cry.png b/code/web/public_php/api/data/ryzom/interface/ico_war_cry.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_war_cry.png rename to code/web/public_php/api/data/ryzom/interface/ico_war_cry.png diff --git a/code/web/api/data/ryzom/interface/ico_weight.png b/code/web/public_php/api/data/ryzom/interface/ico_weight.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_weight.png rename to code/web/public_php/api/data/ryzom/interface/ico_weight.png diff --git a/code/web/api/data/ryzom/interface/ico_wellbalanced.png b/code/web/public_php/api/data/ryzom/interface/ico_wellbalanced.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_wellbalanced.png rename to code/web/public_php/api/data/ryzom/interface/ico_wellbalanced.png diff --git a/code/web/api/data/ryzom/interface/ico_will.png b/code/web/public_php/api/data/ryzom/interface/ico_will.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_will.png rename to code/web/public_php/api/data/ryzom/interface/ico_will.png diff --git a/code/web/api/data/ryzom/interface/ico_windding.png b/code/web/public_php/api/data/ryzom/interface/ico_windding.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_windding.png rename to code/web/public_php/api/data/ryzom/interface/ico_windding.png diff --git a/code/web/api/data/ryzom/interface/ico_wisdom.png b/code/web/public_php/api/data/ryzom/interface/ico_wisdom.png similarity index 100% rename from code/web/api/data/ryzom/interface/ico_wisdom.png rename to code/web/public_php/api/data/ryzom/interface/ico_wisdom.png diff --git a/code/web/api/data/ryzom/interface/improved_tool.png b/code/web/public_php/api/data/ryzom/interface/improved_tool.png similarity index 100% rename from code/web/api/data/ryzom/interface/improved_tool.png rename to code/web/public_php/api/data/ryzom/interface/improved_tool.png diff --git a/code/web/api/data/ryzom/interface/item_default.png b/code/web/public_php/api/data/ryzom/interface/item_default.png similarity index 100% rename from code/web/api/data/ryzom/interface/item_default.png rename to code/web/public_php/api/data/ryzom/interface/item_default.png diff --git a/code/web/api/data/ryzom/interface/item_plan_over.png b/code/web/public_php/api/data/ryzom/interface/item_plan_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/item_plan_over.png rename to code/web/public_php/api/data/ryzom/interface/item_plan_over.png diff --git a/code/web/api/data/ryzom/interface/lucky_flower.png b/code/web/public_php/api/data/ryzom/interface/lucky_flower.png similarity index 100% rename from code/web/api/data/ryzom/interface/lucky_flower.png rename to code/web/public_php/api/data/ryzom/interface/lucky_flower.png diff --git a/code/web/api/data/ryzom/interface/mail.png b/code/web/public_php/api/data/ryzom/interface/mail.png similarity index 100% rename from code/web/api/data/ryzom/interface/mail.png rename to code/web/public_php/api/data/ryzom/interface/mail.png diff --git a/code/web/api/data/ryzom/interface/mektoub_pack.png b/code/web/public_php/api/data/ryzom/interface/mektoub_pack.png similarity index 100% rename from code/web/api/data/ryzom/interface/mektoub_pack.png rename to code/web/public_php/api/data/ryzom/interface/mektoub_pack.png diff --git a/code/web/api/data/ryzom/interface/mektoub_steed.png b/code/web/public_php/api/data/ryzom/interface/mektoub_steed.png similarity index 100% rename from code/web/api/data/ryzom/interface/mektoub_steed.png rename to code/web/public_php/api/data/ryzom/interface/mektoub_steed.png diff --git a/code/web/api/data/ryzom/interface/mf_back.png b/code/web/public_php/api/data/ryzom/interface/mf_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/mf_back.png rename to code/web/public_php/api/data/ryzom/interface/mf_back.png diff --git a/code/web/api/data/ryzom/interface/mf_over.png b/code/web/public_php/api/data/ryzom/interface/mf_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/mf_over.png rename to code/web/public_php/api/data/ryzom/interface/mf_over.png diff --git a/code/web/api/data/ryzom/interface/mg_glove.png b/code/web/public_php/api/data/ryzom/interface/mg_glove.png similarity index 100% rename from code/web/api/data/ryzom/interface/mg_glove.png rename to code/web/public_php/api/data/ryzom/interface/mg_glove.png diff --git a/code/web/api/data/ryzom/interface/mission_icon_0.png b/code/web/public_php/api/data/ryzom/interface/mission_icon_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/mission_icon_0.png rename to code/web/public_php/api/data/ryzom/interface/mission_icon_0.png diff --git a/code/web/api/data/ryzom/interface/mission_icon_1.png b/code/web/public_php/api/data/ryzom/interface/mission_icon_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/mission_icon_1.png rename to code/web/public_php/api/data/ryzom/interface/mission_icon_1.png diff --git a/code/web/api/data/ryzom/interface/mission_icon_2.png b/code/web/public_php/api/data/ryzom/interface/mission_icon_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/mission_icon_2.png rename to code/web/public_php/api/data/ryzom/interface/mission_icon_2.png diff --git a/code/web/api/data/ryzom/interface/mission_icon_3.png b/code/web/public_php/api/data/ryzom/interface/mission_icon_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/mission_icon_3.png rename to code/web/public_php/api/data/ryzom/interface/mission_icon_3.png diff --git a/code/web/api/data/ryzom/interface/mp3.png b/code/web/public_php/api/data/ryzom/interface/mp3.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp3.png rename to code/web/public_php/api/data/ryzom/interface/mp3.png diff --git a/code/web/api/data/ryzom/interface/mp_amber.png b/code/web/public_php/api/data/ryzom/interface/mp_amber.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_amber.png rename to code/web/public_php/api/data/ryzom/interface/mp_amber.png diff --git a/code/web/api/data/ryzom/interface/mp_back_curative.png b/code/web/public_php/api/data/ryzom/interface/mp_back_curative.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_back_curative.png rename to code/web/public_php/api/data/ryzom/interface/mp_back_curative.png diff --git a/code/web/api/data/ryzom/interface/mp_back_offensive.png b/code/web/public_php/api/data/ryzom/interface/mp_back_offensive.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_back_offensive.png rename to code/web/public_php/api/data/ryzom/interface/mp_back_offensive.png diff --git a/code/web/api/data/ryzom/interface/mp_back_selfonly.png b/code/web/public_php/api/data/ryzom/interface/mp_back_selfonly.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_back_selfonly.png rename to code/web/public_php/api/data/ryzom/interface/mp_back_selfonly.png diff --git a/code/web/api/data/ryzom/interface/mp_bark.png b/code/web/public_php/api/data/ryzom/interface/mp_bark.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_bark.png rename to code/web/public_php/api/data/ryzom/interface/mp_bark.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_brique.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_brique.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_brique.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_brique.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_colonne.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_colonne.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_colonne_justice.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_colonne_justice.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_colonne_justice.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_comble.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_comble.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_comble.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_comble.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_noyau_maduk.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_noyau_maduk.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_noyau_maduk.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_ornement.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_ornement.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_ornement.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_revetement.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_revetement.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_revetement.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_socle.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_socle.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_socle.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_socle.png diff --git a/code/web/api/data/ryzom/interface/mp_batiment_statue.png b/code/web/public_php/api/data/ryzom/interface/mp_batiment_statue.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_batiment_statue.png rename to code/web/public_php/api/data/ryzom/interface/mp_batiment_statue.png diff --git a/code/web/api/data/ryzom/interface/mp_beak.png b/code/web/public_php/api/data/ryzom/interface/mp_beak.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_beak.png rename to code/web/public_php/api/data/ryzom/interface/mp_beak.png diff --git a/code/web/api/data/ryzom/interface/mp_blood.png b/code/web/public_php/api/data/ryzom/interface/mp_blood.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_blood.png rename to code/web/public_php/api/data/ryzom/interface/mp_blood.png diff --git a/code/web/api/data/ryzom/interface/mp_bone.png b/code/web/public_php/api/data/ryzom/interface/mp_bone.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_bone.png rename to code/web/public_php/api/data/ryzom/interface/mp_bone.png diff --git a/code/web/api/data/ryzom/interface/mp_bud.png b/code/web/public_php/api/data/ryzom/interface/mp_bud.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_bud.png rename to code/web/public_php/api/data/ryzom/interface/mp_bud.png diff --git a/code/web/api/data/ryzom/interface/mp_buterfly_blue.png b/code/web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_buterfly_blue.png rename to code/web/public_php/api/data/ryzom/interface/mp_buterfly_blue.png diff --git a/code/web/api/data/ryzom/interface/mp_buterfly_cocoon.png b/code/web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_buterfly_cocoon.png rename to code/web/public_php/api/data/ryzom/interface/mp_buterfly_cocoon.png diff --git a/code/web/api/data/ryzom/interface/mp_cereal.png b/code/web/public_php/api/data/ryzom/interface/mp_cereal.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_cereal.png rename to code/web/public_php/api/data/ryzom/interface/mp_cereal.png diff --git a/code/web/api/data/ryzom/interface/mp_claw.png b/code/web/public_php/api/data/ryzom/interface/mp_claw.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_claw.png rename to code/web/public_php/api/data/ryzom/interface/mp_claw.png diff --git a/code/web/api/data/ryzom/interface/mp_dandelion.png b/code/web/public_php/api/data/ryzom/interface/mp_dandelion.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dandelion.png rename to code/web/public_php/api/data/ryzom/interface/mp_dandelion.png diff --git a/code/web/api/data/ryzom/interface/mp_dry b/code/web/public_php/api/data/ryzom/interface/mp_dry similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dry rename to code/web/public_php/api/data/ryzom/interface/mp_dry diff --git a/code/web/api/data/ryzom/interface/mp_dry wood.png b/code/web/public_php/api/data/ryzom/interface/mp_dry wood.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dry wood.png rename to code/web/public_php/api/data/ryzom/interface/mp_dry wood.png diff --git a/code/web/api/data/ryzom/interface/mp_dry.png b/code/web/public_php/api/data/ryzom/interface/mp_dry.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dry.png rename to code/web/public_php/api/data/ryzom/interface/mp_dry.png diff --git a/code/web/api/data/ryzom/interface/mp_dry_wood.png b/code/web/public_php/api/data/ryzom/interface/mp_dry_wood.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dry_wood.png rename to code/web/public_php/api/data/ryzom/interface/mp_dry_wood.png diff --git a/code/web/api/data/ryzom/interface/mp_dust.png b/code/web/public_php/api/data/ryzom/interface/mp_dust.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_dust.png rename to code/web/public_php/api/data/ryzom/interface/mp_dust.png diff --git a/code/web/api/data/ryzom/interface/mp_egg.png b/code/web/public_php/api/data/ryzom/interface/mp_egg.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_egg.png rename to code/web/public_php/api/data/ryzom/interface/mp_egg.png diff --git a/code/web/api/data/ryzom/interface/mp_eyes.png b/code/web/public_php/api/data/ryzom/interface/mp_eyes.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_eyes.png rename to code/web/public_php/api/data/ryzom/interface/mp_eyes.png diff --git a/code/web/api/data/ryzom/interface/mp_fang.png b/code/web/public_php/api/data/ryzom/interface/mp_fang.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_fang.png rename to code/web/public_php/api/data/ryzom/interface/mp_fang.png diff --git a/code/web/api/data/ryzom/interface/mp_fiber.png b/code/web/public_php/api/data/ryzom/interface/mp_fiber.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_fiber.png rename to code/web/public_php/api/data/ryzom/interface/mp_fiber.png diff --git a/code/web/api/data/ryzom/interface/mp_filament.png b/code/web/public_php/api/data/ryzom/interface/mp_filament.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_filament.png rename to code/web/public_php/api/data/ryzom/interface/mp_filament.png diff --git a/code/web/api/data/ryzom/interface/mp_firefly_abdomen.png b/code/web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_firefly_abdomen.png rename to code/web/public_php/api/data/ryzom/interface/mp_firefly_abdomen.png diff --git a/code/web/api/data/ryzom/interface/mp_fish_scale.png b/code/web/public_php/api/data/ryzom/interface/mp_fish_scale.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_fish_scale.png rename to code/web/public_php/api/data/ryzom/interface/mp_fish_scale.png diff --git a/code/web/api/data/ryzom/interface/mp_flowers.png b/code/web/public_php/api/data/ryzom/interface/mp_flowers.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_flowers.png rename to code/web/public_php/api/data/ryzom/interface/mp_flowers.png diff --git a/code/web/api/data/ryzom/interface/mp_fresh_loose_soil.png b/code/web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_fresh_loose_soil.png rename to code/web/public_php/api/data/ryzom/interface/mp_fresh_loose_soil.png diff --git a/code/web/api/data/ryzom/interface/mp_fruit.png b/code/web/public_php/api/data/ryzom/interface/mp_fruit.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_fruit.png rename to code/web/public_php/api/data/ryzom/interface/mp_fruit.png diff --git a/code/web/api/data/ryzom/interface/mp_generic.png b/code/web/public_php/api/data/ryzom/interface/mp_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_generic.png rename to code/web/public_php/api/data/ryzom/interface/mp_generic.png diff --git a/code/web/api/data/ryzom/interface/mp_generic_colorize.png b/code/web/public_php/api/data/ryzom/interface/mp_generic_colorize.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_generic_colorize.png rename to code/web/public_php/api/data/ryzom/interface/mp_generic_colorize.png diff --git a/code/web/api/data/ryzom/interface/mp_gomme.png b/code/web/public_php/api/data/ryzom/interface/mp_gomme.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_gomme.png rename to code/web/public_php/api/data/ryzom/interface/mp_gomme.png diff --git a/code/web/api/data/ryzom/interface/mp_goo_residue.png b/code/web/public_php/api/data/ryzom/interface/mp_goo_residue.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_goo_residue.png rename to code/web/public_php/api/data/ryzom/interface/mp_goo_residue.png diff --git a/code/web/api/data/ryzom/interface/mp_hairs.png b/code/web/public_php/api/data/ryzom/interface/mp_hairs.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_hairs.png rename to code/web/public_php/api/data/ryzom/interface/mp_hairs.png diff --git a/code/web/api/data/ryzom/interface/mp_hoof.png b/code/web/public_php/api/data/ryzom/interface/mp_hoof.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_hoof.png rename to code/web/public_php/api/data/ryzom/interface/mp_hoof.png diff --git a/code/web/api/data/ryzom/interface/mp_horn.png b/code/web/public_php/api/data/ryzom/interface/mp_horn.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_horn.png rename to code/web/public_php/api/data/ryzom/interface/mp_horn.png diff --git a/code/web/api/data/ryzom/interface/mp_horney.png b/code/web/public_php/api/data/ryzom/interface/mp_horney.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_horney.png rename to code/web/public_php/api/data/ryzom/interface/mp_horney.png diff --git a/code/web/api/data/ryzom/interface/mp_insect_fossil.png b/code/web/public_php/api/data/ryzom/interface/mp_insect_fossil.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_insect_fossil.png rename to code/web/public_php/api/data/ryzom/interface/mp_insect_fossil.png diff --git a/code/web/api/data/ryzom/interface/mp_kitin_flesh.png b/code/web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_kitin_flesh.png rename to code/web/public_php/api/data/ryzom/interface/mp_kitin_flesh.png diff --git a/code/web/api/data/ryzom/interface/mp_kitin_secretion.png b/code/web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_kitin_secretion.png rename to code/web/public_php/api/data/ryzom/interface/mp_kitin_secretion.png diff --git a/code/web/api/data/ryzom/interface/mp_kitinshell.png b/code/web/public_php/api/data/ryzom/interface/mp_kitinshell.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_kitinshell.png rename to code/web/public_php/api/data/ryzom/interface/mp_kitinshell.png diff --git a/code/web/api/data/ryzom/interface/mp_larva.png b/code/web/public_php/api/data/ryzom/interface/mp_larva.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_larva.png rename to code/web/public_php/api/data/ryzom/interface/mp_larva.png diff --git a/code/web/api/data/ryzom/interface/mp_leaf.png b/code/web/public_php/api/data/ryzom/interface/mp_leaf.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_leaf.png rename to code/web/public_php/api/data/ryzom/interface/mp_leaf.png diff --git a/code/web/api/data/ryzom/interface/mp_leather.png b/code/web/public_php/api/data/ryzom/interface/mp_leather.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_leather.png rename to code/web/public_php/api/data/ryzom/interface/mp_leather.png diff --git a/code/web/api/data/ryzom/interface/mp_liane.png b/code/web/public_php/api/data/ryzom/interface/mp_liane.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_liane.png rename to code/web/public_php/api/data/ryzom/interface/mp_liane.png diff --git a/code/web/api/data/ryzom/interface/mp_lichen.png b/code/web/public_php/api/data/ryzom/interface/mp_lichen.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_lichen.png rename to code/web/public_php/api/data/ryzom/interface/mp_lichen.png diff --git a/code/web/api/data/ryzom/interface/mp_ligament.png b/code/web/public_php/api/data/ryzom/interface/mp_ligament.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_ligament.png rename to code/web/public_php/api/data/ryzom/interface/mp_ligament.png diff --git a/code/web/api/data/ryzom/interface/mp_mandible.png b/code/web/public_php/api/data/ryzom/interface/mp_mandible.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_mandible.png rename to code/web/public_php/api/data/ryzom/interface/mp_mandible.png diff --git a/code/web/api/data/ryzom/interface/mp_meat.png b/code/web/public_php/api/data/ryzom/interface/mp_meat.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_meat.png rename to code/web/public_php/api/data/ryzom/interface/mp_meat.png diff --git a/code/web/api/data/ryzom/interface/mp_moss.png b/code/web/public_php/api/data/ryzom/interface/mp_moss.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_moss.png rename to code/web/public_php/api/data/ryzom/interface/mp_moss.png diff --git a/code/web/api/data/ryzom/interface/mp_mushroom.png b/code/web/public_php/api/data/ryzom/interface/mp_mushroom.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_mushroom.png rename to code/web/public_php/api/data/ryzom/interface/mp_mushroom.png diff --git a/code/web/api/data/ryzom/interface/mp_nail.png b/code/web/public_php/api/data/ryzom/interface/mp_nail.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_nail.png rename to code/web/public_php/api/data/ryzom/interface/mp_nail.png diff --git a/code/web/api/data/ryzom/interface/mp_oil.png b/code/web/public_php/api/data/ryzom/interface/mp_oil.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_oil.png rename to code/web/public_php/api/data/ryzom/interface/mp_oil.png diff --git a/code/web/api/data/ryzom/interface/mp_over_link.png b/code/web/public_php/api/data/ryzom/interface/mp_over_link.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_over_link.png rename to code/web/public_php/api/data/ryzom/interface/mp_over_link.png diff --git a/code/web/api/data/ryzom/interface/mp_parasite.png b/code/web/public_php/api/data/ryzom/interface/mp_parasite.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_parasite.png rename to code/web/public_php/api/data/ryzom/interface/mp_parasite.png diff --git a/code/web/api/data/ryzom/interface/mp_pearl.png b/code/web/public_php/api/data/ryzom/interface/mp_pearl.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_pearl.png rename to code/web/public_php/api/data/ryzom/interface/mp_pearl.png diff --git a/code/web/api/data/ryzom/interface/mp_pelvis.png b/code/web/public_php/api/data/ryzom/interface/mp_pelvis.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_pelvis.png rename to code/web/public_php/api/data/ryzom/interface/mp_pelvis.png diff --git a/code/web/api/data/ryzom/interface/mp_pigment.png b/code/web/public_php/api/data/ryzom/interface/mp_pigment.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_pigment.png rename to code/web/public_php/api/data/ryzom/interface/mp_pigment.png diff --git a/code/web/api/data/ryzom/interface/mp_pistil.png b/code/web/public_php/api/data/ryzom/interface/mp_pistil.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_pistil.png rename to code/web/public_php/api/data/ryzom/interface/mp_pistil.png diff --git a/code/web/api/data/ryzom/interface/mp_plant_fossil.png b/code/web/public_php/api/data/ryzom/interface/mp_plant_fossil.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_plant_fossil.png rename to code/web/public_php/api/data/ryzom/interface/mp_plant_fossil.png diff --git a/code/web/api/data/ryzom/interface/mp_pollen.png b/code/web/public_php/api/data/ryzom/interface/mp_pollen.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_pollen.png rename to code/web/public_php/api/data/ryzom/interface/mp_pollen.png diff --git a/code/web/api/data/ryzom/interface/mp_resin.png b/code/web/public_php/api/data/ryzom/interface/mp_resin.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_resin.png rename to code/web/public_php/api/data/ryzom/interface/mp_resin.png diff --git a/code/web/api/data/ryzom/interface/mp_ronce.png b/code/web/public_php/api/data/ryzom/interface/mp_ronce.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_ronce.png rename to code/web/public_php/api/data/ryzom/interface/mp_ronce.png diff --git a/code/web/api/data/ryzom/interface/mp_rostrum.png b/code/web/public_php/api/data/ryzom/interface/mp_rostrum.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_rostrum.png rename to code/web/public_php/api/data/ryzom/interface/mp_rostrum.png diff --git a/code/web/api/data/ryzom/interface/mp_sap.png b/code/web/public_php/api/data/ryzom/interface/mp_sap.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_sap.png rename to code/web/public_php/api/data/ryzom/interface/mp_sap.png diff --git a/code/web/api/data/ryzom/interface/mp_sawdust.png b/code/web/public_php/api/data/ryzom/interface/mp_sawdust.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_sawdust.png rename to code/web/public_php/api/data/ryzom/interface/mp_sawdust.png diff --git a/code/web/api/data/ryzom/interface/mp_seed.png b/code/web/public_php/api/data/ryzom/interface/mp_seed.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_seed.png rename to code/web/public_php/api/data/ryzom/interface/mp_seed.png diff --git a/code/web/api/data/ryzom/interface/mp_shell.png b/code/web/public_php/api/data/ryzom/interface/mp_shell.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_shell.png rename to code/web/public_php/api/data/ryzom/interface/mp_shell.png diff --git a/code/web/api/data/ryzom/interface/mp_silk_worm.png b/code/web/public_php/api/data/ryzom/interface/mp_silk_worm.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_silk_worm.png rename to code/web/public_php/api/data/ryzom/interface/mp_silk_worm.png diff --git a/code/web/api/data/ryzom/interface/mp_skin.png b/code/web/public_php/api/data/ryzom/interface/mp_skin.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_skin.png rename to code/web/public_php/api/data/ryzom/interface/mp_skin.png diff --git a/code/web/api/data/ryzom/interface/mp_skull.png b/code/web/public_php/api/data/ryzom/interface/mp_skull.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_skull.png rename to code/web/public_php/api/data/ryzom/interface/mp_skull.png diff --git a/code/web/api/data/ryzom/interface/mp_spiders_web.png b/code/web/public_php/api/data/ryzom/interface/mp_spiders_web.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_spiders_web.png rename to code/web/public_php/api/data/ryzom/interface/mp_spiders_web.png diff --git a/code/web/api/data/ryzom/interface/mp_spine.png b/code/web/public_php/api/data/ryzom/interface/mp_spine.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_spine.png rename to code/web/public_php/api/data/ryzom/interface/mp_spine.png diff --git a/code/web/api/data/ryzom/interface/mp_stem.png b/code/web/public_php/api/data/ryzom/interface/mp_stem.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_stem.png rename to code/web/public_php/api/data/ryzom/interface/mp_stem.png diff --git a/code/web/api/data/ryzom/interface/mp_sting.png b/code/web/public_php/api/data/ryzom/interface/mp_sting.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_sting.png rename to code/web/public_php/api/data/ryzom/interface/mp_sting.png diff --git a/code/web/api/data/ryzom/interface/mp_straw.png b/code/web/public_php/api/data/ryzom/interface/mp_straw.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_straw.png rename to code/web/public_php/api/data/ryzom/interface/mp_straw.png diff --git a/code/web/api/data/ryzom/interface/mp_suc.png b/code/web/public_php/api/data/ryzom/interface/mp_suc.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_suc.png rename to code/web/public_php/api/data/ryzom/interface/mp_suc.png diff --git a/code/web/api/data/ryzom/interface/mp_tail.png b/code/web/public_php/api/data/ryzom/interface/mp_tail.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_tail.png rename to code/web/public_php/api/data/ryzom/interface/mp_tail.png diff --git a/code/web/api/data/ryzom/interface/mp_tooth.png b/code/web/public_php/api/data/ryzom/interface/mp_tooth.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_tooth.png rename to code/web/public_php/api/data/ryzom/interface/mp_tooth.png diff --git a/code/web/api/data/ryzom/interface/mp_trunk.png b/code/web/public_php/api/data/ryzom/interface/mp_trunk.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_trunk.png rename to code/web/public_php/api/data/ryzom/interface/mp_trunk.png diff --git a/code/web/api/data/ryzom/interface/mp_whiskers.png b/code/web/public_php/api/data/ryzom/interface/mp_whiskers.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_whiskers.png rename to code/web/public_php/api/data/ryzom/interface/mp_whiskers.png diff --git a/code/web/api/data/ryzom/interface/mp_wing.png b/code/web/public_php/api/data/ryzom/interface/mp_wing.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_wing.png rename to code/web/public_php/api/data/ryzom/interface/mp_wing.png diff --git a/code/web/api/data/ryzom/interface/mp_wood.png b/code/web/public_php/api/data/ryzom/interface/mp_wood.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_wood.png rename to code/web/public_php/api/data/ryzom/interface/mp_wood.png diff --git a/code/web/api/data/ryzom/interface/mp_wood_node.png b/code/web/public_php/api/data/ryzom/interface/mp_wood_node.png similarity index 100% rename from code/web/api/data/ryzom/interface/mp_wood_node.png rename to code/web/public_php/api/data/ryzom/interface/mp_wood_node.png diff --git a/code/web/api/data/ryzom/interface/mw_2h_axe.png b/code/web/public_php/api/data/ryzom/interface/mw_2h_axe.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_2h_axe.png rename to code/web/public_php/api/data/ryzom/interface/mw_2h_axe.png diff --git a/code/web/api/data/ryzom/interface/mw_2h_lance.png b/code/web/public_php/api/data/ryzom/interface/mw_2h_lance.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_2h_lance.png rename to code/web/public_php/api/data/ryzom/interface/mw_2h_lance.png diff --git a/code/web/api/data/ryzom/interface/mw_2h_mace.png b/code/web/public_php/api/data/ryzom/interface/mw_2h_mace.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_2h_mace.png rename to code/web/public_php/api/data/ryzom/interface/mw_2h_mace.png diff --git a/code/web/api/data/ryzom/interface/mw_2h_sword.png b/code/web/public_php/api/data/ryzom/interface/mw_2h_sword.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_2h_sword.png rename to code/web/public_php/api/data/ryzom/interface/mw_2h_sword.png diff --git a/code/web/api/data/ryzom/interface/mw_axe.png b/code/web/public_php/api/data/ryzom/interface/mw_axe.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_axe.png rename to code/web/public_php/api/data/ryzom/interface/mw_axe.png diff --git a/code/web/api/data/ryzom/interface/mw_dagger.png b/code/web/public_php/api/data/ryzom/interface/mw_dagger.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_dagger.png rename to code/web/public_php/api/data/ryzom/interface/mw_dagger.png diff --git a/code/web/api/data/ryzom/interface/mw_lance.png b/code/web/public_php/api/data/ryzom/interface/mw_lance.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_lance.png rename to code/web/public_php/api/data/ryzom/interface/mw_lance.png diff --git a/code/web/api/data/ryzom/interface/mw_mace.png b/code/web/public_php/api/data/ryzom/interface/mw_mace.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_mace.png rename to code/web/public_php/api/data/ryzom/interface/mw_mace.png diff --git a/code/web/api/data/ryzom/interface/mw_staff.png b/code/web/public_php/api/data/ryzom/interface/mw_staff.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_staff.png rename to code/web/public_php/api/data/ryzom/interface/mw_staff.png diff --git a/code/web/api/data/ryzom/interface/mw_sword.png b/code/web/public_php/api/data/ryzom/interface/mw_sword.png similarity index 100% rename from code/web/api/data/ryzom/interface/mw_sword.png rename to code/web/public_php/api/data/ryzom/interface/mw_sword.png diff --git a/code/web/api/data/ryzom/interface/no_action.png b/code/web/public_php/api/data/ryzom/interface/no_action.png similarity index 100% rename from code/web/api/data/ryzom/interface/no_action.png rename to code/web/public_php/api/data/ryzom/interface/no_action.png diff --git a/code/web/api/data/ryzom/interface/num_slash.png b/code/web/public_php/api/data/ryzom/interface/num_slash.png similarity index 100% rename from code/web/api/data/ryzom/interface/num_slash.png rename to code/web/public_php/api/data/ryzom/interface/num_slash.png diff --git a/code/web/api/data/ryzom/interface/op_back.png b/code/web/public_php/api/data/ryzom/interface/op_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/op_back.png rename to code/web/public_php/api/data/ryzom/interface/op_back.png diff --git a/code/web/api/data/ryzom/interface/op_over_break.png b/code/web/public_php/api/data/ryzom/interface/op_over_break.png similarity index 100% rename from code/web/api/data/ryzom/interface/op_over_break.png rename to code/web/public_php/api/data/ryzom/interface/op_over_break.png diff --git a/code/web/api/data/ryzom/interface/op_over_less.png b/code/web/public_php/api/data/ryzom/interface/op_over_less.png similarity index 100% rename from code/web/api/data/ryzom/interface/op_over_less.png rename to code/web/public_php/api/data/ryzom/interface/op_over_less.png diff --git a/code/web/api/data/ryzom/interface/op_over_more.png b/code/web/public_php/api/data/ryzom/interface/op_over_more.png similarity index 100% rename from code/web/api/data/ryzom/interface/op_over_more.png rename to code/web/public_php/api/data/ryzom/interface/op_over_more.png diff --git a/code/web/api/data/ryzom/interface/pa_anklet.png b/code/web/public_php/api/data/ryzom/interface/pa_anklet.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_anklet.png rename to code/web/public_php/api/data/ryzom/interface/pa_anklet.png diff --git a/code/web/api/data/ryzom/interface/pa_back.png b/code/web/public_php/api/data/ryzom/interface/pa_back.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_back.png rename to code/web/public_php/api/data/ryzom/interface/pa_back.png diff --git a/code/web/api/data/ryzom/interface/pa_bracelet.png b/code/web/public_php/api/data/ryzom/interface/pa_bracelet.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_bracelet.png rename to code/web/public_php/api/data/ryzom/interface/pa_bracelet.png diff --git a/code/web/api/data/ryzom/interface/pa_diadem.png b/code/web/public_php/api/data/ryzom/interface/pa_diadem.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_diadem.png rename to code/web/public_php/api/data/ryzom/interface/pa_diadem.png diff --git a/code/web/api/data/ryzom/interface/pa_earring.png b/code/web/public_php/api/data/ryzom/interface/pa_earring.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_earring.png rename to code/web/public_php/api/data/ryzom/interface/pa_earring.png diff --git a/code/web/api/data/ryzom/interface/pa_over_break.png b/code/web/public_php/api/data/ryzom/interface/pa_over_break.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_over_break.png rename to code/web/public_php/api/data/ryzom/interface/pa_over_break.png diff --git a/code/web/api/data/ryzom/interface/pa_over_less.png b/code/web/public_php/api/data/ryzom/interface/pa_over_less.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_over_less.png rename to code/web/public_php/api/data/ryzom/interface/pa_over_less.png diff --git a/code/web/api/data/ryzom/interface/pa_over_more.png b/code/web/public_php/api/data/ryzom/interface/pa_over_more.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_over_more.png rename to code/web/public_php/api/data/ryzom/interface/pa_over_more.png diff --git a/code/web/api/data/ryzom/interface/pa_pendant.png b/code/web/public_php/api/data/ryzom/interface/pa_pendant.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_pendant.png rename to code/web/public_php/api/data/ryzom/interface/pa_pendant.png diff --git a/code/web/api/data/ryzom/interface/pa_ring.png b/code/web/public_php/api/data/ryzom/interface/pa_ring.png similarity index 100% rename from code/web/api/data/ryzom/interface/pa_ring.png rename to code/web/public_php/api/data/ryzom/interface/pa_ring.png diff --git a/code/web/api/data/ryzom/interface/profile.png b/code/web/public_php/api/data/ryzom/interface/profile.png similarity index 100% rename from code/web/api/data/ryzom/interface/profile.png rename to code/web/public_php/api/data/ryzom/interface/profile.png diff --git a/code/web/api/data/ryzom/interface/protect_amber.png b/code/web/public_php/api/data/ryzom/interface/protect_amber.png similarity index 100% rename from code/web/api/data/ryzom/interface/protect_amber.png rename to code/web/public_php/api/data/ryzom/interface/protect_amber.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_0.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_0.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_0.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_1.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_1.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_1.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_2.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_2.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_2.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_3.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_3.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_3.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_4.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_4.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_4.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_6.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_6.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_6.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_6.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_primas.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_primas.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_primas.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_primas.png diff --git a/code/web/api/data/ryzom/interface/pvp_ally_ranger.png b/code/web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_ally_ranger.png rename to code/web/public_php/api/data/ryzom/interface/pvp_ally_ranger.png diff --git a/code/web/api/data/ryzom/interface/pvp_aura.png b/code/web/public_php/api/data/ryzom/interface/pvp_aura.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_aura.png rename to code/web/public_php/api/data/ryzom/interface/pvp_aura.png diff --git a/code/web/api/data/ryzom/interface/pvp_aura_mask.png b/code/web/public_php/api/data/ryzom/interface/pvp_aura_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_aura_mask.png rename to code/web/public_php/api/data/ryzom/interface/pvp_aura_mask.png diff --git a/code/web/api/data/ryzom/interface/pvp_boost.png b/code/web/public_php/api/data/ryzom/interface/pvp_boost.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_boost.png rename to code/web/public_php/api/data/ryzom/interface/pvp_boost.png diff --git a/code/web/api/data/ryzom/interface/pvp_boost_mask.png b/code/web/public_php/api/data/ryzom/interface/pvp_boost_mask.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_boost_mask.png rename to code/web/public_php/api/data/ryzom/interface/pvp_boost_mask.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_0.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_0.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_0.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_1.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_1.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_1.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_2.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_2.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_2.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_3.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_3.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_3.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_4.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_4.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_4.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_6.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_6.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_6.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_6.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_marauder.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_marauder.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_marauder.png diff --git a/code/web/api/data/ryzom/interface/pvp_enemy_trytonist.png b/code/web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png similarity index 100% rename from code/web/api/data/ryzom/interface/pvp_enemy_trytonist.png rename to code/web/public_php/api/data/ryzom/interface/pvp_enemy_trytonist.png diff --git a/code/web/api/data/ryzom/interface/pw_4.png b/code/web/public_php/api/data/ryzom/interface/pw_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_4.png rename to code/web/public_php/api/data/ryzom/interface/pw_4.png diff --git a/code/web/api/data/ryzom/interface/pw_5.png b/code/web/public_php/api/data/ryzom/interface/pw_5.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_5.png rename to code/web/public_php/api/data/ryzom/interface/pw_5.png diff --git a/code/web/api/data/ryzom/interface/pw_6.png b/code/web/public_php/api/data/ryzom/interface/pw_6.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_6.png rename to code/web/public_php/api/data/ryzom/interface/pw_6.png diff --git a/code/web/api/data/ryzom/interface/pw_7.png b/code/web/public_php/api/data/ryzom/interface/pw_7.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_7.png rename to code/web/public_php/api/data/ryzom/interface/pw_7.png diff --git a/code/web/api/data/ryzom/interface/pw_heavy.png b/code/web/public_php/api/data/ryzom/interface/pw_heavy.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_heavy.png rename to code/web/public_php/api/data/ryzom/interface/pw_heavy.png diff --git a/code/web/api/data/ryzom/interface/pw_light.png b/code/web/public_php/api/data/ryzom/interface/pw_light.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_light.png rename to code/web/public_php/api/data/ryzom/interface/pw_light.png diff --git a/code/web/api/data/ryzom/interface/pw_medium.png b/code/web/public_php/api/data/ryzom/interface/pw_medium.png similarity index 100% rename from code/web/api/data/ryzom/interface/pw_medium.png rename to code/web/public_php/api/data/ryzom/interface/pw_medium.png diff --git a/code/web/api/data/ryzom/interface/quest_coeur.png b/code/web/public_php/api/data/ryzom/interface/quest_coeur.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_coeur.png rename to code/web/public_php/api/data/ryzom/interface/quest_coeur.png diff --git a/code/web/api/data/ryzom/interface/quest_foie.png b/code/web/public_php/api/data/ryzom/interface/quest_foie.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_foie.png rename to code/web/public_php/api/data/ryzom/interface/quest_foie.png diff --git a/code/web/api/data/ryzom/interface/quest_jeton.png b/code/web/public_php/api/data/ryzom/interface/quest_jeton.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_jeton.png rename to code/web/public_php/api/data/ryzom/interface/quest_jeton.png diff --git a/code/web/api/data/ryzom/interface/quest_langue.png b/code/web/public_php/api/data/ryzom/interface/quest_langue.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_langue.png rename to code/web/public_php/api/data/ryzom/interface/quest_langue.png diff --git a/code/web/api/data/ryzom/interface/quest_louche.png b/code/web/public_php/api/data/ryzom/interface/quest_louche.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_louche.png rename to code/web/public_php/api/data/ryzom/interface/quest_louche.png diff --git a/code/web/api/data/ryzom/interface/quest_oreille.png b/code/web/public_php/api/data/ryzom/interface/quest_oreille.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_oreille.png rename to code/web/public_php/api/data/ryzom/interface/quest_oreille.png diff --git a/code/web/api/data/ryzom/interface/quest_patte.png b/code/web/public_php/api/data/ryzom/interface/quest_patte.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_patte.png rename to code/web/public_php/api/data/ryzom/interface/quest_patte.png diff --git a/code/web/api/data/ryzom/interface/quest_poils.png b/code/web/public_php/api/data/ryzom/interface/quest_poils.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_poils.png rename to code/web/public_php/api/data/ryzom/interface/quest_poils.png diff --git a/code/web/api/data/ryzom/interface/quest_queue.png b/code/web/public_php/api/data/ryzom/interface/quest_queue.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_queue.png rename to code/web/public_php/api/data/ryzom/interface/quest_queue.png diff --git a/code/web/api/data/ryzom/interface/quest_ticket.png b/code/web/public_php/api/data/ryzom/interface/quest_ticket.png similarity index 100% rename from code/web/api/data/ryzom/interface/quest_ticket.png rename to code/web/public_php/api/data/ryzom/interface/quest_ticket.png diff --git a/code/web/api/data/ryzom/interface/r2_live.png b/code/web/public_php/api/data/ryzom/interface/r2_live.png similarity index 100% rename from code/web/api/data/ryzom/interface/r2_live.png rename to code/web/public_php/api/data/ryzom/interface/r2_live.png diff --git a/code/web/api/data/ryzom/interface/r2_live_over.png b/code/web/public_php/api/data/ryzom/interface/r2_live_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/r2_live_over.png rename to code/web/public_php/api/data/ryzom/interface/r2_live_over.png diff --git a/code/web/api/data/ryzom/interface/r2_live_pushed.png b/code/web/public_php/api/data/ryzom/interface/r2_live_pushed.png similarity index 100% rename from code/web/api/data/ryzom/interface/r2_live_pushed.png rename to code/web/public_php/api/data/ryzom/interface/r2_live_pushed.png diff --git a/code/web/api/data/ryzom/interface/r2_palette_entities.png b/code/web/public_php/api/data/ryzom/interface/r2_palette_entities.png similarity index 100% rename from code/web/api/data/ryzom/interface/r2_palette_entities.png rename to code/web/public_php/api/data/ryzom/interface/r2_palette_entities.png diff --git a/code/web/api/data/ryzom/interface/requirement.png b/code/web/public_php/api/data/ryzom/interface/requirement.png similarity index 100% rename from code/web/api/data/ryzom/interface/requirement.png rename to code/web/public_php/api/data/ryzom/interface/requirement.png diff --git a/code/web/api/data/ryzom/interface/rm_f.png b/code/web/public_php/api/data/ryzom/interface/rm_f.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_f.png rename to code/web/public_php/api/data/ryzom/interface/rm_f.png diff --git a/code/web/api/data/ryzom/interface/rm_f_upgrade.png b/code/web/public_php/api/data/ryzom/interface/rm_f_upgrade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_f_upgrade.png rename to code/web/public_php/api/data/ryzom/interface/rm_f_upgrade.png diff --git a/code/web/api/data/ryzom/interface/rm_h.png b/code/web/public_php/api/data/ryzom/interface/rm_h.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_h.png rename to code/web/public_php/api/data/ryzom/interface/rm_h.png diff --git a/code/web/api/data/ryzom/interface/rm_h_upgrade.png b/code/web/public_php/api/data/ryzom/interface/rm_h_upgrade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_h_upgrade.png rename to code/web/public_php/api/data/ryzom/interface/rm_h_upgrade.png diff --git a/code/web/api/data/ryzom/interface/rm_m.png b/code/web/public_php/api/data/ryzom/interface/rm_m.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_m.png rename to code/web/public_php/api/data/ryzom/interface/rm_m.png diff --git a/code/web/api/data/ryzom/interface/rm_m_upgrade.png b/code/web/public_php/api/data/ryzom/interface/rm_m_upgrade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_m_upgrade.png rename to code/web/public_php/api/data/ryzom/interface/rm_m_upgrade.png diff --git a/code/web/api/data/ryzom/interface/rm_r.png b/code/web/public_php/api/data/ryzom/interface/rm_r.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_r.png rename to code/web/public_php/api/data/ryzom/interface/rm_r.png diff --git a/code/web/api/data/ryzom/interface/rm_r_upgrade.png b/code/web/public_php/api/data/ryzom/interface/rm_r_upgrade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rm_r_upgrade.png rename to code/web/public_php/api/data/ryzom/interface/rm_r_upgrade.png diff --git a/code/web/api/data/ryzom/interface/rpjob_200.png b/code/web/public_php/api/data/ryzom/interface/rpjob_200.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_200.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_200.png diff --git a/code/web/api/data/ryzom/interface/rpjob_201.png b/code/web/public_php/api/data/ryzom/interface/rpjob_201.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_201.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_201.png diff --git a/code/web/api/data/ryzom/interface/rpjob_202.png b/code/web/public_php/api/data/ryzom/interface/rpjob_202.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_202.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_202.png diff --git a/code/web/api/data/ryzom/interface/rpjob_203.png b/code/web/public_php/api/data/ryzom/interface/rpjob_203.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_203.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_203.png diff --git a/code/web/api/data/ryzom/interface/rpjob_204.png b/code/web/public_php/api/data/ryzom/interface/rpjob_204.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_204.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_204.png diff --git a/code/web/api/data/ryzom/interface/rpjob_205.png b/code/web/public_php/api/data/ryzom/interface/rpjob_205.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_205.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_205.png diff --git a/code/web/api/data/ryzom/interface/rpjob_206.png b/code/web/public_php/api/data/ryzom/interface/rpjob_206.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_206.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_206.png diff --git a/code/web/api/data/ryzom/interface/rpjob_207.png b/code/web/public_php/api/data/ryzom/interface/rpjob_207.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_207.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_207.png diff --git a/code/web/api/data/ryzom/interface/rpjob_advanced.png b/code/web/public_php/api/data/ryzom/interface/rpjob_advanced.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_advanced.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_advanced.png diff --git a/code/web/api/data/ryzom/interface/rpjob_elementary.png b/code/web/public_php/api/data/ryzom/interface/rpjob_elementary.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_elementary.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_elementary.png diff --git a/code/web/api/data/ryzom/interface/rpjob_roleplay.png b/code/web/public_php/api/data/ryzom/interface/rpjob_roleplay.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_roleplay.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_roleplay.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task_certificats.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task_certificats.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task_certificats.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task_convert.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task_convert.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task_convert.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task_convert.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task_elementary.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task_elementary.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task_elementary.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task_generic.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task_generic.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task_generic.png diff --git a/code/web/api/data/ryzom/interface/rpjob_task_upgrade.png b/code/web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjob_task_upgrade.png rename to code/web/public_php/api/data/ryzom/interface/rpjob_task_upgrade.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_200_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_200_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_200_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_200_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_200_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_200_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_200_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_200_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_200_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_201_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_201_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_201_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_201_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_201_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_201_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_201_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_201_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_201_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_202_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_202_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_202_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_202_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_202_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_202_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_202_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_202_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_202_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_203_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_203_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_203_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_203_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_203_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_203_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_203_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_203_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_203_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_204_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_204_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_204_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_204_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_204_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_204_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_204_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_204_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_204_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_205_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_205_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_205_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_205_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_205_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_205_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_205_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_205_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_205_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_206_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_206_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_206_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_206_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_206_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_206_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_206_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_206_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_206_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_207_a.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_207_a.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_207_a.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_207_b.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_207_b.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_207_b.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_207_c.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_207_c.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_207_c.png diff --git a/code/web/api/data/ryzom/interface/rpjobitem_certifications.png b/code/web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png similarity index 100% rename from code/web/api/data/ryzom/interface/rpjobitem_certifications.png rename to code/web/public_php/api/data/ryzom/interface/rpjobitem_certifications.png diff --git a/code/web/api/data/ryzom/interface/rw_autolaunch.png b/code/web/public_php/api/data/ryzom/interface/rw_autolaunch.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_autolaunch.png rename to code/web/public_php/api/data/ryzom/interface/rw_autolaunch.png diff --git a/code/web/api/data/ryzom/interface/rw_bowgun.png b/code/web/public_php/api/data/ryzom/interface/rw_bowgun.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_bowgun.png rename to code/web/public_php/api/data/ryzom/interface/rw_bowgun.png diff --git a/code/web/api/data/ryzom/interface/rw_grenade.png b/code/web/public_php/api/data/ryzom/interface/rw_grenade.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_grenade.png rename to code/web/public_php/api/data/ryzom/interface/rw_grenade.png diff --git a/code/web/api/data/ryzom/interface/rw_harpoongun.png b/code/web/public_php/api/data/ryzom/interface/rw_harpoongun.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_harpoongun.png rename to code/web/public_php/api/data/ryzom/interface/rw_harpoongun.png diff --git a/code/web/api/data/ryzom/interface/rw_launcher.png b/code/web/public_php/api/data/ryzom/interface/rw_launcher.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_launcher.png rename to code/web/public_php/api/data/ryzom/interface/rw_launcher.png diff --git a/code/web/api/data/ryzom/interface/rw_pistol.png b/code/web/public_php/api/data/ryzom/interface/rw_pistol.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_pistol.png rename to code/web/public_php/api/data/ryzom/interface/rw_pistol.png diff --git a/code/web/api/data/ryzom/interface/rw_pistolarc.png b/code/web/public_php/api/data/ryzom/interface/rw_pistolarc.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_pistolarc.png rename to code/web/public_php/api/data/ryzom/interface/rw_pistolarc.png diff --git a/code/web/api/data/ryzom/interface/rw_rifle.png b/code/web/public_php/api/data/ryzom/interface/rw_rifle.png similarity index 100% rename from code/web/api/data/ryzom/interface/rw_rifle.png rename to code/web/public_php/api/data/ryzom/interface/rw_rifle.png diff --git a/code/web/api/data/ryzom/interface/sapload.png b/code/web/public_php/api/data/ryzom/interface/sapload.png similarity index 100% rename from code/web/api/data/ryzom/interface/sapload.png rename to code/web/public_php/api/data/ryzom/interface/sapload.png diff --git a/code/web/api/data/ryzom/interface/sh_buckler.png b/code/web/public_php/api/data/ryzom/interface/sh_buckler.png similarity index 100% rename from code/web/api/data/ryzom/interface/sh_buckler.png rename to code/web/public_php/api/data/ryzom/interface/sh_buckler.png diff --git a/code/web/api/data/ryzom/interface/sh_large_shield.png b/code/web/public_php/api/data/ryzom/interface/sh_large_shield.png similarity index 100% rename from code/web/api/data/ryzom/interface/sh_large_shield.png rename to code/web/public_php/api/data/ryzom/interface/sh_large_shield.png diff --git a/code/web/api/data/ryzom/interface/small_task_craft.png b/code/web/public_php/api/data/ryzom/interface/small_task_craft.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_craft.png rename to code/web/public_php/api/data/ryzom/interface/small_task_craft.png diff --git a/code/web/api/data/ryzom/interface/small_task_done.png b/code/web/public_php/api/data/ryzom/interface/small_task_done.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_done.png rename to code/web/public_php/api/data/ryzom/interface/small_task_done.png diff --git a/code/web/api/data/ryzom/interface/small_task_failed.png b/code/web/public_php/api/data/ryzom/interface/small_task_failed.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_failed.png rename to code/web/public_php/api/data/ryzom/interface/small_task_failed.png diff --git a/code/web/api/data/ryzom/interface/small_task_fight.png b/code/web/public_php/api/data/ryzom/interface/small_task_fight.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_fight.png rename to code/web/public_php/api/data/ryzom/interface/small_task_fight.png diff --git a/code/web/api/data/ryzom/interface/small_task_forage.png b/code/web/public_php/api/data/ryzom/interface/small_task_forage.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_forage.png rename to code/web/public_php/api/data/ryzom/interface/small_task_forage.png diff --git a/code/web/api/data/ryzom/interface/small_task_generic.png b/code/web/public_php/api/data/ryzom/interface/small_task_generic.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_generic.png rename to code/web/public_php/api/data/ryzom/interface/small_task_generic.png diff --git a/code/web/api/data/ryzom/interface/small_task_guild.png b/code/web/public_php/api/data/ryzom/interface/small_task_guild.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_guild.png rename to code/web/public_php/api/data/ryzom/interface/small_task_guild.png diff --git a/code/web/api/data/ryzom/interface/small_task_rite.png b/code/web/public_php/api/data/ryzom/interface/small_task_rite.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_rite.png rename to code/web/public_php/api/data/ryzom/interface/small_task_rite.png diff --git a/code/web/api/data/ryzom/interface/small_task_travel.png b/code/web/public_php/api/data/ryzom/interface/small_task_travel.png similarity index 100% rename from code/web/api/data/ryzom/interface/small_task_travel.png rename to code/web/public_php/api/data/ryzom/interface/small_task_travel.png diff --git a/code/web/api/data/ryzom/interface/spe_beast.png b/code/web/public_php/api/data/ryzom/interface/spe_beast.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_beast.png rename to code/web/public_php/api/data/ryzom/interface/spe_beast.png diff --git a/code/web/api/data/ryzom/interface/spe_com.png b/code/web/public_php/api/data/ryzom/interface/spe_com.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_com.png rename to code/web/public_php/api/data/ryzom/interface/spe_com.png diff --git a/code/web/api/data/ryzom/interface/spe_inventory.png b/code/web/public_php/api/data/ryzom/interface/spe_inventory.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_inventory.png rename to code/web/public_php/api/data/ryzom/interface/spe_inventory.png diff --git a/code/web/api/data/ryzom/interface/spe_labs.png b/code/web/public_php/api/data/ryzom/interface/spe_labs.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_labs.png rename to code/web/public_php/api/data/ryzom/interface/spe_labs.png diff --git a/code/web/api/data/ryzom/interface/spe_memory.png b/code/web/public_php/api/data/ryzom/interface/spe_memory.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_memory.png rename to code/web/public_php/api/data/ryzom/interface/spe_memory.png diff --git a/code/web/api/data/ryzom/interface/spe_options.png b/code/web/public_php/api/data/ryzom/interface/spe_options.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_options.png rename to code/web/public_php/api/data/ryzom/interface/spe_options.png diff --git a/code/web/api/data/ryzom/interface/spe_status.png b/code/web/public_php/api/data/ryzom/interface/spe_status.png similarity index 100% rename from code/web/api/data/ryzom/interface/spe_status.png rename to code/web/public_php/api/data/ryzom/interface/spe_status.png diff --git a/code/web/api/data/ryzom/interface/stimulating_water.png b/code/web/public_php/api/data/ryzom/interface/stimulating_water.png similarity index 100% rename from code/web/api/data/ryzom/interface/stimulating_water.png rename to code/web/public_php/api/data/ryzom/interface/stimulating_water.png diff --git a/code/web/api/data/ryzom/interface/tb_action_attack.png b/code/web/public_php/api/data/ryzom/interface/tb_action_attack.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_attack.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_attack.png diff --git a/code/web/api/data/ryzom/interface/tb_action_config.png b/code/web/public_php/api/data/ryzom/interface/tb_action_config.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_config.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_config.png diff --git a/code/web/api/data/ryzom/interface/tb_action_disband.png b/code/web/public_php/api/data/ryzom/interface/tb_action_disband.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_disband.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_disband.png diff --git a/code/web/api/data/ryzom/interface/tb_action_disengage.png b/code/web/public_php/api/data/ryzom/interface/tb_action_disengage.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_disengage.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_disengage.png diff --git a/code/web/api/data/ryzom/interface/tb_action_extract.png b/code/web/public_php/api/data/ryzom/interface/tb_action_extract.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_extract.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_extract.png diff --git a/code/web/api/data/ryzom/interface/tb_action_invite.png b/code/web/public_php/api/data/ryzom/interface/tb_action_invite.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_invite.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_invite.png diff --git a/code/web/api/data/ryzom/interface/tb_action_kick.png b/code/web/public_php/api/data/ryzom/interface/tb_action_kick.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_kick.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_kick.png diff --git a/code/web/api/data/ryzom/interface/tb_action_move.png b/code/web/public_php/api/data/ryzom/interface/tb_action_move.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_move.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_move.png diff --git a/code/web/api/data/ryzom/interface/tb_action_run.png b/code/web/public_php/api/data/ryzom/interface/tb_action_run.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_run.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_run.png diff --git a/code/web/api/data/ryzom/interface/tb_action_sit.png b/code/web/public_php/api/data/ryzom/interface/tb_action_sit.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_sit.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_sit.png diff --git a/code/web/api/data/ryzom/interface/tb_action_stand.png b/code/web/public_php/api/data/ryzom/interface/tb_action_stand.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_stand.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_stand.png diff --git a/code/web/api/data/ryzom/interface/tb_action_stop.png b/code/web/public_php/api/data/ryzom/interface/tb_action_stop.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_stop.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_stop.png diff --git a/code/web/api/data/ryzom/interface/tb_action_talk.png b/code/web/public_php/api/data/ryzom/interface/tb_action_talk.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_talk.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_talk.png diff --git a/code/web/api/data/ryzom/interface/tb_action_walk.png b/code/web/public_php/api/data/ryzom/interface/tb_action_walk.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_action_walk.png rename to code/web/public_php/api/data/ryzom/interface/tb_action_walk.png diff --git a/code/web/api/data/ryzom/interface/tb_animals.png b/code/web/public_php/api/data/ryzom/interface/tb_animals.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_animals.png rename to code/web/public_php/api/data/ryzom/interface/tb_animals.png diff --git a/code/web/api/data/ryzom/interface/tb_config.png b/code/web/public_php/api/data/ryzom/interface/tb_config.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_config.png rename to code/web/public_php/api/data/ryzom/interface/tb_config.png diff --git a/code/web/api/data/ryzom/interface/tb_connection.png b/code/web/public_php/api/data/ryzom/interface/tb_connection.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_connection.png rename to code/web/public_php/api/data/ryzom/interface/tb_connection.png diff --git a/code/web/api/data/ryzom/interface/tb_contacts.png b/code/web/public_php/api/data/ryzom/interface/tb_contacts.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_contacts.png rename to code/web/public_php/api/data/ryzom/interface/tb_contacts.png diff --git a/code/web/api/data/ryzom/interface/tb_desk_1.png b/code/web/public_php/api/data/ryzom/interface/tb_desk_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_desk_1.png rename to code/web/public_php/api/data/ryzom/interface/tb_desk_1.png diff --git a/code/web/api/data/ryzom/interface/tb_desk_2.png b/code/web/public_php/api/data/ryzom/interface/tb_desk_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_desk_2.png rename to code/web/public_php/api/data/ryzom/interface/tb_desk_2.png diff --git a/code/web/api/data/ryzom/interface/tb_desk_3.png b/code/web/public_php/api/data/ryzom/interface/tb_desk_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_desk_3.png rename to code/web/public_php/api/data/ryzom/interface/tb_desk_3.png diff --git a/code/web/api/data/ryzom/interface/tb_desk_4.png b/code/web/public_php/api/data/ryzom/interface/tb_desk_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_desk_4.png rename to code/web/public_php/api/data/ryzom/interface/tb_desk_4.png diff --git a/code/web/api/data/ryzom/interface/tb_faction.png b/code/web/public_php/api/data/ryzom/interface/tb_faction.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_faction.png rename to code/web/public_php/api/data/ryzom/interface/tb_faction.png diff --git a/code/web/api/data/ryzom/interface/tb_forum.png b/code/web/public_php/api/data/ryzom/interface/tb_forum.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_forum.png rename to code/web/public_php/api/data/ryzom/interface/tb_forum.png diff --git a/code/web/api/data/ryzom/interface/tb_guild.png b/code/web/public_php/api/data/ryzom/interface/tb_guild.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_guild.png rename to code/web/public_php/api/data/ryzom/interface/tb_guild.png diff --git a/code/web/api/data/ryzom/interface/tb_help2.png b/code/web/public_php/api/data/ryzom/interface/tb_help2.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_help2.png rename to code/web/public_php/api/data/ryzom/interface/tb_help2.png diff --git a/code/web/api/data/ryzom/interface/tb_keys.png b/code/web/public_php/api/data/ryzom/interface/tb_keys.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_keys.png rename to code/web/public_php/api/data/ryzom/interface/tb_keys.png diff --git a/code/web/api/data/ryzom/interface/tb_macros.png b/code/web/public_php/api/data/ryzom/interface/tb_macros.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_macros.png rename to code/web/public_php/api/data/ryzom/interface/tb_macros.png diff --git a/code/web/api/data/ryzom/interface/tb_mail.png b/code/web/public_php/api/data/ryzom/interface/tb_mail.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_mail.png rename to code/web/public_php/api/data/ryzom/interface/tb_mail.png diff --git a/code/web/api/data/ryzom/interface/tb_mode.png b/code/web/public_php/api/data/ryzom/interface/tb_mode.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_mode.png rename to code/web/public_php/api/data/ryzom/interface/tb_mode.png diff --git a/code/web/api/data/ryzom/interface/tb_mode_dodge.png b/code/web/public_php/api/data/ryzom/interface/tb_mode_dodge.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_mode_dodge.png rename to code/web/public_php/api/data/ryzom/interface/tb_mode_dodge.png diff --git a/code/web/api/data/ryzom/interface/tb_mode_parry.png b/code/web/public_php/api/data/ryzom/interface/tb_mode_parry.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_mode_parry.png rename to code/web/public_php/api/data/ryzom/interface/tb_mode_parry.png diff --git a/code/web/api/data/ryzom/interface/tb_over.png b/code/web/public_php/api/data/ryzom/interface/tb_over.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_over.png rename to code/web/public_php/api/data/ryzom/interface/tb_over.png diff --git a/code/web/api/data/ryzom/interface/tb_support.png b/code/web/public_php/api/data/ryzom/interface/tb_support.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_support.png rename to code/web/public_php/api/data/ryzom/interface/tb_support.png diff --git a/code/web/api/data/ryzom/interface/tb_team.png b/code/web/public_php/api/data/ryzom/interface/tb_team.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_team.png rename to code/web/public_php/api/data/ryzom/interface/tb_team.png diff --git a/code/web/api/data/ryzom/interface/tb_windows.png b/code/web/public_php/api/data/ryzom/interface/tb_windows.png similarity index 100% rename from code/web/api/data/ryzom/interface/tb_windows.png rename to code/web/public_php/api/data/ryzom/interface/tb_windows.png diff --git a/code/web/api/data/ryzom/interface/tetekitin.png b/code/web/public_php/api/data/ryzom/interface/tetekitin.png similarity index 100% rename from code/web/api/data/ryzom/interface/tetekitin.png rename to code/web/public_php/api/data/ryzom/interface/tetekitin.png diff --git a/code/web/api/data/ryzom/interface/to_ammo.png b/code/web/public_php/api/data/ryzom/interface/to_ammo.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_ammo.png rename to code/web/public_php/api/data/ryzom/interface/to_ammo.png diff --git a/code/web/api/data/ryzom/interface/to_armor.png b/code/web/public_php/api/data/ryzom/interface/to_armor.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_armor.png rename to code/web/public_php/api/data/ryzom/interface/to_armor.png diff --git a/code/web/api/data/ryzom/interface/to_cooking_pot.png b/code/web/public_php/api/data/ryzom/interface/to_cooking_pot.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_cooking_pot.png rename to code/web/public_php/api/data/ryzom/interface/to_cooking_pot.png diff --git a/code/web/api/data/ryzom/interface/to_fishing_rod.png b/code/web/public_php/api/data/ryzom/interface/to_fishing_rod.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_fishing_rod.png rename to code/web/public_php/api/data/ryzom/interface/to_fishing_rod.png diff --git a/code/web/api/data/ryzom/interface/to_forage.png b/code/web/public_php/api/data/ryzom/interface/to_forage.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_forage.png rename to code/web/public_php/api/data/ryzom/interface/to_forage.png diff --git a/code/web/api/data/ryzom/interface/to_hammer.png b/code/web/public_php/api/data/ryzom/interface/to_hammer.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_hammer.png rename to code/web/public_php/api/data/ryzom/interface/to_hammer.png diff --git a/code/web/api/data/ryzom/interface/to_jewelry_hammer.png b/code/web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_jewelry_hammer.png rename to code/web/public_php/api/data/ryzom/interface/to_jewelry_hammer.png diff --git a/code/web/api/data/ryzom/interface/to_jewels.png b/code/web/public_php/api/data/ryzom/interface/to_jewels.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_jewels.png rename to code/web/public_php/api/data/ryzom/interface/to_jewels.png diff --git a/code/web/api/data/ryzom/interface/to_leathercutter.png b/code/web/public_php/api/data/ryzom/interface/to_leathercutter.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_leathercutter.png rename to code/web/public_php/api/data/ryzom/interface/to_leathercutter.png diff --git a/code/web/api/data/ryzom/interface/to_melee.png b/code/web/public_php/api/data/ryzom/interface/to_melee.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_melee.png rename to code/web/public_php/api/data/ryzom/interface/to_melee.png diff --git a/code/web/api/data/ryzom/interface/to_needle.png b/code/web/public_php/api/data/ryzom/interface/to_needle.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_needle.png rename to code/web/public_php/api/data/ryzom/interface/to_needle.png diff --git a/code/web/api/data/ryzom/interface/to_pestle.png b/code/web/public_php/api/data/ryzom/interface/to_pestle.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_pestle.png rename to code/web/public_php/api/data/ryzom/interface/to_pestle.png diff --git a/code/web/api/data/ryzom/interface/to_range.png b/code/web/public_php/api/data/ryzom/interface/to_range.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_range.png rename to code/web/public_php/api/data/ryzom/interface/to_range.png diff --git a/code/web/api/data/ryzom/interface/to_searake.png b/code/web/public_php/api/data/ryzom/interface/to_searake.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_searake.png rename to code/web/public_php/api/data/ryzom/interface/to_searake.png diff --git a/code/web/api/data/ryzom/interface/to_spade.png b/code/web/public_php/api/data/ryzom/interface/to_spade.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_spade.png rename to code/web/public_php/api/data/ryzom/interface/to_spade.png diff --git a/code/web/api/data/ryzom/interface/to_stick.png b/code/web/public_php/api/data/ryzom/interface/to_stick.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_stick.png rename to code/web/public_php/api/data/ryzom/interface/to_stick.png diff --git a/code/web/api/data/ryzom/interface/to_tunneling_knife.png b/code/web/public_php/api/data/ryzom/interface/to_tunneling_knife.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_tunneling_knife.png rename to code/web/public_php/api/data/ryzom/interface/to_tunneling_knife.png diff --git a/code/web/api/data/ryzom/interface/to_whip.png b/code/web/public_php/api/data/ryzom/interface/to_whip.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_whip.png rename to code/web/public_php/api/data/ryzom/interface/to_whip.png diff --git a/code/web/api/data/ryzom/interface/to_wrench.png b/code/web/public_php/api/data/ryzom/interface/to_wrench.png similarity index 100% rename from code/web/api/data/ryzom/interface/to_wrench.png rename to code/web/public_php/api/data/ryzom/interface/to_wrench.png diff --git a/code/web/api/data/ryzom/interface/tp_caravane.png b/code/web/public_php/api/data/ryzom/interface/tp_caravane.png similarity index 100% rename from code/web/api/data/ryzom/interface/tp_caravane.png rename to code/web/public_php/api/data/ryzom/interface/tp_caravane.png diff --git a/code/web/api/data/ryzom/interface/tp_kami.png b/code/web/public_php/api/data/ryzom/interface/tp_kami.png similarity index 100% rename from code/web/api/data/ryzom/interface/tp_kami.png rename to code/web/public_php/api/data/ryzom/interface/tp_kami.png diff --git a/code/web/api/data/ryzom/interface/us_back_0.png b/code/web/public_php/api/data/ryzom/interface/us_back_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_0.png rename to code/web/public_php/api/data/ryzom/interface/us_back_0.png diff --git a/code/web/api/data/ryzom/interface/us_back_1.png b/code/web/public_php/api/data/ryzom/interface/us_back_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_1.png rename to code/web/public_php/api/data/ryzom/interface/us_back_1.png diff --git a/code/web/api/data/ryzom/interface/us_back_2.png b/code/web/public_php/api/data/ryzom/interface/us_back_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_2.png rename to code/web/public_php/api/data/ryzom/interface/us_back_2.png diff --git a/code/web/api/data/ryzom/interface/us_back_3.png b/code/web/public_php/api/data/ryzom/interface/us_back_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_3.png rename to code/web/public_php/api/data/ryzom/interface/us_back_3.png diff --git a/code/web/api/data/ryzom/interface/us_back_4.png b/code/web/public_php/api/data/ryzom/interface/us_back_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_4.png rename to code/web/public_php/api/data/ryzom/interface/us_back_4.png diff --git a/code/web/api/data/ryzom/interface/us_back_5.png b/code/web/public_php/api/data/ryzom/interface/us_back_5.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_5.png rename to code/web/public_php/api/data/ryzom/interface/us_back_5.png diff --git a/code/web/api/data/ryzom/interface/us_back_6.png b/code/web/public_php/api/data/ryzom/interface/us_back_6.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_6.png rename to code/web/public_php/api/data/ryzom/interface/us_back_6.png diff --git a/code/web/api/data/ryzom/interface/us_back_7.png b/code/web/public_php/api/data/ryzom/interface/us_back_7.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_7.png rename to code/web/public_php/api/data/ryzom/interface/us_back_7.png diff --git a/code/web/api/data/ryzom/interface/us_back_8.png b/code/web/public_php/api/data/ryzom/interface/us_back_8.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_8.png rename to code/web/public_php/api/data/ryzom/interface/us_back_8.png diff --git a/code/web/api/data/ryzom/interface/us_back_9.png b/code/web/public_php/api/data/ryzom/interface/us_back_9.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_back_9.png rename to code/web/public_php/api/data/ryzom/interface/us_back_9.png diff --git a/code/web/api/data/ryzom/interface/us_ico_0.png b/code/web/public_php/api/data/ryzom/interface/us_ico_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_0.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_0.png diff --git a/code/web/api/data/ryzom/interface/us_ico_1.png b/code/web/public_php/api/data/ryzom/interface/us_ico_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_1.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_1.png diff --git a/code/web/api/data/ryzom/interface/us_ico_2.png b/code/web/public_php/api/data/ryzom/interface/us_ico_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_2.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_2.png diff --git a/code/web/api/data/ryzom/interface/us_ico_3.png b/code/web/public_php/api/data/ryzom/interface/us_ico_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_3.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_3.png diff --git a/code/web/api/data/ryzom/interface/us_ico_4.png b/code/web/public_php/api/data/ryzom/interface/us_ico_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_4.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_4.png diff --git a/code/web/api/data/ryzom/interface/us_ico_5.png b/code/web/public_php/api/data/ryzom/interface/us_ico_5.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_5.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_5.png diff --git a/code/web/api/data/ryzom/interface/us_ico_6.png b/code/web/public_php/api/data/ryzom/interface/us_ico_6.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_6.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_6.png diff --git a/code/web/api/data/ryzom/interface/us_ico_7.png b/code/web/public_php/api/data/ryzom/interface/us_ico_7.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_7.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_7.png diff --git a/code/web/api/data/ryzom/interface/us_ico_8.png b/code/web/public_php/api/data/ryzom/interface/us_ico_8.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_8.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_8.png diff --git a/code/web/api/data/ryzom/interface/us_ico_9.png b/code/web/public_php/api/data/ryzom/interface/us_ico_9.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_ico_9.png rename to code/web/public_php/api/data/ryzom/interface/us_ico_9.png diff --git a/code/web/api/data/ryzom/interface/us_over_0.png b/code/web/public_php/api/data/ryzom/interface/us_over_0.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_over_0.png rename to code/web/public_php/api/data/ryzom/interface/us_over_0.png diff --git a/code/web/api/data/ryzom/interface/us_over_1.png b/code/web/public_php/api/data/ryzom/interface/us_over_1.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_over_1.png rename to code/web/public_php/api/data/ryzom/interface/us_over_1.png diff --git a/code/web/api/data/ryzom/interface/us_over_2.png b/code/web/public_php/api/data/ryzom/interface/us_over_2.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_over_2.png rename to code/web/public_php/api/data/ryzom/interface/us_over_2.png diff --git a/code/web/api/data/ryzom/interface/us_over_3.png b/code/web/public_php/api/data/ryzom/interface/us_over_3.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_over_3.png rename to code/web/public_php/api/data/ryzom/interface/us_over_3.png diff --git a/code/web/api/data/ryzom/interface/us_over_4.png b/code/web/public_php/api/data/ryzom/interface/us_over_4.png similarity index 100% rename from code/web/api/data/ryzom/interface/us_over_4.png rename to code/web/public_php/api/data/ryzom/interface/us_over_4.png diff --git a/code/web/api/data/ryzom/interface/w_am_logo.png b/code/web/public_php/api/data/ryzom/interface/w_am_logo.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_am_logo.png rename to code/web/public_php/api/data/ryzom/interface/w_am_logo.png diff --git a/code/web/api/data/ryzom/interface/w_leader.png b/code/web/public_php/api/data/ryzom/interface/w_leader.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_leader.png rename to code/web/public_php/api/data/ryzom/interface/w_leader.png diff --git a/code/web/api/data/ryzom/interface/w_major.png b/code/web/public_php/api/data/ryzom/interface/w_major.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_major.png rename to code/web/public_php/api/data/ryzom/interface/w_major.png diff --git a/code/web/api/data/ryzom/interface/w_pa_anklet.png b/code/web/public_php/api/data/ryzom/interface/w_pa_anklet.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_anklet.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_anklet.png diff --git a/code/web/api/data/ryzom/interface/w_pa_bracelet.png b/code/web/public_php/api/data/ryzom/interface/w_pa_bracelet.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_bracelet.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_bracelet.png diff --git a/code/web/api/data/ryzom/interface/w_pa_diadem.png b/code/web/public_php/api/data/ryzom/interface/w_pa_diadem.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_diadem.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_diadem.png diff --git a/code/web/api/data/ryzom/interface/w_pa_earring.png b/code/web/public_php/api/data/ryzom/interface/w_pa_earring.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_earring.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_earring.png diff --git a/code/web/api/data/ryzom/interface/w_pa_pendant.png b/code/web/public_php/api/data/ryzom/interface/w_pa_pendant.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_pendant.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_pendant.png diff --git a/code/web/api/data/ryzom/interface/w_pa_ring.png b/code/web/public_php/api/data/ryzom/interface/w_pa_ring.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_pa_ring.png rename to code/web/public_php/api/data/ryzom/interface/w_pa_ring.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id0.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id0.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id0.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id1.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id1.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id1.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id2.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id2.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id2.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id3.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id3.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id3.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id4.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id4.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id4.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id5.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id5.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id5.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id6.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id6.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id6.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id7.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id7.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id7.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id8.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id8.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id8.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_id9.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_id9.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_id9.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id0.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id1.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id2.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id3.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id4.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id5.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id6.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id7.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id8.png diff --git a/code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png b/code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png similarity index 100% rename from code/web/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png rename to code/web/public_php/api/data/ryzom/interface/w_slot_shortcut_shift_id9.png diff --git a/code/web/api/data/ryzom/interface/xp_cat_green.png b/code/web/public_php/api/data/ryzom/interface/xp_cat_green.png similarity index 100% rename from code/web/api/data/ryzom/interface/xp_cat_green.png rename to code/web/public_php/api/data/ryzom/interface/xp_cat_green.png diff --git a/code/web/api/data/ryzom/items_db.php b/code/web/public_php/api/data/ryzom/items_db.php similarity index 100% rename from code/web/api/data/ryzom/items_db.php rename to code/web/public_php/api/data/ryzom/items_db.php diff --git a/code/web/api/data/ryzom/ryShapesPs.php b/code/web/public_php/api/data/ryzom/ryShapesPs.php similarity index 100% rename from code/web/api/data/ryzom/ryShapesPs.php rename to code/web/public_php/api/data/ryzom/ryShapesPs.php diff --git a/code/web/api/data/ryzom/sbrick_db.php b/code/web/public_php/api/data/ryzom/sbrick_db.php similarity index 100% rename from code/web/api/data/ryzom/sbrick_db.php rename to code/web/public_php/api/data/ryzom/sbrick_db.php diff --git a/code/web/api/index.php b/code/web/public_php/api/index.php similarity index 100% rename from code/web/api/index.php rename to code/web/public_php/api/index.php diff --git a/code/web/api/player_auth.php b/code/web/public_php/api/player_auth.php similarity index 100% rename from code/web/api/player_auth.php rename to code/web/public_php/api/player_auth.php diff --git a/code/web/api/ryzom_api.php b/code/web/public_php/api/ryzom_api.php similarity index 100% rename from code/web/api/ryzom_api.php rename to code/web/public_php/api/ryzom_api.php diff --git a/code/web/api/server/auth.php b/code/web/public_php/api/server/auth.php similarity index 100% rename from code/web/api/server/auth.php rename to code/web/public_php/api/server/auth.php diff --git a/code/web/api/server/config.php.default b/code/web/public_php/api/server/config.php.default similarity index 100% rename from code/web/api/server/config.php.default rename to code/web/public_php/api/server/config.php.default diff --git a/code/web/api/server/guilds.php b/code/web/public_php/api/server/guilds.php similarity index 100% rename from code/web/api/server/guilds.php rename to code/web/public_php/api/server/guilds.php diff --git a/code/web/api/server/hmagic.php b/code/web/public_php/api/server/hmagic.php similarity index 100% rename from code/web/api/server/hmagic.php rename to code/web/public_php/api/server/hmagic.php diff --git a/code/web/api/server/item_icon.php b/code/web/public_php/api/server/item_icon.php similarity index 100% rename from code/web/api/server/item_icon.php rename to code/web/public_php/api/server/item_icon.php diff --git a/code/web/api/server/scripts/achievement_script/AchWebParser.php b/code/web/public_php/api/server/scripts/achievement_script/AchWebParser.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/AchWebParser.php rename to code/web/public_php/api/server/scripts/achievement_script/AchWebParser.php diff --git a/code/web/api/server/scripts/achievement_script/_test/char_346.xml b/code/web/public_php/api/server/scripts/achievement_script/_test/char_346.xml similarity index 100% rename from code/web/api/server/scripts/achievement_script/_test/char_346.xml rename to code/web/public_php/api/server/scripts/achievement_script/_test/char_346.xml diff --git a/code/web/api/server/scripts/achievement_script/_test/diff_class.php b/code/web/public_php/api/server/scripts/achievement_script/_test/diff_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/_test/diff_class.php rename to code/web/public_php/api/server/scripts/achievement_script/_test/diff_class.php diff --git a/code/web/api/server/scripts/achievement_script/_test/diff_test.php b/code/web/public_php/api/server/scripts/achievement_script/_test/diff_test.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/_test/diff_test.php rename to code/web/public_php/api/server/scripts/achievement_script/_test/diff_test.php diff --git a/code/web/api/server/scripts/achievement_script/_test/old_char_346.xml b/code/web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml similarity index 100% rename from code/web/api/server/scripts/achievement_script/_test/old_char_346.xml rename to code/web/public_php/api/server/scripts/achievement_script/_test/old_char_346.xml diff --git a/code/web/api/server/scripts/achievement_script/class/Atom_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/Atom_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/Atom_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/Atom_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/Callback_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/Callback_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/Callback_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/Callback_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/DataDispatcher_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/DataDispatcher_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/DataDispatcher_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/DataSourceHandler_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/DataSourceHandler_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/DataSourceHandler_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/Entity_abstract.php b/code/web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/Entity_abstract.php rename to code/web/public_php/api/server/scripts/achievement_script/class/Entity_abstract.php diff --git a/code/web/api/server/scripts/achievement_script/class/Logfile_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/Logfile_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/Logfile_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/SourceDriver_abstract.php b/code/web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/SourceDriver_abstract.php rename to code/web/public_php/api/server/scripts/achievement_script/class/SourceDriver_abstract.php diff --git a/code/web/api/server/scripts/achievement_script/class/Stats_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/Stats_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/Stats_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/Stats_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/ValueCache_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/ValueCache_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/ValueCache_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/XMLfile_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/XMLfile_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/XMLfile_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/XMLgenerator_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/XMLgenerator_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/XMLgenerator_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/XMLnode_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/XMLnode_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/XMLnode_class.php diff --git a/code/web/api/server/scripts/achievement_script/class/mySQL_class.php b/code/web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/class/mySQL_class.php rename to code/web/public_php/api/server/scripts/achievement_script/class/mySQL_class.php diff --git a/code/web/api/server/scripts/achievement_script/conf.php b/code/web/public_php/api/server/scripts/achievement_script/conf.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/conf.php rename to code/web/public_php/api/server/scripts/achievement_script/conf.php diff --git a/code/web/api/server/scripts/achievement_script/include/functions_inc.php b/code/web/public_php/api/server/scripts/achievement_script/include/functions_inc.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/include/functions_inc.php rename to code/web/public_php/api/server/scripts/achievement_script/include/functions_inc.php diff --git a/code/web/api/server/scripts/achievement_script/launch_parse_new_xml.sh b/code/web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh similarity index 100% rename from code/web/api/server/scripts/achievement_script/launch_parse_new_xml.sh rename to code/web/public_php/api/server/scripts/achievement_script/launch_parse_new_xml.sh diff --git a/code/web/api/server/scripts/achievement_script/log/_logDefaultDir_ b/code/web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_ similarity index 100% rename from code/web/api/server/scripts/achievement_script/log/_logDefaultDir_ rename to code/web/public_php/api/server/scripts/achievement_script/log/_logDefaultDir_ diff --git a/code/web/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir b/code/web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir similarity index 100% rename from code/web/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir rename to code/web/public_php/api/server/scripts/achievement_script/log/xml_tmp/_xml_tmp_dir diff --git a/code/web/api/server/scripts/achievement_script/parse_new_xml.sh b/code/web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh similarity index 100% rename from code/web/api/server/scripts/achievement_script/parse_new_xml.sh rename to code/web/public_php/api/server/scripts/achievement_script/parse_new_xml.sh diff --git a/code/web/api/server/scripts/achievement_script/script/_scriptDir b/code/web/public_php/api/server/scripts/achievement_script/script/_scriptDir similarity index 100% rename from code/web/api/server/scripts/achievement_script/script/_scriptDir rename to code/web/public_php/api/server/scripts/achievement_script/script/_scriptDir diff --git a/code/web/api/server/scripts/achievement_script/script/item_grade_script.php b/code/web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/script/item_grade_script.php rename to code/web/public_php/api/server/scripts/achievement_script/script/item_grade_script.php diff --git a/code/web/api/server/scripts/achievement_script/script/places/continents.php b/code/web/public_php/api/server/scripts/achievement_script/script/places/continents.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/script/places/continents.php rename to code/web/public_php/api/server/scripts/achievement_script/script/places/continents.php diff --git a/code/web/api/server/scripts/achievement_script/script/places/global.php b/code/web/public_php/api/server/scripts/achievement_script/script/places/global.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/script/places/global.php rename to code/web/public_php/api/server/scripts/achievement_script/script/places/global.php diff --git a/code/web/api/server/scripts/achievement_script/script/statsdb.php b/code/web/public_php/api/server/scripts/achievement_script/script/statsdb.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/script/statsdb.php rename to code/web/public_php/api/server/scripts/achievement_script/script/statsdb.php diff --git a/code/web/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php b/code/web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php rename to code/web/public_php/api/server/scripts/achievement_script/source/BillingSummary/BillingSummary_class.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/PDRtoXMLdriver_class.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/DeathPenalty_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FactionPoints_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Fame_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/FriendOf_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friend_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Friendlist_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Gear_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Item_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/LastLogStats_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/MissionList_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Mission_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PermanentMod_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Pet_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysCharacs_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/PhysScores_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Position_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/RespawnPoints_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillList_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SkillPoints_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Skill_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/SpentSkillPoints_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/TPlist_entity.php diff --git a/code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php b/code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php rename to code/web/public_php/api/server/scripts/achievement_script/source/PDRtoXMLdriver/entity/Title_entity.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/debug.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/debug.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/debug.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/debug.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/faction.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/faction.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/faction.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/faction.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/fame.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/fame.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/fame.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/fame.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/inventory.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/inventory.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/inventory.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/knowledge.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/knowledge.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/knowledge.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/logs.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/logs.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/logs.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/logs.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/missions.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/missions.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/missions.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/missions.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/public.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/public.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/public.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/public.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/shop.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/shop.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/shop.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/shop.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/skills.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/skills.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/skills.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/skills.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/social.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/social.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/social.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/social.php diff --git a/code/web/api/server/scripts/achievement_script/xmldef/stats.php b/code/web/public_php/api/server/scripts/achievement_script/xmldef/stats.php similarity index 100% rename from code/web/api/server/scripts/achievement_script/xmldef/stats.php rename to code/web/public_php/api/server/scripts/achievement_script/xmldef/stats.php diff --git a/code/web/api/server/scripts/create_guilds_xml.php b/code/web/public_php/api/server/scripts/create_guilds_xml.php similarity index 100% rename from code/web/api/server/scripts/create_guilds_xml.php rename to code/web/public_php/api/server/scripts/create_guilds_xml.php diff --git a/code/web/api/server/scripts/generate_guild_icon.sh b/code/web/public_php/api/server/scripts/generate_guild_icon.sh similarity index 100% rename from code/web/api/server/scripts/generate_guild_icon.sh rename to code/web/public_php/api/server/scripts/generate_guild_icon.sh diff --git a/code/web/api/server/scripts/get_guilds_xml.sh b/code/web/public_php/api/server/scripts/get_guilds_xml.sh similarity index 100% rename from code/web/api/server/scripts/get_guilds_xml.sh rename to code/web/public_php/api/server/scripts/get_guilds_xml.sh diff --git a/code/web/api/server/time.php b/code/web/public_php/api/server/time.php similarity index 100% rename from code/web/api/server/time.php rename to code/web/public_php/api/server/time.php diff --git a/code/web/api/server/user.php b/code/web/public_php/api/server/user.php similarity index 100% rename from code/web/api/server/user.php rename to code/web/public_php/api/server/user.php diff --git a/code/web/api/server/utils.php b/code/web/public_php/api/server/utils.php similarity index 100% rename from code/web/api/server/utils.php rename to code/web/public_php/api/server/utils.php diff --git a/code/web/api/time.php b/code/web/public_php/api/time.php similarity index 100% rename from code/web/api/time.php rename to code/web/public_php/api/time.php diff --git a/code/web/app/app_achievements/_API/ach_progress.php b/code/web/public_php/app/app_achievements/_API/ach_progress.php similarity index 100% rename from code/web/app/app_achievements/_API/ach_progress.php rename to code/web/public_php/app/app_achievements/_API/ach_progress.php diff --git a/code/web/app/app_achievements/_API/ach_struct.php b/code/web/public_php/app/app_achievements/_API/ach_struct.php similarity index 100% rename from code/web/app/app_achievements/_API/ach_struct.php rename to code/web/public_php/app/app_achievements/_API/ach_struct.php diff --git a/code/web/app/app_achievements/_API/class/mySQL_class.php b/code/web/public_php/app/app_achievements/_API/class/mySQL_class.php similarity index 100% rename from code/web/app/app_achievements/_API/class/mySQL_class.php rename to code/web/public_php/app/app_achievements/_API/class/mySQL_class.php diff --git a/code/web/app/app_achievements/_API/conf.php b/code/web/public_php/app/app_achievements/_API/conf.php similarity index 100% rename from code/web/app/app_achievements/_API/conf.php rename to code/web/public_php/app/app_achievements/_API/conf.php diff --git a/code/web/app/app_achievements/_doc/Class_scheme.dia b/code/web/public_php/app/app_achievements/_doc/Class_scheme.dia similarity index 100% rename from code/web/app/app_achievements/_doc/Class_scheme.dia rename to code/web/public_php/app/app_achievements/_doc/Class_scheme.dia diff --git a/code/web/app/app_achievements/_doc/Class_scheme.png b/code/web/public_php/app/app_achievements/_doc/Class_scheme.png similarity index 100% rename from code/web/app/app_achievements/_doc/Class_scheme.png rename to code/web/public_php/app/app_achievements/_doc/Class_scheme.png diff --git a/code/web/app/app_achievements/_doc/ER & Class Schema.pdf b/code/web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf similarity index 100% rename from code/web/app/app_achievements/_doc/ER & Class Schema.pdf rename to code/web/public_php/app/app_achievements/_doc/ER & Class Schema.pdf diff --git a/code/web/app/app_achievements/_doc/ER_scheme.dia b/code/web/public_php/app/app_achievements/_doc/ER_scheme.dia similarity index 100% rename from code/web/app/app_achievements/_doc/ER_scheme.dia rename to code/web/public_php/app/app_achievements/_doc/ER_scheme.dia diff --git a/code/web/app/app_achievements/_doc/ER_scheme.png b/code/web/public_php/app/app_achievements/_doc/ER_scheme.png similarity index 100% rename from code/web/app/app_achievements/_doc/ER_scheme.png rename to code/web/public_php/app/app_achievements/_doc/ER_scheme.png diff --git a/code/web/app/app_achievements/_doc/Ryzom Player Achievements.pdf b/code/web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf similarity index 100% rename from code/web/app/app_achievements/_doc/Ryzom Player Achievements.pdf rename to code/web/public_php/app/app_achievements/_doc/Ryzom Player Achievements.pdf diff --git a/code/web/app/app_achievements/_doc/devshot_001.jpg b/code/web/public_php/app/app_achievements/_doc/devshot_001.jpg similarity index 100% rename from code/web/app/app_achievements/_doc/devshot_001.jpg rename to code/web/public_php/app/app_achievements/_doc/devshot_001.jpg diff --git a/code/web/app/app_achievements/_doc/devshot_002.jpg b/code/web/public_php/app/app_achievements/_doc/devshot_002.jpg similarity index 100% rename from code/web/app/app_achievements/_doc/devshot_002.jpg rename to code/web/public_php/app/app_achievements/_doc/devshot_002.jpg diff --git a/code/web/app/app_achievements/_doc/devshot_003.jpg b/code/web/public_php/app/app_achievements/_doc/devshot_003.jpg similarity index 100% rename from code/web/app/app_achievements/_doc/devshot_003.jpg rename to code/web/public_php/app/app_achievements/_doc/devshot_003.jpg diff --git a/code/web/app/app_achievements/_doc/devshot_004.jpg b/code/web/public_php/app/app_achievements/_doc/devshot_004.jpg similarity index 100% rename from code/web/app/app_achievements/_doc/devshot_004.jpg rename to code/web/public_php/app/app_achievements/_doc/devshot_004.jpg diff --git a/code/web/app/app_achievements/_doc/structure_app_achievements.sql b/code/web/public_php/app/app_achievements/_doc/structure_app_achievements.sql similarity index 100% rename from code/web/app/app_achievements/_doc/structure_app_achievements.sql rename to code/web/public_php/app/app_achievements/_doc/structure_app_achievements.sql diff --git a/code/web/app/app_achievements/class/AVLTree_class.php b/code/web/public_php/app/app_achievements/class/AVLTree_class.php similarity index 100% rename from code/web/app/app_achievements/class/AVLTree_class.php rename to code/web/public_php/app/app_achievements/class/AVLTree_class.php diff --git a/code/web/app/app_achievements/class/AchAchievement_class.php b/code/web/public_php/app/app_achievements/class/AchAchievement_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchAchievement_class.php rename to code/web/public_php/app/app_achievements/class/AchAchievement_class.php diff --git a/code/web/app/app_achievements/class/AchCategory_class.php b/code/web/public_php/app/app_achievements/class/AchCategory_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchCategory_class.php rename to code/web/public_php/app/app_achievements/class/AchCategory_class.php diff --git a/code/web/app/app_achievements/class/AchList_abstract.php b/code/web/public_php/app/app_achievements/class/AchList_abstract.php similarity index 100% rename from code/web/app/app_achievements/class/AchList_abstract.php rename to code/web/public_php/app/app_achievements/class/AchList_abstract.php diff --git a/code/web/app/app_achievements/class/AchMenuNode_class.php b/code/web/public_php/app/app_achievements/class/AchMenuNode_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchMenuNode_class.php rename to code/web/public_php/app/app_achievements/class/AchMenuNode_class.php diff --git a/code/web/app/app_achievements/class/AchMenu_class.php b/code/web/public_php/app/app_achievements/class/AchMenu_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchMenu_class.php rename to code/web/public_php/app/app_achievements/class/AchMenu_class.php diff --git a/code/web/app/app_achievements/class/AchObjective_class.php b/code/web/public_php/app/app_achievements/class/AchObjective_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchObjective_class.php rename to code/web/public_php/app/app_achievements/class/AchObjective_class.php diff --git a/code/web/app/app_achievements/class/AchSummary_class.php b/code/web/public_php/app/app_achievements/class/AchSummary_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchSummary_class.php rename to code/web/public_php/app/app_achievements/class/AchSummary_class.php diff --git a/code/web/app/app_achievements/class/AchTask_class.php b/code/web/public_php/app/app_achievements/class/AchTask_class.php similarity index 100% rename from code/web/app/app_achievements/class/AchTask_class.php rename to code/web/public_php/app/app_achievements/class/AchTask_class.php diff --git a/code/web/app/app_achievements/class/DLL_class.php b/code/web/public_php/app/app_achievements/class/DLL_class.php similarity index 100% rename from code/web/app/app_achievements/class/DLL_class.php rename to code/web/public_php/app/app_achievements/class/DLL_class.php diff --git a/code/web/app/app_achievements/class/InDev_trait.php b/code/web/public_php/app/app_achievements/class/InDev_trait.php similarity index 100% rename from code/web/app/app_achievements/class/InDev_trait.php rename to code/web/public_php/app/app_achievements/class/InDev_trait.php diff --git a/code/web/app/app_achievements/class/NodeIterator_class.php b/code/web/public_php/app/app_achievements/class/NodeIterator_class.php similarity index 100% rename from code/web/app/app_achievements/class/NodeIterator_class.php rename to code/web/public_php/app/app_achievements/class/NodeIterator_class.php diff --git a/code/web/app/app_achievements/class/Node_abstract.php b/code/web/public_php/app/app_achievements/class/Node_abstract.php similarity index 100% rename from code/web/app/app_achievements/class/Node_abstract.php rename to code/web/public_php/app/app_achievements/class/Node_abstract.php diff --git a/code/web/app/app_achievements/class/Parentum_abstract.php b/code/web/public_php/app/app_achievements/class/Parentum_abstract.php similarity index 100% rename from code/web/app/app_achievements/class/Parentum_abstract.php rename to code/web/public_php/app/app_achievements/class/Parentum_abstract.php diff --git a/code/web/app/app_achievements/class/RyzomUser_class.php b/code/web/public_php/app/app_achievements/class/RyzomUser_class.php similarity index 100% rename from code/web/app/app_achievements/class/RyzomUser_class.php rename to code/web/public_php/app/app_achievements/class/RyzomUser_class.php diff --git a/code/web/app/app_achievements/class/Tieable_inter.php b/code/web/public_php/app/app_achievements/class/Tieable_inter.php similarity index 100% rename from code/web/app/app_achievements/class/Tieable_inter.php rename to code/web/public_php/app/app_achievements/class/Tieable_inter.php diff --git a/code/web/app/app_achievements/conf.php b/code/web/public_php/app/app_achievements/conf.php similarity index 100% rename from code/web/app/app_achievements/conf.php rename to code/web/public_php/app/app_achievements/conf.php diff --git a/code/web/app/app_achievements/favicon.ico b/code/web/public_php/app/app_achievements/favicon.ico similarity index 100% rename from code/web/app/app_achievements/favicon.ico rename to code/web/public_php/app/app_achievements/favicon.ico diff --git a/code/web/app/app_achievements/favicon.png b/code/web/public_php/app/app_achievements/favicon.png similarity index 100% rename from code/web/app/app_achievements/favicon.png rename to code/web/public_php/app/app_achievements/favicon.png diff --git a/code/web/app/app_achievements/fb/base_facebook.php b/code/web/public_php/app/app_achievements/fb/base_facebook.php similarity index 100% rename from code/web/app/app_achievements/fb/base_facebook.php rename to code/web/public_php/app/app_achievements/fb/base_facebook.php diff --git a/code/web/app/app_achievements/fb/facebook.php b/code/web/public_php/app/app_achievements/fb/facebook.php similarity index 100% rename from code/web/app/app_achievements/fb/facebook.php rename to code/web/public_php/app/app_achievements/fb/facebook.php diff --git a/code/web/app/app_achievements/fb/fb_ca_chain_bundle.crt b/code/web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt similarity index 100% rename from code/web/app/app_achievements/fb/fb_ca_chain_bundle.crt rename to code/web/public_php/app/app_achievements/fb/fb_ca_chain_bundle.crt diff --git a/code/web/app/app_achievements/include/ach_render_common.php b/code/web/public_php/app/app_achievements/include/ach_render_common.php similarity index 100% rename from code/web/app/app_achievements/include/ach_render_common.php rename to code/web/public_php/app/app_achievements/include/ach_render_common.php diff --git a/code/web/app/app_achievements/include/ach_render_ig.php b/code/web/public_php/app/app_achievements/include/ach_render_ig.php similarity index 100% rename from code/web/app/app_achievements/include/ach_render_ig.php rename to code/web/public_php/app/app_achievements/include/ach_render_ig.php diff --git a/code/web/app/app_achievements/include/ach_render_web.php b/code/web/public_php/app/app_achievements/include/ach_render_web.php similarity index 100% rename from code/web/app/app_achievements/include/ach_render_web.php rename to code/web/public_php/app/app_achievements/include/ach_render_web.php diff --git a/code/web/app/app_achievements/index.php b/code/web/public_php/app/app_achievements/index.php similarity index 100% rename from code/web/app/app_achievements/index.php rename to code/web/public_php/app/app_achievements/index.php diff --git a/code/web/app/app_achievements/lang.php b/code/web/public_php/app/app_achievements/lang.php similarity index 100% rename from code/web/app/app_achievements/lang.php rename to code/web/public_php/app/app_achievements/lang.php diff --git a/code/web/app/app_achievements/pic/ach_news.png b/code/web/public_php/app/app_achievements/pic/ach_news.png similarity index 100% rename from code/web/app/app_achievements/pic/ach_news.png rename to code/web/public_php/app/app_achievements/pic/ach_news.png diff --git a/code/web/app/app_achievements/pic/bar_done_b.png b/code/web/public_php/app/app_achievements/pic/bar_done_b.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_b.png rename to code/web/public_php/app/app_achievements/pic/bar_done_b.png diff --git a/code/web/app/app_achievements/pic/bar_done_bg.png b/code/web/public_php/app/app_achievements/pic/bar_done_bg.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_bg.png rename to code/web/public_php/app/app_achievements/pic/bar_done_bg.png diff --git a/code/web/app/app_achievements/pic/bar_done_bl.png b/code/web/public_php/app/app_achievements/pic/bar_done_bl.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_bl.png rename to code/web/public_php/app/app_achievements/pic/bar_done_bl.png diff --git a/code/web/app/app_achievements/pic/bar_done_br.png b/code/web/public_php/app/app_achievements/pic/bar_done_br.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_br.png rename to code/web/public_php/app/app_achievements/pic/bar_done_br.png diff --git a/code/web/app/app_achievements/pic/bar_done_l.png b/code/web/public_php/app/app_achievements/pic/bar_done_l.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_l.png rename to code/web/public_php/app/app_achievements/pic/bar_done_l.png diff --git a/code/web/app/app_achievements/pic/bar_done_r.png b/code/web/public_php/app/app_achievements/pic/bar_done_r.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_r.png rename to code/web/public_php/app/app_achievements/pic/bar_done_r.png diff --git a/code/web/app/app_achievements/pic/bar_done_u.png b/code/web/public_php/app/app_achievements/pic/bar_done_u.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_u.png rename to code/web/public_php/app/app_achievements/pic/bar_done_u.png diff --git a/code/web/app/app_achievements/pic/bar_done_ul.png b/code/web/public_php/app/app_achievements/pic/bar_done_ul.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_ul.png rename to code/web/public_php/app/app_achievements/pic/bar_done_ul.png diff --git a/code/web/app/app_achievements/pic/bar_done_ur.png b/code/web/public_php/app/app_achievements/pic/bar_done_ur.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_done_ur.png rename to code/web/public_php/app/app_achievements/pic/bar_done_ur.png diff --git a/code/web/app/app_achievements/pic/bar_pending_b.png b/code/web/public_php/app/app_achievements/pic/bar_pending_b.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_b.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_b.png diff --git a/code/web/app/app_achievements/pic/bar_pending_bl.png b/code/web/public_php/app/app_achievements/pic/bar_pending_bl.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_bl.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_bl.png diff --git a/code/web/app/app_achievements/pic/bar_pending_br.png b/code/web/public_php/app/app_achievements/pic/bar_pending_br.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_br.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_br.png diff --git a/code/web/app/app_achievements/pic/bar_pending_l.png b/code/web/public_php/app/app_achievements/pic/bar_pending_l.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_l.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_l.png diff --git a/code/web/app/app_achievements/pic/bar_pending_r.png b/code/web/public_php/app/app_achievements/pic/bar_pending_r.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_r.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_r.png diff --git a/code/web/app/app_achievements/pic/bar_pending_u.png b/code/web/public_php/app/app_achievements/pic/bar_pending_u.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_u.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_u.png diff --git a/code/web/app/app_achievements/pic/bar_pending_ul.png b/code/web/public_php/app/app_achievements/pic/bar_pending_ul.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_ul.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_ul.png diff --git a/code/web/app/app_achievements/pic/bar_pending_ur.png b/code/web/public_php/app/app_achievements/pic/bar_pending_ur.png similarity index 100% rename from code/web/app/app_achievements/pic/bar_pending_ur.png rename to code/web/public_php/app/app_achievements/pic/bar_pending_ur.png diff --git a/code/web/app/app_achievements/pic/check.png b/code/web/public_php/app/app_achievements/pic/check.png similarity index 100% rename from code/web/app/app_achievements/pic/check.png rename to code/web/public_php/app/app_achievements/pic/check.png diff --git a/code/web/app/app_achievements/pic/f-connect.png b/code/web/public_php/app/app_achievements/pic/f-connect.png similarity index 100% rename from code/web/app/app_achievements/pic/f-connect.png rename to code/web/public_php/app/app_achievements/pic/f-connect.png diff --git a/code/web/app/app_achievements/pic/facebook-logo.png b/code/web/public_php/app/app_achievements/pic/facebook-logo.png similarity index 100% rename from code/web/app/app_achievements/pic/facebook-logo.png rename to code/web/public_php/app/app_achievements/pic/facebook-logo.png diff --git a/code/web/app/app_achievements/pic/icon/grey/small/test.png b/code/web/public_php/app/app_achievements/pic/icon/grey/small/test.png similarity index 100% rename from code/web/app/app_achievements/pic/icon/grey/small/test.png rename to code/web/public_php/app/app_achievements/pic/icon/grey/small/test.png diff --git a/code/web/app/app_achievements/pic/icon/grey/test.png b/code/web/public_php/app/app_achievements/pic/icon/grey/test.png similarity index 100% rename from code/web/app/app_achievements/pic/icon/grey/test.png rename to code/web/public_php/app/app_achievements/pic/icon/grey/test.png diff --git a/code/web/app/app_achievements/pic/icon/small/test.png b/code/web/public_php/app/app_achievements/pic/icon/small/test.png similarity index 100% rename from code/web/app/app_achievements/pic/icon/small/test.png rename to code/web/public_php/app/app_achievements/pic/icon/small/test.png diff --git a/code/web/app/app_achievements/pic/icon/test.png b/code/web/public_php/app/app_achievements/pic/icon/test.png similarity index 100% rename from code/web/app/app_achievements/pic/icon/test.png rename to code/web/public_php/app/app_achievements/pic/icon/test.png diff --git a/code/web/app/app_achievements/pic/menu/ig_summary.png b/code/web/public_php/app/app_achievements/pic/menu/ig_summary.png similarity index 100% rename from code/web/app/app_achievements/pic/menu/ig_summary.png rename to code/web/public_php/app/app_achievements/pic/menu/ig_summary.png diff --git a/code/web/app/app_achievements/pic/menu/ig_test.png b/code/web/public_php/app/app_achievements/pic/menu/ig_test.png similarity index 100% rename from code/web/app/app_achievements/pic/menu/ig_test.png rename to code/web/public_php/app/app_achievements/pic/menu/ig_test.png diff --git a/code/web/app/app_achievements/pic/menu/summary.png b/code/web/public_php/app/app_achievements/pic/menu/summary.png similarity index 100% rename from code/web/app/app_achievements/pic/menu/summary.png rename to code/web/public_php/app/app_achievements/pic/menu/summary.png diff --git a/code/web/app/app_achievements/pic/menu/test.png b/code/web/public_php/app/app_achievements/pic/menu/test.png similarity index 100% rename from code/web/app/app_achievements/pic/menu/test.png rename to code/web/public_php/app/app_achievements/pic/menu/test.png diff --git a/code/web/app/app_achievements/pic/menu_space.png b/code/web/public_php/app/app_achievements/pic/menu_space.png similarity index 100% rename from code/web/app/app_achievements/pic/menu_space.png rename to code/web/public_php/app/app_achievements/pic/menu_space.png diff --git a/code/web/app/app_achievements/pic/pending.png b/code/web/public_php/app/app_achievements/pic/pending.png similarity index 100% rename from code/web/app/app_achievements/pic/pending.png rename to code/web/public_php/app/app_achievements/pic/pending.png diff --git a/code/web/app/app_achievements/pic/star_done.png b/code/web/public_php/app/app_achievements/pic/star_done.png similarity index 100% rename from code/web/app/app_achievements/pic/star_done.png rename to code/web/public_php/app/app_achievements/pic/star_done.png diff --git a/code/web/app/app_achievements/pic/yubo_done.png b/code/web/public_php/app/app_achievements/pic/yubo_done.png similarity index 100% rename from code/web/app/app_achievements/pic/yubo_done.png rename to code/web/public_php/app/app_achievements/pic/yubo_done.png diff --git a/code/web/app/app_achievements/pic/yubo_done_small.png b/code/web/public_php/app/app_achievements/pic/yubo_done_small.png similarity index 100% rename from code/web/app/app_achievements/pic/yubo_done_small.png rename to code/web/public_php/app/app_achievements/pic/yubo_done_small.png diff --git a/code/web/app/app_achievements/pic/yubo_pending.png b/code/web/public_php/app/app_achievements/pic/yubo_pending.png similarity index 100% rename from code/web/app/app_achievements/pic/yubo_pending.png rename to code/web/public_php/app/app_achievements/pic/yubo_pending.png diff --git a/code/web/app/app_achievements_admin/_doc/ADM_scheme.dia b/code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia similarity index 100% rename from code/web/app/app_achievements_admin/_doc/ADM_scheme.dia rename to code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.dia diff --git a/code/web/app/app_achievements_admin/_doc/ADM_scheme.png b/code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png similarity index 100% rename from code/web/app/app_achievements_admin/_doc/ADM_scheme.png rename to code/web/public_php/app/app_achievements_admin/_doc/ADM_scheme.png diff --git a/code/web/app/app_achievements_admin/class/ADM_inter.php b/code/web/public_php/app/app_achievements_admin/class/ADM_inter.php similarity index 100% rename from code/web/app/app_achievements_admin/class/ADM_inter.php rename to code/web/public_php/app/app_achievements_admin/class/ADM_inter.php diff --git a/code/web/app/app_achievements_admin/class/AdmAchievement_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmAchievement_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmAchievement_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmAtom_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmAtom_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmAtom_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmAtom_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmCategory_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmCategory_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmCategory_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmCategory_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmDispatcher_trait.php b/code/web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmDispatcher_trait.php rename to code/web/public_php/app/app_achievements_admin/class/AdmDispatcher_trait.php diff --git a/code/web/app/app_achievements_admin/class/AdmMenuNode_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmMenuNode_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmMenuNode_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmMenu_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmMenu_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmMenu_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmMenu_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmObjective_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmObjective_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmObjective_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmObjective_class.php diff --git a/code/web/app/app_achievements_admin/class/AdmTask_class.php b/code/web/public_php/app/app_achievements_admin/class/AdmTask_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/AdmTask_class.php rename to code/web/public_php/app/app_achievements_admin/class/AdmTask_class.php diff --git a/code/web/app/app_achievements_admin/class/CSRAchievement_class.php b/code/web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRAchievement_class.php rename to code/web/public_php/app/app_achievements_admin/class/CSRAchievement_class.php diff --git a/code/web/app/app_achievements_admin/class/CSRAtom_class.php b/code/web/public_php/app/app_achievements_admin/class/CSRAtom_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRAtom_class.php rename to code/web/public_php/app/app_achievements_admin/class/CSRAtom_class.php diff --git a/code/web/app/app_achievements_admin/class/CSRCategory_class.php b/code/web/public_php/app/app_achievements_admin/class/CSRCategory_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRCategory_class.php rename to code/web/public_php/app/app_achievements_admin/class/CSRCategory_class.php diff --git a/code/web/app/app_achievements_admin/class/CSRDispatcher_trait.php b/code/web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRDispatcher_trait.php rename to code/web/public_php/app/app_achievements_admin/class/CSRDispatcher_trait.php diff --git a/code/web/app/app_achievements_admin/class/CSRObjective_class.php b/code/web/public_php/app/app_achievements_admin/class/CSRObjective_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRObjective_class.php rename to code/web/public_php/app/app_achievements_admin/class/CSRObjective_class.php diff --git a/code/web/app/app_achievements_admin/class/CSRTask_class.php b/code/web/public_php/app/app_achievements_admin/class/CSRTask_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSRTask_class.php rename to code/web/public_php/app/app_achievements_admin/class/CSRTask_class.php diff --git a/code/web/app/app_achievements_admin/class/CSR_inter.php b/code/web/public_php/app/app_achievements_admin/class/CSR_inter.php similarity index 100% rename from code/web/app/app_achievements_admin/class/CSR_inter.php rename to code/web/public_php/app/app_achievements_admin/class/CSR_inter.php diff --git a/code/web/app/app_achievements_admin/class/RyzomAdmin_class.php b/code/web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/RyzomAdmin_class.php rename to code/web/public_php/app/app_achievements_admin/class/RyzomAdmin_class.php diff --git a/code/web/app/app_achievements_admin/class/mySQL_class.php b/code/web/public_php/app/app_achievements_admin/class/mySQL_class.php similarity index 100% rename from code/web/app/app_achievements_admin/class/mySQL_class.php rename to code/web/public_php/app/app_achievements_admin/class/mySQL_class.php diff --git a/code/web/app/app_achievements_admin/conf.php b/code/web/public_php/app/app_achievements_admin/conf.php similarity index 100% rename from code/web/app/app_achievements_admin/conf.php rename to code/web/public_php/app/app_achievements_admin/conf.php diff --git a/code/web/app/app_achievements_admin/favicon.png b/code/web/public_php/app/app_achievements_admin/favicon.png similarity index 100% rename from code/web/app/app_achievements_admin/favicon.png rename to code/web/public_php/app/app_achievements_admin/favicon.png diff --git a/code/web/app/app_achievements_admin/include/adm_render_ach.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_ach.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_ach.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_ach.php diff --git a/code/web/app/app_achievements_admin/include/adm_render_atom.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_atom.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_atom.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_atom.php diff --git a/code/web/app/app_achievements_admin/include/adm_render_csr.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_csr.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_csr.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_csr.php diff --git a/code/web/app/app_achievements_admin/include/adm_render_lang.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_lang.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_lang.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_lang.php diff --git a/code/web/app/app_achievements_admin/include/adm_render_menu.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_menu.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_menu.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_menu.php diff --git a/code/web/app/app_achievements_admin/include/adm_render_stats.php b/code/web/public_php/app/app_achievements_admin/include/adm_render_stats.php similarity index 100% rename from code/web/app/app_achievements_admin/include/adm_render_stats.php rename to code/web/public_php/app/app_achievements_admin/include/adm_render_stats.php diff --git a/code/web/app/app_achievements_admin/index.php b/code/web/public_php/app/app_achievements_admin/index.php similarity index 100% rename from code/web/app/app_achievements_admin/index.php rename to code/web/public_php/app/app_achievements_admin/index.php diff --git a/code/web/app/app_achievements_admin/lang.php b/code/web/public_php/app/app_achievements_admin/lang.php similarity index 100% rename from code/web/app/app_achievements_admin/lang.php rename to code/web/public_php/app/app_achievements_admin/lang.php diff --git a/code/web/app/app_achievements_admin/pic/b_drop.png b/code/web/public_php/app/app_achievements_admin/pic/b_drop.png similarity index 100% rename from code/web/app/app_achievements_admin/pic/b_drop.png rename to code/web/public_php/app/app_achievements_admin/pic/b_drop.png diff --git a/code/web/app/app_achievements_admin/pic/b_insrow.png b/code/web/public_php/app/app_achievements_admin/pic/b_insrow.png similarity index 100% rename from code/web/app/app_achievements_admin/pic/b_insrow.png rename to code/web/public_php/app/app_achievements_admin/pic/b_insrow.png diff --git a/code/web/app/app_achievements_admin/pic/b_tblops.png b/code/web/public_php/app/app_achievements_admin/pic/b_tblops.png similarity index 100% rename from code/web/app/app_achievements_admin/pic/b_tblops.png rename to code/web/public_php/app/app_achievements_admin/pic/b_tblops.png diff --git a/code/web/app/app_achievements_admin/pic/green.gif b/code/web/public_php/app/app_achievements_admin/pic/green.gif similarity index 100% rename from code/web/app/app_achievements_admin/pic/green.gif rename to code/web/public_php/app/app_achievements_admin/pic/green.gif diff --git a/code/web/app/app_achievements_admin/pic/icon_edit.gif b/code/web/public_php/app/app_achievements_admin/pic/icon_edit.gif similarity index 100% rename from code/web/app/app_achievements_admin/pic/icon_edit.gif rename to code/web/public_php/app/app_achievements_admin/pic/icon_edit.gif diff --git a/code/web/app/app_achievements_admin/pic/red.gif b/code/web/public_php/app/app_achievements_admin/pic/red.gif similarity index 100% rename from code/web/app/app_achievements_admin/pic/red.gif rename to code/web/public_php/app/app_achievements_admin/pic/red.gif diff --git a/code/web/app/app_test/create.sql b/code/web/public_php/app/app_test/create.sql similarity index 100% rename from code/web/app/app_test/create.sql rename to code/web/public_php/app/app_test/create.sql diff --git a/code/web/app/app_test/favicon.png b/code/web/public_php/app/app_test/favicon.png similarity index 100% rename from code/web/app/app_test/favicon.png rename to code/web/public_php/app/app_test/favicon.png diff --git a/code/web/app/app_test/index.php b/code/web/public_php/app/app_test/index.php similarity index 100% rename from code/web/app/app_test/index.php rename to code/web/public_php/app/app_test/index.php diff --git a/code/web/app/app_test/lang.php b/code/web/public_php/app/app_test/lang.php similarity index 100% rename from code/web/app/app_test/lang.php rename to code/web/public_php/app/app_test/lang.php diff --git a/code/web/app/config.php.default b/code/web/public_php/app/config.php.default similarity index 100% rename from code/web/app/config.php.default rename to code/web/public_php/app/config.php.default diff --git a/code/web/app/index.php b/code/web/public_php/app/index.php similarity index 100% rename from code/web/app/index.php rename to code/web/public_php/app/index.php diff --git a/code/web/app/lang.php b/code/web/public_php/app/lang.php similarity index 100% rename from code/web/app/lang.php rename to code/web/public_php/app/lang.php diff --git a/code/ryzom/tools/server/www/login/client_install.php b/code/web/public_php/login/client_install.php similarity index 100% rename from code/ryzom/tools/server/www/login/client_install.php rename to code/web/public_php/login/client_install.php diff --git a/code/ryzom/tools/server/www/login/email/RFC822.php b/code/web/public_php/login/email/RFC822.php similarity index 100% rename from code/ryzom/tools/server/www/login/email/RFC822.php rename to code/web/public_php/login/email/RFC822.php diff --git a/code/ryzom/tools/server/www/login/email/htmlMimeMail.php b/code/web/public_php/login/email/htmlMimeMail.php similarity index 100% rename from code/ryzom/tools/server/www/login/email/htmlMimeMail.php rename to code/web/public_php/login/email/htmlMimeMail.php diff --git a/code/ryzom/tools/server/www/login/email/mimePart.php b/code/web/public_php/login/email/mimePart.php similarity index 100% rename from code/ryzom/tools/server/www/login/email/mimePart.php rename to code/web/public_php/login/email/mimePart.php diff --git a/code/ryzom/tools/server/www/login/email/smtp.php b/code/web/public_php/login/email/smtp.php similarity index 100% rename from code/ryzom/tools/server/www/login/email/smtp.php rename to code/web/public_php/login/email/smtp.php diff --git a/code/ryzom/tools/server/www/login/login_service_itf.php b/code/web/public_php/login/login_service_itf.php similarity index 100% rename from code/ryzom/tools/server/www/login/login_service_itf.php rename to code/web/public_php/login/login_service_itf.php diff --git a/code/ryzom/tools/server/www/login/login_translations.php b/code/web/public_php/login/login_translations.php similarity index 100% rename from code/ryzom/tools/server/www/login/login_translations.php rename to code/web/public_php/login/login_translations.php diff --git a/code/ryzom/tools/server/www/login/logs/placeholder b/code/web/public_php/login/logs/placeholder similarity index 100% rename from code/ryzom/tools/server/www/login/logs/placeholder rename to code/web/public_php/login/logs/placeholder diff --git a/code/ryzom/tools/server/www/login/r2_login.php b/code/web/public_php/login/r2_login.php similarity index 95% rename from code/ryzom/tools/server/www/login/r2_login.php rename to code/web/public_php/login/r2_login.php index 45f17a949..8e97aafae 100644 --- a/code/ryzom/tools/server/www/login/r2_login.php +++ b/code/web/public_php/login/r2_login.php @@ -337,7 +337,9 @@ } else { + $reason = errorMsg(2001, $login, 'checkUserValidity'); // Check if this is not an unconfirmed account + /* $query = "SELECT GamePassword, Email, Language FROM signup_data WHERE login='$login'"; $result = mysqli_query($link, $query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysqli_error($link))); @@ -369,6 +371,7 @@ $reason = errorMsg(2004, 'db signup_data'); $res = false; } + */ } } else @@ -496,8 +499,9 @@ } else { + die (errorMsgBlock(2001, $login, 'askSalt')); // Check if this is not an unconfirmed account - $query = "SELECT GamePassword, Language FROM signup_data WHERE login='$login'"; + /*$query = "SELECT GamePassword, Language FROM signup_data WHERE login='$login'"; $result = mysqli_query($link, $query) or die (errorMsgBlock(3006, $query, 'main', $DBName, $DBHost, $DBUserName, mysqli_error($link))); if (mysqli_num_rows($result) == 0) @@ -524,7 +528,7 @@ setMsgLanguage(array_keys($languages)); } die (errorMsgBlock(2003)); - } + }*/ } } else diff --git a/code/ryzom/tools/server/www/ring/anim_session.php b/code/web/public_php/ring/anim_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/anim_session.php rename to code/web/public_php/ring/anim_session.php diff --git a/code/ryzom/tools/server/www/ring/cancel_session.php b/code/web/public_php/ring/cancel_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/cancel_session.php rename to code/web/public_php/ring/cancel_session.php diff --git a/code/ryzom/tools/server/www/ring/close_session.php b/code/web/public_php/ring/close_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/close_session.php rename to code/web/public_php/ring/close_session.php diff --git a/code/ryzom/tools/server/www/ring/edit_session.php b/code/web/public_php/ring/edit_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/edit_session.php rename to code/web/public_php/ring/edit_session.php diff --git a/code/ryzom/tools/server/www/ring/invite_pioneer.php b/code/web/public_php/ring/invite_pioneer.php similarity index 100% rename from code/ryzom/tools/server/www/ring/invite_pioneer.php rename to code/web/public_php/ring/invite_pioneer.php diff --git a/code/ryzom/tools/server/www/ring/join_session.php b/code/web/public_php/ring/join_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/join_session.php rename to code/web/public_php/ring/join_session.php diff --git a/code/ryzom/tools/server/www/ring/join_shard.php b/code/web/public_php/ring/join_shard.php similarity index 100% rename from code/ryzom/tools/server/www/ring/join_shard.php rename to code/web/public_php/ring/join_shard.php diff --git a/code/ryzom/tools/server/www/ring/mail_forum_itf.php b/code/web/public_php/ring/mail_forum_itf.php similarity index 100% rename from code/ryzom/tools/server/www/ring/mail_forum_itf.php rename to code/web/public_php/ring/mail_forum_itf.php diff --git a/code/ryzom/tools/server/www/ring/plan_edit_session.php b/code/web/public_php/ring/plan_edit_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/plan_edit_session.php rename to code/web/public_php/ring/plan_edit_session.php diff --git a/code/ryzom/tools/server/www/ring/ring_session_manager_itf.php b/code/web/public_php/ring/ring_session_manager_itf.php similarity index 100% rename from code/ryzom/tools/server/www/ring/ring_session_manager_itf.php rename to code/web/public_php/ring/ring_session_manager_itf.php diff --git a/code/ryzom/tools/server/www/ring/send_plan_edit_session.php b/code/web/public_php/ring/send_plan_edit_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/send_plan_edit_session.php rename to code/web/public_php/ring/send_plan_edit_session.php diff --git a/code/ryzom/tools/server/www/ring/session_tools.php b/code/web/public_php/ring/session_tools.php similarity index 100% rename from code/ryzom/tools/server/www/ring/session_tools.php rename to code/web/public_php/ring/session_tools.php diff --git a/code/ryzom/tools/server/www/ring/start_session.php b/code/web/public_php/ring/start_session.php similarity index 100% rename from code/ryzom/tools/server/www/ring/start_session.php rename to code/web/public_php/ring/start_session.php diff --git a/code/ryzom/tools/server/www/ring/welcome_service_itf.php b/code/web/public_php/ring/welcome_service_itf.php similarity index 100% rename from code/ryzom/tools/server/www/ring/welcome_service_itf.php rename to code/web/public_php/ring/welcome_service_itf.php diff --git a/code/ryzom/tools/server/www/tools/domain_info.php b/code/web/public_php/tools/domain_info.php similarity index 100% rename from code/ryzom/tools/server/www/tools/domain_info.php rename to code/web/public_php/tools/domain_info.php diff --git a/code/ryzom/tools/server/www/tools/nel_message.php b/code/web/public_php/tools/nel_message.php similarity index 100% rename from code/ryzom/tools/server/www/tools/nel_message.php rename to code/web/public_php/tools/nel_message.php diff --git a/code/ryzom/tools/server/www/tools/validate_cookie.php b/code/web/public_php/tools/validate_cookie.php similarity index 100% rename from code/ryzom/tools/server/www/tools/validate_cookie.php rename to code/web/public_php/tools/validate_cookie.php diff --git a/code/ryzom/tools/server/www/webtt/.gitignore b/code/web/public_php/webtt/.gitignore similarity index 100% rename from code/ryzom/tools/server/www/webtt/.gitignore rename to code/web/public_php/webtt/.gitignore diff --git a/code/ryzom/tools/server/www/webtt/.htaccess b/code/web/public_php/webtt/.htaccess similarity index 100% rename from code/ryzom/tools/server/www/webtt/.htaccess rename to code/web/public_php/webtt/.htaccess diff --git a/code/ryzom/tools/server/www/webtt/CakePHP_README b/code/web/public_php/webtt/CakePHP_README similarity index 100% rename from code/ryzom/tools/server/www/webtt/CakePHP_README rename to code/web/public_php/webtt/CakePHP_README diff --git a/code/ryzom/tools/server/www/webtt/app/.htaccess b/code/web/public_php/webtt/app/.htaccess similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/.htaccess rename to code/web/public_php/webtt/app/.htaccess diff --git a/code/ryzom/tools/server/www/webtt/app/config/acl.ini.php b/code/web/public_php/webtt/app/config/acl.ini.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/acl.ini.php rename to code/web/public_php/webtt/app/config/acl.ini.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/bootstrap.php b/code/web/public_php/webtt/app/config/bootstrap.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/bootstrap.php rename to code/web/public_php/webtt/app/config/bootstrap.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/core.php b/code/web/public_php/webtt/app/config/core.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/core.php rename to code/web/public_php/webtt/app/config/core.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/database.php b/code/web/public_php/webtt/app/config/database.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/database.php rename to code/web/public_php/webtt/app/config/database.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/database.php.default b/code/web/public_php/webtt/app/config/database.php.default similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/database.php.default rename to code/web/public_php/webtt/app/config/database.php.default diff --git a/code/ryzom/tools/server/www/webtt/app/config/routes.php b/code/web/public_php/webtt/app/config/routes.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/routes.php rename to code/web/public_php/webtt/app/config/routes.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/db_acl.php b/code/web/public_php/webtt/app/config/schema/db_acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/schema/db_acl.php rename to code/web/public_php/webtt/app/config/schema/db_acl.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/i18n.php b/code/web/public_php/webtt/app/config/schema/i18n.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/schema/i18n.php rename to code/web/public_php/webtt/app/config/schema/i18n.php diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/sessions.php b/code/web/public_php/webtt/app/config/schema/sessions.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/config/schema/sessions.php rename to code/web/public_php/webtt/app/config/schema/sessions.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php b/code/web/public_php/webtt/app/controllers/app_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php rename to code/web/public_php/webtt/app/controllers/app_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/comments_controller.php b/code/web/public_php/webtt/app/controllers/comments_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/comments_controller.php rename to code/web/public_php/webtt/app/controllers/comments_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/components/empty b/code/web/public_php/webtt/app/controllers/components/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/components/empty rename to code/web/public_php/webtt/app/controllers/components/empty diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/components/path_resolver.php b/code/web/public_php/webtt/app/controllers/components/path_resolver.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/components/path_resolver.php rename to code/web/public_php/webtt/app/controllers/components/path_resolver.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php b/code/web/public_php/webtt/app/controllers/file_identifiers_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php rename to code/web/public_php/webtt/app/controllers/file_identifiers_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/identifier_columns_controller.php b/code/web/public_php/webtt/app/controllers/identifier_columns_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/identifier_columns_controller.php rename to code/web/public_php/webtt/app/controllers/identifier_columns_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php b/code/web/public_php/webtt/app/controllers/identifiers_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php rename to code/web/public_php/webtt/app/controllers/identifiers_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php b/code/web/public_php/webtt/app/controllers/imported_translation_files_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php rename to code/web/public_php/webtt/app/controllers/imported_translation_files_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php b/code/web/public_php/webtt/app/controllers/languages_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php rename to code/web/public_php/webtt/app/controllers/languages_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/pages_controller.php b/code/web/public_php/webtt/app/controllers/pages_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/pages_controller.php rename to code/web/public_php/webtt/app/controllers/pages_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php b/code/web/public_php/webtt/app/controllers/raw_files_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php rename to code/web/public_php/webtt/app/controllers/raw_files_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/translation_files_controller.php b/code/web/public_php/webtt/app/controllers/translation_files_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/translation_files_controller.php rename to code/web/public_php/webtt/app/controllers/translation_files_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php b/code/web/public_php/webtt/app/controllers/translations_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php rename to code/web/public_php/webtt/app/controllers/translations_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php b/code/web/public_php/webtt/app/controllers/users_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php rename to code/web/public_php/webtt/app/controllers/users_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php b/code/web/public_php/webtt/app/controllers/votes_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php rename to code/web/public_php/webtt/app/controllers/votes_controller.php diff --git a/code/ryzom/tools/server/www/webtt/app/index.php b/code/web/public_php/webtt/app/index.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/index.php rename to code/web/public_php/webtt/app/index.php diff --git a/code/ryzom/tools/server/www/webtt/app/libs/empty b/code/web/public_php/webtt/app/libs/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/libs/empty rename to code/web/public_php/webtt/app/libs/empty diff --git a/code/ryzom/tools/server/www/webtt/app/locale/eng/LC_MESSAGES/empty b/code/web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/locale/eng/LC_MESSAGES/empty rename to code/web/public_php/webtt/app/locale/eng/LC_MESSAGES/empty diff --git a/code/ryzom/tools/server/www/webtt/app/models/app_model.php b/code/web/public_php/webtt/app/models/app_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/app_model.php rename to code/web/public_php/webtt/app/models/app_model.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/behaviors/empty b/code/web/public_php/webtt/app/models/behaviors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/behaviors/empty rename to code/web/public_php/webtt/app/models/behaviors/empty diff --git a/code/ryzom/tools/server/www/webtt/app/models/behaviors/null.php b/code/web/public_php/webtt/app/models/behaviors/null.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/behaviors/null.php rename to code/web/public_php/webtt/app/models/behaviors/null.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/comment.php b/code/web/public_php/webtt/app/models/comment.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/comment.php rename to code/web/public_php/webtt/app/models/comment.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/datasources/empty b/code/web/public_php/webtt/app/models/datasources/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/datasources/empty rename to code/web/public_php/webtt/app/models/datasources/empty diff --git a/code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php b/code/web/public_php/webtt/app/models/datasources/raw_files_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php rename to code/web/public_php/webtt/app/models/datasources/raw_files_source.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/file_identifier.php b/code/web/public_php/webtt/app/models/file_identifier.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/file_identifier.php rename to code/web/public_php/webtt/app/models/file_identifier.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/identifier.php b/code/web/public_php/webtt/app/models/identifier.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/identifier.php rename to code/web/public_php/webtt/app/models/identifier.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/identifier_column.php b/code/web/public_php/webtt/app/models/identifier_column.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/identifier_column.php rename to code/web/public_php/webtt/app/models/identifier_column.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php b/code/web/public_php/webtt/app/models/imported_translation_file.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php rename to code/web/public_php/webtt/app/models/imported_translation_file.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/language.php b/code/web/public_php/webtt/app/models/language.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/language.php rename to code/web/public_php/webtt/app/models/language.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/raw_file.php b/code/web/public_php/webtt/app/models/raw_file.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/raw_file.php rename to code/web/public_php/webtt/app/models/raw_file.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/translation.php b/code/web/public_php/webtt/app/models/translation.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/translation.php rename to code/web/public_php/webtt/app/models/translation.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/translation_file.php b/code/web/public_php/webtt/app/models/translation_file.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/translation_file.php rename to code/web/public_php/webtt/app/models/translation_file.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/user.php b/code/web/public_php/webtt/app/models/user.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/user.php rename to code/web/public_php/webtt/app/models/user.php diff --git a/code/ryzom/tools/server/www/webtt/app/models/vote.php b/code/web/public_php/webtt/app/models/vote.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/models/vote.php rename to code/web/public_php/webtt/app/models/vote.php diff --git a/code/ryzom/tools/server/www/webtt/app/plugins/empty b/code/web/public_php/webtt/app/plugins/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/plugins/empty rename to code/web/public_php/webtt/app/plugins/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/behaviors/empty b/code/web/public_php/webtt/app/tests/cases/behaviors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/cases/behaviors/empty rename to code/web/public_php/webtt/app/tests/cases/behaviors/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/components/empty b/code/web/public_php/webtt/app/tests/cases/components/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/cases/components/empty rename to code/web/public_php/webtt/app/tests/cases/components/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/controllers/empty b/code/web/public_php/webtt/app/tests/cases/controllers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/cases/controllers/empty rename to code/web/public_php/webtt/app/tests/cases/controllers/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/helpers/empty b/code/web/public_php/webtt/app/tests/cases/helpers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/cases/helpers/empty rename to code/web/public_php/webtt/app/tests/cases/helpers/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/models/empty b/code/web/public_php/webtt/app/tests/cases/models/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/cases/models/empty rename to code/web/public_php/webtt/app/tests/cases/models/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/fixtures/empty b/code/web/public_php/webtt/app/tests/fixtures/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/fixtures/empty rename to code/web/public_php/webtt/app/tests/fixtures/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tests/groups/empty b/code/web/public_php/webtt/app/tests/groups/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tests/groups/empty rename to code/web/public_php/webtt/app/tests/groups/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/models/empty b/code/web/public_php/webtt/app/tmp/cache/models/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/cache/models/empty rename to code/web/public_php/webtt/app/tmp/cache/models/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/persistent/empty b/code/web/public_php/webtt/app/tmp/cache/persistent/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/cache/persistent/empty rename to code/web/public_php/webtt/app/tmp/cache/persistent/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/views/empty b/code/web/public_php/webtt/app/tmp/cache/views/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/cache/views/empty rename to code/web/public_php/webtt/app/tmp/cache/views/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/logs/empty b/code/web/public_php/webtt/app/tmp/logs/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/logs/empty rename to code/web/public_php/webtt/app/tmp/logs/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/sessions/empty b/code/web/public_php/webtt/app/tmp/sessions/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/sessions/empty rename to code/web/public_php/webtt/app/tmp/sessions/empty diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/tests/empty b/code/web/public_php/webtt/app/tmp/tests/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/tmp/tests/empty rename to code/web/public_php/webtt/app/tmp/tests/empty diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/PhraseParser.php b/code/web/public_php/webtt/app/vendors/PhraseParser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/PhraseParser.php rename to code/web/public_php/webtt/app/vendors/PhraseParser.php diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/SheetParser.php b/code/web/public_php/webtt/app/vendors/SheetParser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/SheetParser.php rename to code/web/public_php/webtt/app/vendors/SheetParser.php diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/StringParser.php b/code/web/public_php/webtt/app/vendors/StringParser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/StringParser.php rename to code/web/public_php/webtt/app/vendors/StringParser.php diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/tasks/empty b/code/web/public_php/webtt/app/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/tasks/empty rename to code/web/public_php/webtt/app/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/form.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/form.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/form.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/home.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/home.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/index.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/index.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/view.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/view.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/960grid/views/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/empty b/code/web/public_php/webtt/app/vendors/shells/templates/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/empty rename to code/web/public_php/webtt/app/vendors/shells/templates/empty diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/form.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/form.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/form.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/home.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/home.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/index.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/index.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/view.ctp b/code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/view.ctp rename to code/web/public_php/webtt/app/vendors/shells/templates/webtt/views/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/add.ctp b/code/web/public_php/webtt/app/views/comments/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/add.ctp rename to code/web/public_php/webtt/app/views/comments/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_add.ctp b/code/web/public_php/webtt/app/views/comments/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/admin_add.ctp rename to code/web/public_php/webtt/app/views/comments/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_edit.ctp b/code/web/public_php/webtt/app/views/comments/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/admin_edit.ctp rename to code/web/public_php/webtt/app/views/comments/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_index.ctp b/code/web/public_php/webtt/app/views/comments/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/admin_index.ctp rename to code/web/public_php/webtt/app/views/comments/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_view.ctp b/code/web/public_php/webtt/app/views/comments/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/admin_view.ctp rename to code/web/public_php/webtt/app/views/comments/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/edit.ctp b/code/web/public_php/webtt/app/views/comments/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/edit.ctp rename to code/web/public_php/webtt/app/views/comments/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/index.ctp b/code/web/public_php/webtt/app/views/comments/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/index.ctp rename to code/web/public_php/webtt/app/views/comments/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/view.ctp b/code/web/public_php/webtt/app/views/comments/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/comments/view.ctp rename to code/web/public_php/webtt/app/views/comments/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/empty b/code/web/public_php/webtt/app/views/elements/email/html/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/email/html/empty rename to code/web/public_php/webtt/app/views/elements/email/html/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/registration.ctp b/code/web/public_php/webtt/app/views/elements/email/html/registration.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/email/html/registration.ctp rename to code/web/public_php/webtt/app/views/elements/email/html/registration.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/empty b/code/web/public_php/webtt/app/views/elements/email/text/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/email/text/empty rename to code/web/public_php/webtt/app/views/elements/email/text/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/registration.ctp b/code/web/public_php/webtt/app/views/elements/email/text/registration.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/email/text/registration.ctp rename to code/web/public_php/webtt/app/views/elements/email/text/registration.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/empty b/code/web/public_php/webtt/app/views/elements/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/empty rename to code/web/public_php/webtt/app/views/elements/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/neighbours.ctp b/code/web/public_php/webtt/app/views/elements/neighbours.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/elements/neighbours.ctp rename to code/web/public_php/webtt/app/views/elements/neighbours.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/errors/empty b/code/web/public_php/webtt/app/views/errors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/errors/empty rename to code/web/public_php/webtt/app/views/errors/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp b/code/web/public_php/webtt/app/views/file_identifiers/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp b/code/web/public_php/webtt/app/views/file_identifiers/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp b/code/web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp b/code/web/public_php/webtt/app/views/file_identifiers/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp b/code/web/public_php/webtt/app/views/file_identifiers/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp b/code/web/public_php/webtt/app/views/file_identifiers/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp b/code/web/public_php/webtt/app/views/file_identifiers/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp b/code/web/public_php/webtt/app/views/file_identifiers/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp rename to code/web/public_php/webtt/app/views/file_identifiers/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/helpers/empty b/code/web/public_php/webtt/app/views/helpers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/helpers/empty rename to code/web/public_php/webtt/app/views/helpers/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_index.ctp b/code/web/public_php/webtt/app/views/identifier_columns/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_index.ctp rename to code/web/public_php/webtt/app/views/identifier_columns/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_view.ctp b/code/web/public_php/webtt/app/views/identifier_columns/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_view.ctp rename to code/web/public_php/webtt/app/views/identifier_columns/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/index.ctp b/code/web/public_php/webtt/app/views/identifier_columns/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifier_columns/index.ctp rename to code/web/public_php/webtt/app/views/identifier_columns/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/view.ctp b/code/web/public_php/webtt/app/views/identifier_columns/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifier_columns/view.ctp rename to code/web/public_php/webtt/app/views/identifier_columns/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp b/code/web/public_php/webtt/app/views/identifiers/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp rename to code/web/public_php/webtt/app/views/identifiers/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp b/code/web/public_php/webtt/app/views/identifiers/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp rename to code/web/public_php/webtt/app/views/identifiers/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp b/code/web/public_php/webtt/app/views/identifiers/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp rename to code/web/public_php/webtt/app/views/identifiers/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp b/code/web/public_php/webtt/app/views/identifiers/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp rename to code/web/public_php/webtt/app/views/identifiers/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp b/code/web/public_php/webtt/app/views/identifiers/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp rename to code/web/public_php/webtt/app/views/identifiers/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp b/code/web/public_php/webtt/app/views/identifiers/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp rename to code/web/public_php/webtt/app/views/identifiers/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp b/code/web/public_php/webtt/app/views/identifiers/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp rename to code/web/public_php/webtt/app/views/identifiers/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp b/code/web/public_php/webtt/app/views/identifiers/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp rename to code/web/public_php/webtt/app/views/identifiers/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp b/code/web/public_php/webtt/app/views/imported_translation_files/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp rename to code/web/public_php/webtt/app/views/imported_translation_files/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp b/code/web/public_php/webtt/app/views/languages/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp rename to code/web/public_php/webtt/app/views/languages/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp b/code/web/public_php/webtt/app/views/languages/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp rename to code/web/public_php/webtt/app/views/languages/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp b/code/web/public_php/webtt/app/views/languages/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp rename to code/web/public_php/webtt/app/views/languages/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp b/code/web/public_php/webtt/app/views/languages/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp rename to code/web/public_php/webtt/app/views/languages/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp b/code/web/public_php/webtt/app/views/languages/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp rename to code/web/public_php/webtt/app/views/languages/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp b/code/web/public_php/webtt/app/views/languages/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp rename to code/web/public_php/webtt/app/views/languages/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp b/code/web/public_php/webtt/app/views/languages/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp rename to code/web/public_php/webtt/app/views/languages/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp b/code/web/public_php/webtt/app/views/languages/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp rename to code/web/public_php/webtt/app/views/languages/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/admin.ctp b/code/web/public_php/webtt/app/views/layouts/admin.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/admin.ctp rename to code/web/public_php/webtt/app/views/layouts/admin.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/default.ctp b/code/web/public_php/webtt/app/views/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/default.ctp rename to code/web/public_php/webtt/app/views/layouts/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/default_debug.ctp b/code/web/public_php/webtt/app/views/layouts/default_debug.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/default_debug.ctp rename to code/web/public_php/webtt/app/views/layouts/default_debug.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/email/html/default.ctp b/code/web/public_php/webtt/app/views/layouts/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/email/html/default.ctp rename to code/web/public_php/webtt/app/views/layouts/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/email/text/default.ctp b/code/web/public_php/webtt/app/views/layouts/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/email/text/default.ctp rename to code/web/public_php/webtt/app/views/layouts/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/js/empty b/code/web/public_php/webtt/app/views/layouts/js/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/js/empty rename to code/web/public_php/webtt/app/views/layouts/js/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp b/code/web/public_php/webtt/app/views/layouts/new.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp rename to code/web/public_php/webtt/app/views/layouts/new.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/rss/empty b/code/web/public_php/webtt/app/views/layouts/rss/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/rss/empty rename to code/web/public_php/webtt/app/views/layouts/rss/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/xml/empty b/code/web/public_php/webtt/app/views/layouts/xml/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/layouts/xml/empty rename to code/web/public_php/webtt/app/views/layouts/xml/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/pages/admin/home.ctp b/code/web/public_php/webtt/app/views/pages/admin/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/pages/admin/home.ctp rename to code/web/public_php/webtt/app/views/pages/admin/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp b/code/web/public_php/webtt/app/views/pages/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp rename to code/web/public_php/webtt/app/views/pages/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_index.ctp b/code/web/public_php/webtt/app/views/raw_files/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_index.ctp rename to code/web/public_php/webtt/app/views/raw_files/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_view.ctp b/code/web/public_php/webtt/app/views/raw_files/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_view.ctp rename to code/web/public_php/webtt/app/views/raw_files/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp b/code/web/public_php/webtt/app/views/raw_files/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp rename to code/web/public_php/webtt/app/views/raw_files/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/listdir.ctp b/code/web/public_php/webtt/app/views/raw_files/listdir.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/raw_files/listdir.ctp rename to code/web/public_php/webtt/app/views/raw_files/listdir.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/view.ctp b/code/web/public_php/webtt/app/views/raw_files/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/raw_files/view.ctp rename to code/web/public_php/webtt/app/views/raw_files/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/edit.ctp b/code/web/public_php/webtt/app/views/scaffolds/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/scaffolds/edit.ctp rename to code/web/public_php/webtt/app/views/scaffolds/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/empty b/code/web/public_php/webtt/app/views/scaffolds/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/scaffolds/empty rename to code/web/public_php/webtt/app/views/scaffolds/empty diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/index.ctp b/code/web/public_php/webtt/app/views/scaffolds/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/scaffolds/index.ctp rename to code/web/public_php/webtt/app/views/scaffolds/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/view.ctp b/code/web/public_php/webtt/app/views/scaffolds/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/scaffolds/view.ctp rename to code/web/public_php/webtt/app/views/scaffolds/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_index.ctp b/code/web/public_php/webtt/app/views/translation_files/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_index.ctp rename to code/web/public_php/webtt/app/views/translation_files/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_view.ctp b/code/web/public_php/webtt/app/views/translation_files/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_view.ctp rename to code/web/public_php/webtt/app/views/translation_files/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/index.ctp b/code/web/public_php/webtt/app/views/translation_files/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translation_files/index.ctp rename to code/web/public_php/webtt/app/views/translation_files/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/view.ctp b/code/web/public_php/webtt/app/views/translation_files/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translation_files/view.ctp rename to code/web/public_php/webtt/app/views/translation_files/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp b/code/web/public_php/webtt/app/views/translations/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp rename to code/web/public_php/webtt/app/views/translations/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp b/code/web/public_php/webtt/app/views/translations/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp rename to code/web/public_php/webtt/app/views/translations/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp b/code/web/public_php/webtt/app/views/translations/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp rename to code/web/public_php/webtt/app/views/translations/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp b/code/web/public_php/webtt/app/views/translations/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp rename to code/web/public_php/webtt/app/views/translations/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp b/code/web/public_php/webtt/app/views/translations/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp rename to code/web/public_php/webtt/app/views/translations/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp b/code/web/public_php/webtt/app/views/translations/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp rename to code/web/public_php/webtt/app/views/translations/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp b/code/web/public_php/webtt/app/views/translations/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp rename to code/web/public_php/webtt/app/views/translations/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp b/code/web/public_php/webtt/app/views/translations/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp rename to code/web/public_php/webtt/app/views/translations/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp b/code/web/public_php/webtt/app/views/users/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp rename to code/web/public_php/webtt/app/views/users/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp b/code/web/public_php/webtt/app/views/users/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp rename to code/web/public_php/webtt/app/views/users/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp b/code/web/public_php/webtt/app/views/users/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp rename to code/web/public_php/webtt/app/views/users/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp b/code/web/public_php/webtt/app/views/users/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp rename to code/web/public_php/webtt/app/views/users/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/index.ctp b/code/web/public_php/webtt/app/views/users/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/index.ctp rename to code/web/public_php/webtt/app/views/users/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/login.ctp b/code/web/public_php/webtt/app/views/users/login.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/login.ctp rename to code/web/public_php/webtt/app/views/users/login.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/register.ctp b/code/web/public_php/webtt/app/views/users/register.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/register.ctp rename to code/web/public_php/webtt/app/views/users/register.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/view.ctp b/code/web/public_php/webtt/app/views/users/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/users/view.ctp rename to code/web/public_php/webtt/app/views/users/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp b/code/web/public_php/webtt/app/views/votes/add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp rename to code/web/public_php/webtt/app/views/votes/add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp b/code/web/public_php/webtt/app/views/votes/admin_add.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp rename to code/web/public_php/webtt/app/views/votes/admin_add.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp b/code/web/public_php/webtt/app/views/votes/admin_edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp rename to code/web/public_php/webtt/app/views/votes/admin_edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp b/code/web/public_php/webtt/app/views/votes/admin_index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp rename to code/web/public_php/webtt/app/views/votes/admin_index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp b/code/web/public_php/webtt/app/views/votes/admin_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp rename to code/web/public_php/webtt/app/views/votes/admin_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp b/code/web/public_php/webtt/app/views/votes/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp rename to code/web/public_php/webtt/app/views/votes/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp b/code/web/public_php/webtt/app/views/votes/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp rename to code/web/public_php/webtt/app/views/votes/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp b/code/web/public_php/webtt/app/views/votes/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp rename to code/web/public_php/webtt/app/views/votes/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/.htaccess b/code/web/public_php/webtt/app/webroot/.htaccess similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/.htaccess rename to code/web/public_php/webtt/app/webroot/.htaccess diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css.php b/code/web/public_php/webtt/app/webroot/css.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css.php rename to code/web/public_php/webtt/app/webroot/css.php diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/960.css b/code/web/public_php/webtt/app/webroot/css/960.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/960.css rename to code/web/public_php/webtt/app/webroot/css/960.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css b/code/web/public_php/webtt/app/webroot/css/cake.generic.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css rename to code/web/public_php/webtt/app/webroot/css/cake.generic.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css b/code/web/public_php/webtt/app/webroot/css/grid.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css rename to code/web/public_php/webtt/app/webroot/css/grid.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css b/code/web/public_php/webtt/app/webroot/css/ie.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css rename to code/web/public_php/webtt/app/webroot/css/ie.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css b/code/web/public_php/webtt/app/webroot/css/ie6.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css rename to code/web/public_php/webtt/app/webroot/css/ie6.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/labelWidth.css b/code/web/public_php/webtt/app/webroot/css/labelWidth.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/labelWidth.css rename to code/web/public_php/webtt/app/webroot/css/labelWidth.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css b/code/web/public_php/webtt/app/webroot/css/layout.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css rename to code/web/public_php/webtt/app/webroot/css/layout.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css b/code/web/public_php/webtt/app/webroot/css/nav.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css rename to code/web/public_php/webtt/app/webroot/css/nav.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/reset.css b/code/web/public_php/webtt/app/webroot/css/reset.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/reset.css rename to code/web/public_php/webtt/app/webroot/css/reset.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/text.css b/code/web/public_php/webtt/app/webroot/css/text.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/css/text.css rename to code/web/public_php/webtt/app/webroot/css/text.css diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/favicon.ico b/code/web/public_php/webtt/app/webroot/favicon.ico similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/favicon.ico rename to code/web/public_php/webtt/app/webroot/favicon.ico diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/files/empty b/code/web/public_php/webtt/app/webroot/files/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/files/empty rename to code/web/public_php/webtt/app/webroot/files/empty diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.icon.png b/code/web/public_php/webtt/app/webroot/img/cake.icon.png similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/img/cake.icon.png rename to code/web/public_php/webtt/app/webroot/img/cake.icon.png diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.power.gif b/code/web/public_php/webtt/app/webroot/img/cake.power.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/img/cake.power.gif rename to code/web/public_php/webtt/app/webroot/img/cake.power.gif diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_minus.gif b/code/web/public_php/webtt/app/webroot/img/switch_minus.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/img/switch_minus.gif rename to code/web/public_php/webtt/app/webroot/img/switch_minus.gif diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_plus.gif b/code/web/public_php/webtt/app/webroot/img/switch_plus.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/img/switch_plus.gif rename to code/web/public_php/webtt/app/webroot/img/switch_plus.gif diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/index.php b/code/web/public_php/webtt/app/webroot/index.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/index.php rename to code/web/public_php/webtt/app/webroot/index.php diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/empty b/code/web/public_php/webtt/app/webroot/js/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/js/empty rename to code/web/public_php/webtt/app/webroot/js/empty diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-1.3.2.min.js b/code/web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-1.3.2.min.js rename to code/web/public_php/webtt/app/webroot/js/jquery-1.3.2.min.js diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-fluid16.js b/code/web/public_php/webtt/app/webroot/js/jquery-fluid16.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-fluid16.js rename to code/web/public_php/webtt/app/webroot/js/jquery-fluid16.js diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-ui.js b/code/web/public_php/webtt/app/webroot/js/jquery-ui.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-ui.js rename to code/web/public_php/webtt/app/webroot/js/jquery-ui.js diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/test.php b/code/web/public_php/webtt/app/webroot/test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/test.php rename to code/web/public_php/webtt/app/webroot/test.php diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/raw_testfile.csv b/code/web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/testfiles/raw_testfile.csv rename to code/web/public_php/webtt/app/webroot/testfiles/raw_testfile.csv diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/testdir/ugatestindir.csv b/code/web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/testfiles/testdir/ugatestindir.csv rename to code/web/public_php/webtt/app/webroot/testfiles/testdir/ugatestindir.csv diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/ugabla.csv b/code/web/public_php/webtt/app/webroot/testfiles/ugabla.csv similarity index 100% rename from code/ryzom/tools/server/www/webtt/app/webroot/testfiles/ugabla.csv rename to code/web/public_php/webtt/app/webroot/testfiles/ugabla.csv diff --git a/code/ryzom/tools/server/www/webtt/cake/LICENSE.txt b/code/web/public_php/webtt/cake/LICENSE.txt similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/LICENSE.txt rename to code/web/public_php/webtt/cake/LICENSE.txt diff --git a/code/ryzom/tools/server/www/webtt/cake/VERSION.txt b/code/web/public_php/webtt/cake/VERSION.txt similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/VERSION.txt rename to code/web/public_php/webtt/cake/VERSION.txt diff --git a/code/ryzom/tools/server/www/webtt/cake/basics.php b/code/web/public_php/webtt/cake/basics.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/basics.php rename to code/web/public_php/webtt/cake/basics.php diff --git a/code/ryzom/tools/server/www/webtt/cake/bootstrap.php b/code/web/public_php/webtt/cake/bootstrap.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/bootstrap.php rename to code/web/public_php/webtt/cake/bootstrap.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/config.php b/code/web/public_php/webtt/cake/config/config.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/config.php rename to code/web/public_php/webtt/cake/config/config.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/paths.php b/code/web/public_php/webtt/cake/config/paths.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/paths.php rename to code/web/public_php/webtt/cake/config/paths.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0080_00ff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0080_00ff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0080_00ff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0100_017f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0100_017f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0100_017f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0180_024F.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0180_024F.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0180_024F.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0250_02af.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0250_02af.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0250_02af.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0370_03ff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0370_03ff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0370_03ff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0400_04ff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0400_04ff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0400_04ff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0500_052f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0500_052f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0500_052f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0530_058f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0530_058f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/0530_058f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1e00_1eff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1e00_1eff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/1e00_1eff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1f00_1fff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1f00_1fff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/1f00_1fff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2100_214f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2100_214f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2100_214f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2150_218f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2150_218f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2150_218f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2460_24ff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2460_24ff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2460_24ff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c00_2c5f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c00_2c5f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2c00_2c5f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c60_2c7f.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c60_2c7f.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2c60_2c7f.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c80_2cff.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c80_2cff.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/2c80_2cff.php diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/ff00_ffef.php b/code/web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/ff00_ffef.php rename to code/web/public_php/webtt/cake/config/unicode/casefolding/ff00_ffef.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake b/code/web/public_php/webtt/cake/console/cake similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/cake rename to code/web/public_php/webtt/cake/console/cake diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake.bat b/code/web/public_php/webtt/cake/console/cake.bat similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/cake.bat rename to code/web/public_php/webtt/cake/console/cake.bat diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake.php b/code/web/public_php/webtt/cake/console/cake.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/cake.php rename to code/web/public_php/webtt/cake/console/cake.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/error.php b/code/web/public_php/webtt/cake/console/error.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/error.php rename to code/web/public_php/webtt/cake/console/error.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/acl.php b/code/web/public_php/webtt/cake/console/libs/acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/acl.php rename to code/web/public_php/webtt/cake/console/libs/acl.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/api.php b/code/web/public_php/webtt/cake/console/libs/api.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/api.php rename to code/web/public_php/webtt/cake/console/libs/api.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/bake.php b/code/web/public_php/webtt/cake/console/libs/bake.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/bake.php rename to code/web/public_php/webtt/cake/console/libs/bake.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/console.php b/code/web/public_php/webtt/cake/console/libs/console.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/console.php rename to code/web/public_php/webtt/cake/console/libs/console.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/i18n.php b/code/web/public_php/webtt/cake/console/libs/i18n.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/i18n.php rename to code/web/public_php/webtt/cake/console/libs/i18n.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/schema.php b/code/web/public_php/webtt/cake/console/libs/schema.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/schema.php rename to code/web/public_php/webtt/cake/console/libs/schema.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/shell.php b/code/web/public_php/webtt/cake/console/libs/shell.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/shell.php rename to code/web/public_php/webtt/cake/console/libs/shell.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/bake.php b/code/web/public_php/webtt/cake/console/libs/tasks/bake.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/bake.php rename to code/web/public_php/webtt/cake/console/libs/tasks/bake.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/controller.php b/code/web/public_php/webtt/cake/console/libs/tasks/controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/controller.php rename to code/web/public_php/webtt/cake/console/libs/tasks/controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/db_config.php b/code/web/public_php/webtt/cake/console/libs/tasks/db_config.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/db_config.php rename to code/web/public_php/webtt/cake/console/libs/tasks/db_config.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/extract.php b/code/web/public_php/webtt/cake/console/libs/tasks/extract.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/extract.php rename to code/web/public_php/webtt/cake/console/libs/tasks/extract.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/fixture.php b/code/web/public_php/webtt/cake/console/libs/tasks/fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/fixture.php rename to code/web/public_php/webtt/cake/console/libs/tasks/fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/model.php b/code/web/public_php/webtt/cake/console/libs/tasks/model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/model.php rename to code/web/public_php/webtt/cake/console/libs/tasks/model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/plugin.php b/code/web/public_php/webtt/cake/console/libs/tasks/plugin.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/plugin.php rename to code/web/public_php/webtt/cake/console/libs/tasks/plugin.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/project.php b/code/web/public_php/webtt/cake/console/libs/tasks/project.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/project.php rename to code/web/public_php/webtt/cake/console/libs/tasks/project.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/template.php b/code/web/public_php/webtt/cake/console/libs/tasks/template.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/template.php rename to code/web/public_php/webtt/cake/console/libs/tasks/template.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/test.php b/code/web/public_php/webtt/cake/console/libs/tasks/test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/test.php rename to code/web/public_php/webtt/cake/console/libs/tasks/test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php b/code/web/public_php/webtt/cake/console/libs/tasks/view.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php rename to code/web/public_php/webtt/cake/console/libs/tasks/view.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/testsuite.php b/code/web/public_php/webtt/cake/console/libs/testsuite.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/libs/testsuite.php rename to code/web/public_php/webtt/cake/console/libs/testsuite.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/actions/controller_actions.ctp b/code/web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/actions/controller_actions.ctp rename to code/web/public_php/webtt/cake/console/templates/default/actions/controller_actions.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/controller.ctp b/code/web/public_php/webtt/cake/console/templates/default/classes/controller.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/controller.ctp rename to code/web/public_php/webtt/cake/console/templates/default/classes/controller.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/fixture.ctp b/code/web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/fixture.ctp rename to code/web/public_php/webtt/cake/console/templates/default/classes/fixture.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/model.ctp b/code/web/public_php/webtt/cake/console/templates/default/classes/model.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/model.ctp rename to code/web/public_php/webtt/cake/console/templates/default/classes/model.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/test.ctp b/code/web/public_php/webtt/cake/console/templates/default/classes/test.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/test.ctp rename to code/web/public_php/webtt/cake/console/templates/default/classes/test.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/form.ctp b/code/web/public_php/webtt/cake/console/templates/default/views/form.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/form.ctp rename to code/web/public_php/webtt/cake/console/templates/default/views/form.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/home.ctp b/code/web/public_php/webtt/cake/console/templates/default/views/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/home.ctp rename to code/web/public_php/webtt/cake/console/templates/default/views/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/index.ctp b/code/web/public_php/webtt/cake/console/templates/default/views/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/index.ctp rename to code/web/public_php/webtt/cake/console/templates/default/views/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/view.ctp b/code/web/public_php/webtt/cake/console/templates/default/views/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/view.ctp rename to code/web/public_php/webtt/cake/console/templates/default/views/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/.htaccess b/code/web/public_php/webtt/cake/console/templates/skel/.htaccess similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/.htaccess rename to code/web/public_php/webtt/cake/console/templates/skel/.htaccess diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_controller.php b/code/web/public_php/webtt/cake/console/templates/skel/app_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_controller.php rename to code/web/public_php/webtt/cake/console/templates/skel/app_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_helper.php b/code/web/public_php/webtt/cake/console/templates/skel/app_helper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_helper.php rename to code/web/public_php/webtt/cake/console/templates/skel/app_helper.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_model.php b/code/web/public_php/webtt/cake/console/templates/skel/app_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_model.php rename to code/web/public_php/webtt/cake/console/templates/skel/app_model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/acl.ini.php b/code/web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/acl.ini.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/acl.ini.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/bootstrap.php b/code/web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/bootstrap.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/bootstrap.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/core.php b/code/web/public_php/webtt/cake/console/templates/skel/config/core.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/core.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/core.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/database.php.default b/code/web/public_php/webtt/cake/console/templates/skel/config/database.php.default similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/database.php.default rename to code/web/public_php/webtt/cake/console/templates/skel/config/database.php.default diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/routes.php b/code/web/public_php/webtt/cake/console/templates/skel/config/routes.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/routes.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/routes.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.php b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.sql b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.sql rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/db_acl.sql diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.php b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.sql b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.sql rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/i18n.sql diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.php b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.php rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.sql b/code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.sql rename to code/web/public_php/webtt/cake/console/templates/skel/config/schema/sessions.sql diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/components/empty b/code/web/public_php/webtt/cake/console/templates/skel/controllers/components/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/components/empty rename to code/web/public_php/webtt/cake/console/templates/skel/controllers/components/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/pages_controller.php b/code/web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/pages_controller.php rename to code/web/public_php/webtt/cake/console/templates/skel/controllers/pages_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/index.php b/code/web/public_php/webtt/cake/console/templates/skel/index.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/index.php rename to code/web/public_php/webtt/cake/console/templates/skel/index.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/libs/empty b/code/web/public_php/webtt/cake/console/templates/skel/libs/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/libs/empty rename to code/web/public_php/webtt/cake/console/templates/skel/libs/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty b/code/web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty rename to code/web/public_php/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/behaviors/empty b/code/web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/behaviors/empty rename to code/web/public_php/webtt/cake/console/templates/skel/models/behaviors/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/datasources/empty b/code/web/public_php/webtt/cake/console/templates/skel/models/datasources/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/datasources/empty rename to code/web/public_php/webtt/cake/console/templates/skel/models/datasources/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/plugins/empty b/code/web/public_php/webtt/cake/console/templates/skel/plugins/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/plugins/empty rename to code/web/public_php/webtt/cake/console/templates/skel/plugins/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/behaviors/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/behaviors/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/behaviors/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/components/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/components/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/components/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/controllers/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/controllers/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/controllers/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/datasources/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/datasources/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/datasources/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/helpers/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/helpers/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/helpers/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/models/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/models/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/models/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/shells/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/shells/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/cases/shells/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/fixtures/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/fixtures/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/fixtures/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/groups/empty b/code/web/public_php/webtt/cake/console/templates/skel/tests/groups/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/groups/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tests/groups/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/models/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/models/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/models/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/persistent/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/persistent/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/persistent/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/views/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/views/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/cache/views/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/logs/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/logs/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/logs/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/sessions/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/sessions/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/sessions/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/tests/empty b/code/web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/tests/empty rename to code/web/public_php/webtt/cake/console/templates/skel/tmp/tests/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/vendors/shells/tasks/empty b/code/web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/vendors/shells/tasks/empty rename to code/web/public_php/webtt/cake/console/templates/skel/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/empty b/code/web/public_php/webtt/cake/console/templates/skel/views/elements/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/empty rename to code/web/public_php/webtt/cake/console/templates/skel/views/elements/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/errors/empty b/code/web/public_php/webtt/cake/console/templates/skel/views/errors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/errors/empty rename to code/web/public_php/webtt/cake/console/templates/skel/views/errors/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/helpers/empty b/code/web/public_php/webtt/cake/console/templates/skel/views/helpers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/helpers/empty rename to code/web/public_php/webtt/cake/console/templates/skel/views/helpers/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/ajax.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/ajax.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/ajax.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/flash.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/flash.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/flash.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/js/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/js/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/js/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp b/code/web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp rename to code/web/public_php/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/pages/empty b/code/web/public_php/webtt/cake/console/templates/skel/views/pages/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/pages/empty rename to code/web/public_php/webtt/cake/console/templates/skel/views/pages/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/scaffolds/empty b/code/web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/scaffolds/empty rename to code/web/public_php/webtt/cake/console/templates/skel/views/scaffolds/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/.htaccess b/code/web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/.htaccess rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/.htaccess diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css.php b/code/web/public_php/webtt/cake/console/templates/skel/webroot/css.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css.php rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/css.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css/cake.generic.css b/code/web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css/cake.generic.css rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/css/cake.generic.css diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/favicon.ico b/code/web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/favicon.ico rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/favicon.ico diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.icon.png b/code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.icon.png rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.icon.png diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.power.gif b/code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.power.gif rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/img/cake.power.gif diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/index.php b/code/web/public_php/webtt/cake/console/templates/skel/webroot/index.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/index.php rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/index.php diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/js/empty b/code/web/public_php/webtt/cake/console/templates/skel/webroot/js/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/js/empty rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/js/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/test.php b/code/web/public_php/webtt/cake/console/templates/skel/webroot/test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/test.php rename to code/web/public_php/webtt/cake/console/templates/skel/webroot/test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/dispatcher.php b/code/web/public_php/webtt/cake/dispatcher.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/dispatcher.php rename to code/web/public_php/webtt/cake/dispatcher.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache.php b/code/web/public_php/webtt/cake/libs/cache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cache.php rename to code/web/public_php/webtt/cake/libs/cache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/apc.php b/code/web/public_php/webtt/cake/libs/cache/apc.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cache/apc.php rename to code/web/public_php/webtt/cake/libs/cache/apc.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/file.php b/code/web/public_php/webtt/cake/libs/cache/file.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cache/file.php rename to code/web/public_php/webtt/cake/libs/cache/file.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/memcache.php b/code/web/public_php/webtt/cake/libs/cache/memcache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cache/memcache.php rename to code/web/public_php/webtt/cake/libs/cache/memcache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/xcache.php b/code/web/public_php/webtt/cake/libs/cache/xcache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cache/xcache.php rename to code/web/public_php/webtt/cake/libs/cache/xcache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_log.php b/code/web/public_php/webtt/cake/libs/cake_log.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cake_log.php rename to code/web/public_php/webtt/cake/libs/cake_log.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_session.php b/code/web/public_php/webtt/cake/libs/cake_session.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cake_session.php rename to code/web/public_php/webtt/cake/libs/cake_session.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_socket.php b/code/web/public_php/webtt/cake/libs/cake_socket.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/cake_socket.php rename to code/web/public_php/webtt/cake/libs/cake_socket.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/class_registry.php b/code/web/public_php/webtt/cake/libs/class_registry.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/class_registry.php rename to code/web/public_php/webtt/cake/libs/class_registry.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/configure.php b/code/web/public_php/webtt/cake/libs/configure.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/configure.php rename to code/web/public_php/webtt/cake/libs/configure.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/app_controller.php b/code/web/public_php/webtt/cake/libs/controller/app_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/app_controller.php rename to code/web/public_php/webtt/cake/libs/controller/app_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/component.php b/code/web/public_php/webtt/cake/libs/controller/component.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/component.php rename to code/web/public_php/webtt/cake/libs/controller/component.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/acl.php b/code/web/public_php/webtt/cake/libs/controller/components/acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/acl.php rename to code/web/public_php/webtt/cake/libs/controller/components/acl.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/auth.php b/code/web/public_php/webtt/cake/libs/controller/components/auth.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/auth.php rename to code/web/public_php/webtt/cake/libs/controller/components/auth.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/cookie.php b/code/web/public_php/webtt/cake/libs/controller/components/cookie.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/cookie.php rename to code/web/public_php/webtt/cake/libs/controller/components/cookie.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/email.php b/code/web/public_php/webtt/cake/libs/controller/components/email.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/email.php rename to code/web/public_php/webtt/cake/libs/controller/components/email.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/request_handler.php b/code/web/public_php/webtt/cake/libs/controller/components/request_handler.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/request_handler.php rename to code/web/public_php/webtt/cake/libs/controller/components/request_handler.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/security.php b/code/web/public_php/webtt/cake/libs/controller/components/security.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/security.php rename to code/web/public_php/webtt/cake/libs/controller/components/security.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/session.php b/code/web/public_php/webtt/cake/libs/controller/components/session.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/components/session.php rename to code/web/public_php/webtt/cake/libs/controller/components/session.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/controller.php b/code/web/public_php/webtt/cake/libs/controller/controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/controller.php rename to code/web/public_php/webtt/cake/libs/controller/controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/pages_controller.php b/code/web/public_php/webtt/cake/libs/controller/pages_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/pages_controller.php rename to code/web/public_php/webtt/cake/libs/controller/pages_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/scaffold.php b/code/web/public_php/webtt/cake/libs/controller/scaffold.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/controller/scaffold.php rename to code/web/public_php/webtt/cake/libs/controller/scaffold.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/debugger.php b/code/web/public_php/webtt/cake/libs/debugger.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/debugger.php rename to code/web/public_php/webtt/cake/libs/debugger.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/error.php b/code/web/public_php/webtt/cake/libs/error.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/error.php rename to code/web/public_php/webtt/cake/libs/error.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/file.php b/code/web/public_php/webtt/cake/libs/file.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/file.php rename to code/web/public_php/webtt/cake/libs/file.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/folder.php b/code/web/public_php/webtt/cake/libs/folder.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/folder.php rename to code/web/public_php/webtt/cake/libs/folder.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/http_socket.php b/code/web/public_php/webtt/cake/libs/http_socket.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/http_socket.php rename to code/web/public_php/webtt/cake/libs/http_socket.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/i18n.php b/code/web/public_php/webtt/cake/libs/i18n.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/i18n.php rename to code/web/public_php/webtt/cake/libs/i18n.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/inflector.php b/code/web/public_php/webtt/cake/libs/inflector.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/inflector.php rename to code/web/public_php/webtt/cake/libs/inflector.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/l10n.php b/code/web/public_php/webtt/cake/libs/l10n.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/l10n.php rename to code/web/public_php/webtt/cake/libs/l10n.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/log/file_log.php b/code/web/public_php/webtt/cake/libs/log/file_log.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/log/file_log.php rename to code/web/public_php/webtt/cake/libs/log/file_log.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/magic_db.php b/code/web/public_php/webtt/cake/libs/magic_db.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/magic_db.php rename to code/web/public_php/webtt/cake/libs/magic_db.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/app_model.php b/code/web/public_php/webtt/cake/libs/model/app_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/app_model.php rename to code/web/public_php/webtt/cake/libs/model/app_model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/acl.php b/code/web/public_php/webtt/cake/libs/model/behaviors/acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/acl.php rename to code/web/public_php/webtt/cake/libs/model/behaviors/acl.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/containable.php b/code/web/public_php/webtt/cake/libs/model/behaviors/containable.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/containable.php rename to code/web/public_php/webtt/cake/libs/model/behaviors/containable.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/translate.php b/code/web/public_php/webtt/cake/libs/model/behaviors/translate.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/translate.php rename to code/web/public_php/webtt/cake/libs/model/behaviors/translate.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/tree.php b/code/web/public_php/webtt/cake/libs/model/behaviors/tree.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/tree.php rename to code/web/public_php/webtt/cake/libs/model/behaviors/tree.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/cake_schema.php b/code/web/public_php/webtt/cake/libs/model/cake_schema.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/cake_schema.php rename to code/web/public_php/webtt/cake/libs/model/cake_schema.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/connection_manager.php b/code/web/public_php/webtt/cake/libs/model/connection_manager.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/connection_manager.php rename to code/web/public_php/webtt/cake/libs/model/connection_manager.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/datasource.php b/code/web/public_php/webtt/cake/libs/model/datasources/datasource.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/datasource.php rename to code/web/public_php/webtt/cake/libs/model/datasources/datasource.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php similarity index 99% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php index efc660f33..fc3bc4abf 100644 --- a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php @@ -14,7 +14,7 @@ * @link http://cakephp.org CakePHP(tm) Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo - * @since CakePHP(tm) v 0.9.0 + * @since CakePHP(tm) v 0.9.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php b/code/web/public_php/webtt/cake/libs/model/datasources/dbo_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php rename to code/web/public_php/webtt/cake/libs/model/datasources/dbo_source.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/db_acl.php b/code/web/public_php/webtt/cake/libs/model/db_acl.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/db_acl.php rename to code/web/public_php/webtt/cake/libs/model/db_acl.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/model.php b/code/web/public_php/webtt/cake/libs/model/model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/model.php rename to code/web/public_php/webtt/cake/libs/model/model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/model_behavior.php b/code/web/public_php/webtt/cake/libs/model/model_behavior.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/model/model_behavior.php rename to code/web/public_php/webtt/cake/libs/model/model_behavior.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/multibyte.php b/code/web/public_php/webtt/cake/libs/multibyte.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/multibyte.php rename to code/web/public_php/webtt/cake/libs/multibyte.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/object.php b/code/web/public_php/webtt/cake/libs/object.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/object.php rename to code/web/public_php/webtt/cake/libs/object.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable.php b/code/web/public_php/webtt/cake/libs/overloadable.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/overloadable.php rename to code/web/public_php/webtt/cake/libs/overloadable.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php4.php b/code/web/public_php/webtt/cake/libs/overloadable_php4.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php4.php rename to code/web/public_php/webtt/cake/libs/overloadable_php4.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php5.php b/code/web/public_php/webtt/cake/libs/overloadable_php5.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php5.php rename to code/web/public_php/webtt/cake/libs/overloadable_php5.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/router.php b/code/web/public_php/webtt/cake/libs/router.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/router.php rename to code/web/public_php/webtt/cake/libs/router.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/sanitize.php b/code/web/public_php/webtt/cake/libs/sanitize.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/sanitize.php rename to code/web/public_php/webtt/cake/libs/sanitize.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/security.php b/code/web/public_php/webtt/cake/libs/security.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/security.php rename to code/web/public_php/webtt/cake/libs/security.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/set.php b/code/web/public_php/webtt/cake/libs/set.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/set.php rename to code/web/public_php/webtt/cake/libs/set.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/string.php b/code/web/public_php/webtt/cake/libs/string.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/string.php rename to code/web/public_php/webtt/cake/libs/string.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/validation.php b/code/web/public_php/webtt/cake/libs/validation.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/validation.php rename to code/web/public_php/webtt/cake/libs/validation.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/html/default.ctp b/code/web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/html/default.ctp rename to code/web/public_php/webtt/cake/libs/view/elements/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/text/default.ctp b/code/web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/text/default.ctp rename to code/web/public_php/webtt/cake/libs/view/elements/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/sql_dump.ctp b/code/web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/elements/sql_dump.ctp rename to code/web/public_php/webtt/cake/libs/view/elements/sql_dump.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error404.ctp b/code/web/public_php/webtt/cake/libs/view/errors/error404.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error404.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/error404.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error500.ctp b/code/web/public_php/webtt/cake/libs/view/errors/error500.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error500.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/error500.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_action.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_action.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_action.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_action.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_class.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_class.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_class.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_file.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_file.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_behavior_file.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_class.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_class.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_component_class.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_file.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_file.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_component_file.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_connection.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_connection.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_connection.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_controller.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_controller.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_controller.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_class.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_class.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_helper_class.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_file.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_file.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_helper_file.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_layout.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_layout.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_layout.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_model.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_model.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_model.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_model.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_scaffolddb.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_scaffolddb.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_scaffolddb.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_table.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_table.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_table.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_table.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_view.ctp b/code/web/public_php/webtt/cake/libs/view/errors/missing_view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_view.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/missing_view.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/private_action.ctp b/code/web/public_php/webtt/cake/libs/view/errors/private_action.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/private_action.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/private_action.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/scaffold_error.ctp b/code/web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/errors/scaffold_error.ctp rename to code/web/public_php/webtt/cake/libs/view/errors/scaffold_error.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helper.php b/code/web/public_php/webtt/cake/libs/view/helper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helper.php rename to code/web/public_php/webtt/cake/libs/view/helper.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/ajax.php b/code/web/public_php/webtt/cake/libs/view/helpers/ajax.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/ajax.php rename to code/web/public_php/webtt/cake/libs/view/helpers/ajax.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/app_helper.php b/code/web/public_php/webtt/cake/libs/view/helpers/app_helper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/app_helper.php rename to code/web/public_php/webtt/cake/libs/view/helpers/app_helper.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php b/code/web/public_php/webtt/cake/libs/view/helpers/cache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php rename to code/web/public_php/webtt/cake/libs/view/helpers/cache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/form.php b/code/web/public_php/webtt/cake/libs/view/helpers/form.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/form.php rename to code/web/public_php/webtt/cake/libs/view/helpers/form.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/html.php b/code/web/public_php/webtt/cake/libs/view/helpers/html.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/html.php rename to code/web/public_php/webtt/cake/libs/view/helpers/html.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/javascript.php b/code/web/public_php/webtt/cake/libs/view/helpers/javascript.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/javascript.php rename to code/web/public_php/webtt/cake/libs/view/helpers/javascript.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/jquery_engine.php b/code/web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/jquery_engine.php rename to code/web/public_php/webtt/cake/libs/view/helpers/jquery_engine.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/js.php b/code/web/public_php/webtt/cake/libs/view/helpers/js.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/js.php rename to code/web/public_php/webtt/cake/libs/view/helpers/js.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/mootools_engine.php b/code/web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/mootools_engine.php rename to code/web/public_php/webtt/cake/libs/view/helpers/mootools_engine.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/number.php b/code/web/public_php/webtt/cake/libs/view/helpers/number.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/number.php rename to code/web/public_php/webtt/cake/libs/view/helpers/number.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/paginator.php b/code/web/public_php/webtt/cake/libs/view/helpers/paginator.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/paginator.php rename to code/web/public_php/webtt/cake/libs/view/helpers/paginator.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/prototype_engine.php b/code/web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/prototype_engine.php rename to code/web/public_php/webtt/cake/libs/view/helpers/prototype_engine.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/rss.php b/code/web/public_php/webtt/cake/libs/view/helpers/rss.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/rss.php rename to code/web/public_php/webtt/cake/libs/view/helpers/rss.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/session.php b/code/web/public_php/webtt/cake/libs/view/helpers/session.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/session.php rename to code/web/public_php/webtt/cake/libs/view/helpers/session.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/text.php b/code/web/public_php/webtt/cake/libs/view/helpers/text.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/text.php rename to code/web/public_php/webtt/cake/libs/view/helpers/text.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/time.php b/code/web/public_php/webtt/cake/libs/view/helpers/time.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/time.php rename to code/web/public_php/webtt/cake/libs/view/helpers/time.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/xml.php b/code/web/public_php/webtt/cake/libs/view/helpers/xml.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/xml.php rename to code/web/public_php/webtt/cake/libs/view/helpers/xml.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/ajax.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/ajax.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/ajax.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/ajax.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/html/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/html/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/text/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/text/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/flash.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/flash.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/flash.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/flash.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/js/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/js/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/js/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/js/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/rss/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/rss/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/rss/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/xml/default.ctp b/code/web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/xml/default.ctp rename to code/web/public_php/webtt/cake/libs/view/layouts/xml/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/media.php b/code/web/public_php/webtt/cake/libs/view/media.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/media.php rename to code/web/public_php/webtt/cake/libs/view/media.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/pages/home.ctp b/code/web/public_php/webtt/cake/libs/view/pages/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/pages/home.ctp rename to code/web/public_php/webtt/cake/libs/view/pages/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/edit.ctp b/code/web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/edit.ctp rename to code/web/public_php/webtt/cake/libs/view/scaffolds/edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/index.ctp b/code/web/public_php/webtt/cake/libs/view/scaffolds/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/index.ctp rename to code/web/public_php/webtt/cake/libs/view/scaffolds/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/view.ctp b/code/web/public_php/webtt/cake/libs/view/scaffolds/view.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/view.ctp rename to code/web/public_php/webtt/cake/libs/view/scaffolds/view.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/theme.php b/code/web/public_php/webtt/cake/libs/view/theme.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/theme.php rename to code/web/public_php/webtt/cake/libs/view/theme.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/view.php b/code/web/public_php/webtt/cake/libs/view/view.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/view/view.php rename to code/web/public_php/webtt/cake/libs/view/view.php diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/xml.php b/code/web/public_php/webtt/cake/libs/xml.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/libs/xml.php rename to code/web/public_php/webtt/cake/libs/xml.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/basics.test.php b/code/web/public_php/webtt/cake/tests/cases/basics.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/basics.test.php rename to code/web/public_php/webtt/cake/tests/cases/basics.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/cake.test.php b/code/web/public_php/webtt/cake/tests/cases/console/cake.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/cake.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/cake.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/acl.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/acl.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/acl.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/api.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/api.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/api.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/api.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/bake.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/bake.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/bake.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/schema.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/schema.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/schema.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/shell.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/shell.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/shell.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/controller.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/controller.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/controller.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/extract.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/extract.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/extract.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/model.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/model.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/model.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/project.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/project.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/project.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/template.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/template.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/template.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/test.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/test.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/test.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/view.test.php b/code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/view.test.php rename to code/web/public_php/webtt/cake/tests/cases/console/libs/tasks/view.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/dispatcher.test.php b/code/web/public_php/webtt/cake/tests/cases/dispatcher.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/dispatcher.test.php rename to code/web/public_php/webtt/cake/tests/cases/dispatcher.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cache.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cache.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/apc.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/apc.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cache/apc.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/file.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/file.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cache/file.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/memcache.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/memcache.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cache/memcache.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/xcache.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/xcache.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cache/xcache.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_log.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_log.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cake_log.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_session.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_session.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cake_session.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_socket.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_socket.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cake_socket.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_case.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_case.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cake_test_case.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_fixture.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_fixture.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/cake_test_fixture.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/class_registry.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/class_registry.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/class_registry.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/code_coverage_manager.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/code_coverage_manager.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/code_coverage_manager.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/configure.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/configure.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/configure.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/configure.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/component.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/component.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/component.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/acl.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/acl.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/acl.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/auth.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/auth.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/auth.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/cookie.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/cookie.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/cookie.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/email.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/email.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/email.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/security.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/security.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/security.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/session.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/session.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/components/session.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/controller.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/pages_controller.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/pages_controller.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/pages_controller.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/scaffold.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/scaffold.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/controller/scaffold.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/debugger.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/debugger.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/debugger.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/debugger.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/error.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/error.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/error.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/error.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/file.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/file.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/file.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/file.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/folder.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/folder.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/folder.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/folder.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/http_socket.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/http_socket.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/http_socket.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/i18n.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/i18n.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/i18n.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/i18n.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/inflector.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/inflector.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/inflector.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/inflector.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/l10n.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/l10n.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/l10n.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/l10n.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/log/file_log.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/log/file_log.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/log/file_log.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/magic_db.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/magic_db.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/magic_db.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/cake_schema.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/cake_schema.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/cake_schema.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/connection_manager.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/connection_manager.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/connection_manager.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/db_acl.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/db_acl.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/db_acl.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_behavior.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_behavior.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_behavior.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_delete.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_delete.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_delete.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_integration.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_integration.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_integration.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_read.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_read.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_read.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_validation.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_validation.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_validation.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_write.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_write.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/model_write.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/models.php b/code/web/public_php/webtt/cake/tests/cases/libs/model/models.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/models.php rename to code/web/public_php/webtt/cake/tests/cases/libs/model/models.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/multibyte.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/multibyte.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/multibyte.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/object.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/object.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/object.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/object.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/overloadable.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/overloadable.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/overloadable.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/router.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/router.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/router.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/router.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/sanitize.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/sanitize.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/sanitize.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/security.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/security.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/security.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/security.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/set.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/set.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/set.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/set.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/string.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/string.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/string.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/string.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/test_manager.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/test_manager.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/test_manager.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/validation.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/validation.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/validation.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/validation.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helper.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helper.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helper.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/cache.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/cache.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/cache.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/form.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/form.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/form.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/html.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/html.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/html.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/js.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/js.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/js.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/number.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/number.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/number.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/rss.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/rss.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/rss.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/session.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/session.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/session.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/text.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/text.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/text.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/time.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/time.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/time.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/xml.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/xml.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/helpers/xml.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/media.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/media.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/media.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/media.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/theme.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/theme.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/theme.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/view.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/view/view.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/view.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/view/view.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/xml.test.php b/code/web/public_php/webtt/cake/tests/cases/libs/xml.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/xml.test.php rename to code/web/public_php/webtt/cake/tests/cases/libs/xml.test.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/account_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/account_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/account_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/account_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_action_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_action_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aco_action_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aco_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aco_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_two_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_two_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aco_two_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/ad_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/ad_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/ad_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/ad_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/advertisement_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/advertisement_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/advertisement_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/after_tree_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/after_tree_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/after_tree_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/another_article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/another_article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/another_article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/apple_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/apple_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/apple_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/apple_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aro_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aro_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_two_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_two_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aro_two_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aros_aco_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_two_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_two_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/aros_aco_two_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featured_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featured_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/article_featured_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/articles_tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/articles_tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/articles_tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/attachment_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/attachment_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/attachment_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/auth_user_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/author_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/author_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/author_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/author_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/basket_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/basket_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/basket_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/basket_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/bid_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/bid_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/bid_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/bid_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/binary_test_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/binary_test_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/binary_test_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/book_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/book_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/book_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/book_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cache_test_model_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cache_test_model_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/cache_test_model_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/callback_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/callback_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/callback_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/callback_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/campaign_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/campaign_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/campaign_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/category_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/category_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_thread_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_thread_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/category_thread_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cd_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/cd_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cd_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/cd_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/comment_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/comment_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/comment_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/comment_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_account_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_account_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/content_account_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/content_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/content_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/data_test_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/data_test_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/data_test_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/datatype_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/datatype_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/datatype_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/dependency_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/dependency_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/dependency_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/device_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/device_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_category_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_category_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/device_type_category_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/device_type_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_directory_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_directory_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/document_directory_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/document_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/document_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/exterior_type_category_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/exterior_type_category_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/exterior_type_category_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/feature_set_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/feature_set_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/feature_set_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/featured_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/featured_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/featured_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/featured_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/film_file_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/film_file_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/film_file_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/flag_tree_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/flag_tree_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/flag_tree_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruit_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruit_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/fruit_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/group_update_all_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/group_update_all_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/group_update_all_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/home_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/home_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/home_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/home_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/image_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/image_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/image_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/image_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/item_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/item_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/item_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/item_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/items_portfolio_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/items_portfolio_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/items_portfolio_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_b_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_b_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_a_b_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_c_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_c_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_a_c_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_a_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_b_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_b_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_b_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_c_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_c_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_c_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_thing_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_thing_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/join_thing_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/message_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/message_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/message_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/message_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_category_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_category_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/my_category_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_product_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_product_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/my_product_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_user_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_user_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/my_user_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/node_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/node_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/node_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/node_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/number_tree_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_two_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_two_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/number_tree_two_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/numeric_article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/numeric_article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/numeric_article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/overall_favorite_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/overall_favorite_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/overall_favorite_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/person_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/person_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/person_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/person_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/portfolio_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/portfolio_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/portfolio_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/post_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/post_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/post_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/post_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/posts_tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/posts_tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/posts_tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/primary_model_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/primary_model_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/primary_model_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/product_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/product_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_update_all_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_update_all_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/product_update_all_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/project_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/project_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/project_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/project_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/sample_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/sample_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/sample_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/sample_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/secondary_model_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/secondary_model_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/secondary_model_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/session_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/session_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/session_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/session_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_else_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_else_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/something_else_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/something_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/something_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/stories_tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/stories_tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/stories_tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/story_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/story_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/story_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/story_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/syfile_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/syfile_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/syfile_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/test_plugin_article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/thread_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/thread_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/thread_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/thread_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translate_article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translate_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translate_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_table_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_table_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translate_table_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_article_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_article_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translated_article_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_item_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_item_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/translated_item_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/unconventional_tree_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/unconventional_tree_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/unconventional_tree_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/underscore_field_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/underscore_field_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/underscore_field_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/user_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/user_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/user_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/user_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuid_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tag_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tag_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuid_tag_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tree_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tree_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuid_tree_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditem_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditem_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuiditem_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuidportfolio_fixture.php b/code/web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuidportfolio_fixture.php rename to code/web/public_php/webtt/cake/tests/fixtures/uuidportfolio_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/acl.group.php b/code/web/public_php/webtt/cake/tests/groups/acl.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/acl.group.php rename to code/web/public_php/webtt/cake/tests/groups/acl.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/bake.group.php b/code/web/public_php/webtt/cake/tests/groups/bake.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/bake.group.php rename to code/web/public_php/webtt/cake/tests/groups/bake.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/behaviors.group.php b/code/web/public_php/webtt/cake/tests/groups/behaviors.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/behaviors.group.php rename to code/web/public_php/webtt/cake/tests/groups/behaviors.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/cache.group.php b/code/web/public_php/webtt/cake/tests/groups/cache.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/cache.group.php rename to code/web/public_php/webtt/cake/tests/groups/cache.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/components.group.php b/code/web/public_php/webtt/cake/tests/groups/components.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/components.group.php rename to code/web/public_php/webtt/cake/tests/groups/components.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/configure.group.php b/code/web/public_php/webtt/cake/tests/groups/configure.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/configure.group.php rename to code/web/public_php/webtt/cake/tests/groups/configure.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/console.group.php b/code/web/public_php/webtt/cake/tests/groups/console.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/console.group.php rename to code/web/public_php/webtt/cake/tests/groups/console.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/controller.group.php b/code/web/public_php/webtt/cake/tests/groups/controller.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/controller.group.php rename to code/web/public_php/webtt/cake/tests/groups/controller.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/database.group.php b/code/web/public_php/webtt/cake/tests/groups/database.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/database.group.php rename to code/web/public_php/webtt/cake/tests/groups/database.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/helpers.group.php b/code/web/public_php/webtt/cake/tests/groups/helpers.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/helpers.group.php rename to code/web/public_php/webtt/cake/tests/groups/helpers.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/i18n.group.php b/code/web/public_php/webtt/cake/tests/groups/i18n.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/i18n.group.php rename to code/web/public_php/webtt/cake/tests/groups/i18n.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/javascript.group.php b/code/web/public_php/webtt/cake/tests/groups/javascript.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/javascript.group.php rename to code/web/public_php/webtt/cake/tests/groups/javascript.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/lib.group.php b/code/web/public_php/webtt/cake/tests/groups/lib.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/lib.group.php rename to code/web/public_php/webtt/cake/tests/groups/lib.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/model.group.php b/code/web/public_php/webtt/cake/tests/groups/model.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/model.group.php rename to code/web/public_php/webtt/cake/tests/groups/model.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/no_cross_contamination.group.php b/code/web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/no_cross_contamination.group.php rename to code/web/public_php/webtt/cake/tests/groups/no_cross_contamination.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/routing_system.group.php b/code/web/public_php/webtt/cake/tests/groups/routing_system.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/routing_system.group.php rename to code/web/public_php/webtt/cake/tests/groups/routing_system.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/socket.group.php b/code/web/public_php/webtt/cake/tests/groups/socket.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/socket.group.php rename to code/web/public_php/webtt/cake/tests/groups/socket.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/test_suite.group.php b/code/web/public_php/webtt/cake/tests/groups/test_suite.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/test_suite.group.php rename to code/web/public_php/webtt/cake/tests/groups/test_suite.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/view.group.php b/code/web/public_php/webtt/cake/tests/groups/view.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/view.group.php rename to code/web/public_php/webtt/cake/tests/groups/view.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/xml.group.php b/code/web/public_php/webtt/cake/tests/groups/xml.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/groups/xml.group.php rename to code/web/public_php/webtt/cake/tests/groups/xml.group.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_case.php b/code/web/public_php/webtt/cake/tests/lib/cake_test_case.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_case.php rename to code/web/public_php/webtt/cake/tests/lib/cake_test_case.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_fixture.php b/code/web/public_php/webtt/cake/tests/lib/cake_test_fixture.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_fixture.php rename to code/web/public_php/webtt/cake/tests/lib/cake_test_fixture.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_model.php b/code/web/public_php/webtt/cake/tests/lib/cake_test_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_model.php rename to code/web/public_php/webtt/cake/tests/lib/cake_test_model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_suite_dispatcher.php b/code/web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_suite_dispatcher.php rename to code/web/public_php/webtt/cake/tests/lib/cake_test_suite_dispatcher.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_web_test_case.php b/code/web/public_php/webtt/cake/tests/lib/cake_web_test_case.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_web_test_case.php rename to code/web/public_php/webtt/cake/tests/lib/cake_web_test_case.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/code_coverage_manager.php b/code/web/public_php/webtt/cake/tests/lib/code_coverage_manager.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/code_coverage_manager.php rename to code/web/public_php/webtt/cake/tests/lib/code_coverage_manager.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_base_reporter.php b/code/web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_base_reporter.php rename to code/web/public_php/webtt/cake/tests/lib/reporter/cake_base_reporter.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_cli_reporter.php b/code/web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_cli_reporter.php rename to code/web/public_php/webtt/cake/tests/lib/reporter/cake_cli_reporter.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_html_reporter.php b/code/web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_html_reporter.php rename to code/web/public_php/webtt/cake/tests/lib/reporter/cake_html_reporter.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_text_reporter.php b/code/web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_text_reporter.php rename to code/web/public_php/webtt/cake/tests/lib/reporter/cake_text_reporter.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/footer.php b/code/web/public_php/webtt/cake/tests/lib/templates/footer.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/footer.php rename to code/web/public_php/webtt/cake/tests/lib/templates/footer.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/header.php b/code/web/public_php/webtt/cake/tests/lib/templates/header.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/header.php rename to code/web/public_php/webtt/cake/tests/lib/templates/header.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/menu.php b/code/web/public_php/webtt/cake/tests/lib/templates/menu.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/menu.php rename to code/web/public_php/webtt/cake/tests/lib/templates/menu.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/simpletest.php b/code/web/public_php/webtt/cake/tests/lib/templates/simpletest.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/simpletest.php rename to code/web/public_php/webtt/cake/tests/lib/templates/simpletest.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/xdebug.php b/code/web/public_php/webtt/cake/tests/lib/templates/xdebug.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/xdebug.php rename to code/web/public_php/webtt/cake/tests/lib/templates/xdebug.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/test_manager.php b/code/web/public_php/webtt/cake/tests/lib/test_manager.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/lib/test_manager.php rename to code/web/public_php/webtt/cake/tests/lib/test_manager.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/config/acl.ini.php b/code/web/public_php/webtt/cake/tests/test_app/config/acl.ini.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/config/acl.ini.php rename to code/web/public_php/webtt/cake/tests/test_app/config/acl.ini.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/components/empty b/code/web/public_php/webtt/cake/tests/test_app/controllers/components/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/components/empty rename to code/web/public_php/webtt/cake/tests/test_app/controllers/components/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_controller.php b/code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_controller.php rename to code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php rename to code/web/public_php/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/cache/test_app_cache.php b/code/web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/cache/test_app_cache.php rename to code/web/public_php/webtt/cake/tests/test_app/libs/cache/test_app_cache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/library.php b/code/web/public_php/webtt/cake/tests/test_app/libs/library.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/library.php rename to code/web/public_php/webtt/cake/tests/test_app/libs/library.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/log/test_app_log.php b/code/web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/log/test_app_log.php rename to code/web/public_php/webtt/cake/tests/test_app/libs/log/test_app_log.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME b/code/web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME rename to code/web/public_php/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_TIME b/code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_TIME rename to code/web/public_php/webtt/cake/tests/test_app/locale/po/LC_TIME diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po rename to code/web/public_php/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/time_test/LC_TIME b/code/web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/time_test/LC_TIME rename to code/web/public_php/webtt/cake/tests/test_app/locale/time_test/LC_TIME diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/empty b/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/empty rename to code/web/public_php/webtt/cake/tests/test_app/models/behaviors/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php rename to code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php rename to code/web/public_php/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/comment.php b/code/web/public_php/webtt/cake/tests/test_app/models/comment.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/comment.php rename to code/web/public_php/webtt/cake/tests/test_app/models/comment.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_other_source.php b/code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_other_source.php rename to code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_other_source.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_source.php b/code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_source.php rename to code/web/public_php/webtt/cake/tests/test_app/models/datasources/test2_source.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_one.php b/code/web/public_php/webtt/cake/tests/test_app/models/persister_one.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_one.php rename to code/web/public_php/webtt/cake/tests/test_app/models/persister_one.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_two.php b/code/web/public_php/webtt/cake/tests/test_app/models/persister_two.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_two.php rename to code/web/public_php/webtt/cake/tests/test_app/models/persister_two.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/post.php b/code/web/public_php/webtt/cake/tests/test_app/models/post.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/post.php rename to code/web/public_php/webtt/cake/tests/test_app/models/post.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js rename to code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js rename to code/web/public_php/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php rename to code/web/public_php/webtt/cake/tests/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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php rename to code/web/public_php/webtt/cake/tests/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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php 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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php 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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po 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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po 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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php 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/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php rename to code/web/public_php/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/tmp/dir_map b/code/web/public_php/webtt/cake/tests/test_app/tmp/dir_map similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/tmp/dir_map rename to code/web/public_php/webtt/cake/tests/test_app/tmp/dir_map diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/MyTest.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/MyTest.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/Test/MyTest.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/hello.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/hello.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/Test/hello.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/css/test_asset.css b/code/web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/css/test_asset.css rename to code/web/public_php/webtt/cake/tests/test_app/vendors/css/test_asset.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/img/test.jpg b/code/web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/img/test.jpg rename to code/web/public_php/webtt/cake/tests/test_app/vendors/img/test.jpg diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/sample.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/sample.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/shells/sample.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/tasks/empty b/code/web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/tasks/empty rename to code/web/public_php/webtt/cake/tests/test_app/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/somename/some.name.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/somename/some.name.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/somename/some.name.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/welcome.php b/code/web/public_php/webtt/cake/tests/test_app/vendors/welcome.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/welcome.php rename to code/web/public_php/webtt/cake/tests/test_app/vendors/welcome.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/empty b/code/web/public_php/webtt/cake/tests/test_app/views/elements/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/empty rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/html_call.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/html_call.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/html_call.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/session_helper.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/session_helper.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/session_helper.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/test_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/test_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/test_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/type_check.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/type_check.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/elements/type_check.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/errors/empty b/code/web/public_php/webtt/cake/tests/test_app/views/errors/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/errors/empty rename to code/web/public_php/webtt/cake/tests/test_app/views/errors/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/banana.php b/code/web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/banana.php rename to code/web/public_php/webtt/cake/tests/test_app/views/helpers/banana.php diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/empty b/code/web/public_php/webtt/cake/tests/test_app/views/helpers/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/empty rename to code/web/public_php/webtt/cake/tests/test_app/views/helpers/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax2.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax2.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/ajax2.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/flash.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/flash.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/flash.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/js/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/js/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/js/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/rss/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/rss/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/rss/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/xml/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/xml/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/layouts/xml/default.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/empty b/code/web/public_php/webtt/cake/tests/test_app/views/pages/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/empty rename to code/web/public_php/webtt/cake/tests/test_app/views/pages/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/extract.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/extract.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/pages/extract.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/home.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/home.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/pages/home.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_form.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_form.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/cache_form.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/index.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/scaffolds/empty b/code/web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/scaffolds/empty rename to code/web/public_php/webtt/cake/tests/test_app/views/scaffolds/empty diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/tests_apps/index.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/tests_apps/index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/tests_apps/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp 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/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp 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/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg 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/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf b/code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf rename to code/web/public_php/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css b/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css rename to code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css b/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css rename to code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif b/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif rename to code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg b/code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg similarity index 100% rename from code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg rename to code/web/public_php/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg diff --git a/code/ryzom/tools/server/www/webtt/docs/INSTALL b/code/web/public_php/webtt/docs/INSTALL similarity index 100% rename from code/ryzom/tools/server/www/webtt/docs/INSTALL rename to code/web/public_php/webtt/docs/INSTALL diff --git a/code/ryzom/tools/server/www/webtt/docs/db/CakePHP_Associations b/code/web/public_php/webtt/docs/db/CakePHP_Associations similarity index 100% rename from code/ryzom/tools/server/www/webtt/docs/db/CakePHP_Associations rename to code/web/public_php/webtt/docs/db/CakePHP_Associations diff --git a/code/ryzom/tools/server/www/webtt/docs/db/erd.png b/code/web/public_php/webtt/docs/db/erd.png similarity index 100% rename from code/ryzom/tools/server/www/webtt/docs/db/erd.png rename to code/web/public_php/webtt/docs/db/erd.png diff --git a/code/ryzom/tools/server/www/webtt/docs/db/webtt2.db b/code/web/public_php/webtt/docs/db/webtt2.db similarity index 100% rename from code/ryzom/tools/server/www/webtt/docs/db/webtt2.db rename to code/web/public_php/webtt/docs/db/webtt2.db diff --git a/code/ryzom/tools/server/www/webtt/index.php b/code/web/public_php/webtt/index.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/index.php rename to code/web/public_php/webtt/index.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/.gitignore b/code/web/public_php/webtt/plugins/debug_kit/.gitignore similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/.gitignore rename to code/web/public_php/webtt/plugins/debug_kit/.gitignore diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/README.mdown b/code/web/public_php/webtt/plugins/debug_kit/README.mdown similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/README.mdown rename to code/web/public_php/webtt/plugins/debug_kit/README.mdown diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/build.py b/code/web/public_php/webtt/plugins/debug_kit/build.py similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/build.py rename to code/web/public_php/webtt/plugins/debug_kit/build.py diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/components/toolbar.php b/code/web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/components/toolbar.php rename to code/web/public_php/webtt/plugins/debug_kit/controllers/components/toolbar.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php b/code/web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php rename to code/web/public_php/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_controller.php b/code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_controller.php rename to code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_controller.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_model.php b/code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_model.php rename to code/web/public_php/webtt/plugins/debug_kit/debug_kit_app_model.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/debug_kit.pot b/code/web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/debug_kit.pot rename to code/web/public_php/webtt/plugins/debug_kit/locale/debug_kit.pot diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po b/code/web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po rename to code/web/public_php/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po b/code/web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po rename to code/web/public_php/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/behaviors/timed.php b/code/web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/behaviors/timed.php rename to code/web/public_php/webtt/plugins/debug_kit/models/behaviors/timed.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/toolbar_access.php b/code/web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/toolbar_access.php rename to code/web/public_php/webtt/plugins/debug_kit/models/toolbar_access.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/test_objects.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/test_objects.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/test_objects.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/debug.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/debug.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/debug.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php b/code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/groups/view_group.group.php b/code/web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/groups/view_group.group.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/groups/view_group.group.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php b/code/web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php b/code/web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php rename to code/web/public_php/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php 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/web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp rename to code/web/public_php/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php b/code/web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php rename to code/web/public_php/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/fire_cake.php b/code/web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/fire_cake.php rename to code/web/public_php/webtt/plugins/debug_kit/vendors/fire_cake.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/benchmark.php b/code/web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/benchmark.php rename to code/web/public_php/webtt/plugins/debug_kit/vendors/shells/benchmark.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/whitespace.php b/code/web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/whitespace.php rename to code/web/public_php/webtt/plugins/debug_kit/vendors/shells/whitespace.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/debug.php b/code/web/public_php/webtt/plugins/debug_kit/views/debug.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/debug.php rename to code/web/public_php/webtt/plugins/debug_kit/views/debug.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/history_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/history_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/history_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/log_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/request_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/request_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/request_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/session_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/session_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/session_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/timer_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/timer_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/timer_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/variables_panel.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/variables_panel.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/elements/variables_panel.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php b/code/web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php rename to code/web/public_php/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/html_toolbar.php b/code/web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/html_toolbar.php rename to code/web/public_php/webtt/plugins/debug_kit/views/helpers/html_toolbar.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/simple_graph.php b/code/web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/simple_graph.php rename to code/web/public_php/webtt/plugins/debug_kit/views/helpers/simple_graph.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/toolbar.php b/code/web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/toolbar.php rename to code/web/public_php/webtt/plugins/debug_kit/views/helpers/toolbar.php diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp b/code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp rename to code/web/public_php/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css b/code/web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css rename to code/web/public_php/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/img/cake.icon.png b/code/web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/img/cake.icon.png rename to code/web/public_php/webtt/plugins/debug_kit/webroot/img/cake.icon.png diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js b/code/web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js rename to code/web/public_php/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js diff --git a/code/ryzom/tools/server/www/webtt/plugins/empty b/code/web/public_php/webtt/plugins/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/plugins/empty rename to code/web/public_php/webtt/plugins/empty diff --git a/code/ryzom/tools/server/www/webtt/vendors/shells/tasks/empty b/code/web/public_php/webtt/vendors/shells/tasks/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/shells/tasks/empty rename to code/web/public_php/webtt/vendors/shells/tasks/empty diff --git a/code/ryzom/tools/server/www/webtt/vendors/shells/templates/empty b/code/web/public_php/webtt/vendors/shells/templates/empty similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/shells/templates/empty rename to code/web/public_php/webtt/vendors/shells/templates/empty diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/code/web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE rename to code/web/public_php/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/LICENSE b/code/web/public_php/webtt/vendors/simpletest/LICENSE similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/LICENSE rename to code/web/public_php/webtt/vendors/simpletest/LICENSE diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/README b/code/web/public_php/webtt/vendors/simpletest/README similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/README rename to code/web/public_php/webtt/vendors/simpletest/README diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/VERSION b/code/web/public_php/webtt/vendors/simpletest/VERSION similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/VERSION rename to code/web/public_php/webtt/vendors/simpletest/VERSION diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/authentication.php b/code/web/public_php/webtt/vendors/simpletest/authentication.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/authentication.php rename to code/web/public_php/webtt/vendors/simpletest/authentication.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/autorun.php b/code/web/public_php/webtt/vendors/simpletest/autorun.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/autorun.php rename to code/web/public_php/webtt/vendors/simpletest/autorun.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/browser.php b/code/web/public_php/webtt/vendors/simpletest/browser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/browser.php rename to code/web/public_php/webtt/vendors/simpletest/browser.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/collector.php b/code/web/public_php/webtt/vendors/simpletest/collector.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/collector.php rename to code/web/public_php/webtt/vendors/simpletest/collector.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/compatibility.php b/code/web/public_php/webtt/vendors/simpletest/compatibility.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/compatibility.php rename to code/web/public_php/webtt/vendors/simpletest/compatibility.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/cookies.php b/code/web/public_php/webtt/vendors/simpletest/cookies.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/cookies.php rename to code/web/public_php/webtt/vendors/simpletest/cookies.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/default_reporter.php b/code/web/public_php/webtt/vendors/simpletest/default_reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/default_reporter.php rename to code/web/public_php/webtt/vendors/simpletest/default_reporter.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/detached.php b/code/web/public_php/webtt/vendors/simpletest/detached.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/detached.php rename to code/web/public_php/webtt/vendors/simpletest/detached.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/authentication_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/authentication_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/authentication_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/browser_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/browser_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/browser_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/docs.css b/code/web/public_php/webtt/vendors/simpletest/docs/en/docs.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/docs.css rename to code/web/public_php/webtt/vendors/simpletest/docs/en/docs.css diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/expectation_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/expectation_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/expectation_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/form_testing_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/form_testing_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/form_testing_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/group_test_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/group_test_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/group_test_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/index.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/index.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/index.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/index.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/overview.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/overview.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/overview.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/overview.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/reporter_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/reporter_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/reporter_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/unit_test_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/unit_test_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/unit_test_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/web_tester_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/web_tester_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/en/web_tester_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/authentication_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/authentication_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/authentication_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/browser_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/browser_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/browser_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/docs.css b/code/web/public_php/webtt/vendors/simpletest/docs/fr/docs.css similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/docs.css rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/docs.css diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/expectation_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/expectation_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/expectation_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/group_test_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/group_test_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/group_test_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/index.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/index.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/index.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/index.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/overview.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/overview.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/overview.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/overview.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/reporter_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/reporter_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/reporter_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html b/code/web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html rename to code/web/public_php/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/dumper.php b/code/web/public_php/webtt/vendors/simpletest/dumper.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/dumper.php rename to code/web/public_php/webtt/vendors/simpletest/dumper.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/eclipse.php b/code/web/public_php/webtt/vendors/simpletest/eclipse.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/eclipse.php rename to code/web/public_php/webtt/vendors/simpletest/eclipse.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/encoding.php b/code/web/public_php/webtt/vendors/simpletest/encoding.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/encoding.php rename to code/web/public_php/webtt/vendors/simpletest/encoding.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/errors.php b/code/web/public_php/webtt/vendors/simpletest/errors.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/errors.php rename to code/web/public_php/webtt/vendors/simpletest/errors.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/exceptions.php b/code/web/public_php/webtt/vendors/simpletest/exceptions.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/exceptions.php rename to code/web/public_php/webtt/vendors/simpletest/exceptions.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/expectation.php b/code/web/public_php/webtt/vendors/simpletest/expectation.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/expectation.php rename to code/web/public_php/webtt/vendors/simpletest/expectation.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/pear_test_case.php b/code/web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/pear_test_case.php rename to code/web/public_php/webtt/vendors/simpletest/extensions/pear_test_case.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox.php b/code/web/public_php/webtt/vendors/simpletest/extensions/testdox.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox.php rename to code/web/public_php/webtt/vendors/simpletest/extensions/testdox.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox/test.php b/code/web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox/test.php rename to code/web/public_php/webtt/vendors/simpletest/extensions/testdox/test.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/form.php b/code/web/public_php/webtt/vendors/simpletest/form.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/form.php rename to code/web/public_php/webtt/vendors/simpletest/form.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/frames.php b/code/web/public_php/webtt/vendors/simpletest/frames.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/frames.php rename to code/web/public_php/webtt/vendors/simpletest/frames.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/http.php b/code/web/public_php/webtt/vendors/simpletest/http.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/http.php rename to code/web/public_php/webtt/vendors/simpletest/http.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/invoker.php b/code/web/public_php/webtt/vendors/simpletest/invoker.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/invoker.php rename to code/web/public_php/webtt/vendors/simpletest/invoker.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/mock_objects.php b/code/web/public_php/webtt/vendors/simpletest/mock_objects.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/mock_objects.php rename to code/web/public_php/webtt/vendors/simpletest/mock_objects.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/page.php b/code/web/public_php/webtt/vendors/simpletest/page.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/page.php rename to code/web/public_php/webtt/vendors/simpletest/page.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/php_parser.php b/code/web/public_php/webtt/vendors/simpletest/php_parser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/php_parser.php rename to code/web/public_php/webtt/vendors/simpletest/php_parser.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php4.php b/code/web/public_php/webtt/vendors/simpletest/reflection_php4.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php4.php rename to code/web/public_php/webtt/vendors/simpletest/reflection_php4.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php5.php b/code/web/public_php/webtt/vendors/simpletest/reflection_php5.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php5.php rename to code/web/public_php/webtt/vendors/simpletest/reflection_php5.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/remote.php b/code/web/public_php/webtt/vendors/simpletest/remote.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/remote.php rename to code/web/public_php/webtt/vendors/simpletest/remote.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reporter.php b/code/web/public_php/webtt/vendors/simpletest/reporter.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/reporter.php rename to code/web/public_php/webtt/vendors/simpletest/reporter.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/scorer.php b/code/web/public_php/webtt/vendors/simpletest/scorer.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/scorer.php rename to code/web/public_php/webtt/vendors/simpletest/scorer.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/selector.php b/code/web/public_php/webtt/vendors/simpletest/selector.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/selector.php rename to code/web/public_php/webtt/vendors/simpletest/selector.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/shell_tester.php b/code/web/public_php/webtt/vendors/simpletest/shell_tester.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/shell_tester.php rename to code/web/public_php/webtt/vendors/simpletest/shell_tester.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/simpletest.php b/code/web/public_php/webtt/vendors/simpletest/simpletest.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/simpletest.php rename to code/web/public_php/webtt/vendors/simpletest/simpletest.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/socket.php b/code/web/public_php/webtt/vendors/simpletest/socket.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/socket.php rename to code/web/public_php/webtt/vendors/simpletest/socket.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/tag.php b/code/web/public_php/webtt/vendors/simpletest/tag.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/tag.php rename to code/web/public_php/webtt/vendors/simpletest/tag.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/test_case.php b/code/web/public_php/webtt/vendors/simpletest/test_case.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/test_case.php rename to code/web/public_php/webtt/vendors/simpletest/test_case.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/tidy_parser.php b/code/web/public_php/webtt/vendors/simpletest/tidy_parser.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/tidy_parser.php rename to code/web/public_php/webtt/vendors/simpletest/tidy_parser.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/unit_tester.php b/code/web/public_php/webtt/vendors/simpletest/unit_tester.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/unit_tester.php rename to code/web/public_php/webtt/vendors/simpletest/unit_tester.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/url.php b/code/web/public_php/webtt/vendors/simpletest/url.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/url.php rename to code/web/public_php/webtt/vendors/simpletest/url.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/user_agent.php b/code/web/public_php/webtt/vendors/simpletest/user_agent.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/user_agent.php rename to code/web/public_php/webtt/vendors/simpletest/user_agent.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/web_tester.php b/code/web/public_php/webtt/vendors/simpletest/web_tester.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/web_tester.php rename to code/web/public_php/webtt/vendors/simpletest/web_tester.php diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/xml.php b/code/web/public_php/webtt/vendors/simpletest/xml.php similarity index 100% rename from code/ryzom/tools/server/www/webtt/vendors/simpletest/xml.php rename to code/web/public_php/webtt/vendors/simpletest/xml.php diff --git a/code/web/create_webig.sql b/code/web/sql/create_webig.sql similarity index 100% rename from code/web/create_webig.sql rename to code/web/sql/create_webig.sql diff --git a/code/web/sql/nel.sql b/code/web/sql/nel.sql new file mode 100644 index 000000000..73a0620ea --- /dev/null +++ b/code/web/sql/nel.sql @@ -0,0 +1,147 @@ +-- phpMyAdmin SQL Dump +-- version 3.4.10.1deb1 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Generation Time: Jul 14, 2014 at 09:58 AM +-- Server version: 5.5.37 +-- PHP Version: 5.3.10-1ubuntu3.11 + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!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 */; + +-- +-- Database: `nel` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `domain` +-- + +CREATE TABLE IF NOT EXISTS `domain` ( + `domain_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `domain_name` varchar(32) NOT NULL DEFAULT '', + `status` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', + `patch_version` int(10) unsigned NOT NULL DEFAULT '0', + `backup_patch_url` varchar(255) DEFAULT NULL, + `patch_urls` text, + `login_address` varchar(255) NOT NULL DEFAULT '', + `session_manager_address` varchar(255) NOT NULL DEFAULT '', + `ring_db_name` varchar(255) NOT NULL DEFAULT '', + `web_host` varchar(255) NOT NULL DEFAULT '', + `web_host_php` varchar(255) NOT NULL DEFAULT '', + `description` varchar(200) DEFAULT NULL, + PRIMARY KEY (`domain_id`), + UNIQUE KEY `name_idx` (`domain_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=21 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `permission` +-- + +CREATE TABLE IF NOT EXISTS `permission` ( + `UId` int(10) unsigned NOT NULL DEFAULT '0', + `ClientApplication` char(64) NOT NULL DEFAULT 'ryzom', + `ShardId` int(10) NOT NULL DEFAULT '-1', + `AccessPrivilege` set('OPEN','DEV','RESTRICTED') NOT NULL DEFAULT 'OPEN', + `prim` int(10) unsigned NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`prim`), + KEY `UIDIndex` (`UId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `shard` +-- + +CREATE TABLE IF NOT EXISTS `shard` ( + `ShardId` int(10) NOT NULL DEFAULT '0', + `domain_id` int(11) unsigned NOT NULL DEFAULT '0', + `WsAddr` varchar(64) DEFAULT NULL, + `NbPlayers` int(10) unsigned DEFAULT '0', + `Name` varchar(255) DEFAULT 'unknown shard', + `Online` tinyint(1) unsigned DEFAULT '0', + `ClientApplication` varchar(64) DEFAULT 'ryzom', + `Version` varchar(64) NOT NULL DEFAULT '', + `PatchURL` varchar(255) NOT NULL DEFAULT '', + `DynPatchURL` varchar(255) NOT NULL DEFAULT '', + `FixedSessionId` int(11) unsigned NOT NULL DEFAULT '0', + `State` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', + `MOTD` text NOT NULL, + `prim` int(10) unsigned NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`prim`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='contains all shards information for login system' AUTO_INCREMENT=31 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `user` +-- + +CREATE TABLE IF NOT EXISTS `user` ( + `UId` int(10) NOT NULL AUTO_INCREMENT, + `Login` varchar(64) NOT NULL DEFAULT '', + `Password` varchar(13) DEFAULT NULL, + `ShardId` int(10) NOT NULL DEFAULT '-1', + `State` enum('Offline','Online') NOT NULL DEFAULT 'Offline', + `Privilege` varchar(255) NOT NULL DEFAULT '', + `GroupName` varchar(255) NOT NULL DEFAULT '', + `FirstName` varchar(255) NOT NULL DEFAULT '', + `LastName` varchar(255) NOT NULL DEFAULT '', + `Birthday` varchar(32) NOT NULL DEFAULT '', + `Gender` tinyint(1) unsigned NOT NULL DEFAULT '0', + `Country` char(2) NOT NULL DEFAULT '', + `Email` varchar(255) NOT NULL DEFAULT '', + `Address` varchar(255) NOT NULL DEFAULT '', + `City` varchar(100) NOT NULL DEFAULT '', + `PostalCode` varchar(10) NOT NULL DEFAULT '', + `USState` char(2) NOT NULL DEFAULT '', + `Chat` char(2) NOT NULL DEFAULT '0', + `BetaKeyId` int(10) unsigned NOT NULL DEFAULT '0', + `CachedCoupons` varchar(255) NOT NULL DEFAULT '', + `ProfileAccess` varchar(45) DEFAULT NULL, + `Level` int(2) NOT NULL DEFAULT '0', + `CurrentFunds` int(4) NOT NULL DEFAULT '0', + `IdBilling` varchar(255) NOT NULL DEFAULT '', + `Community` char(2) NOT NULL DEFAULT '--', + `Newsletter` tinyint(1) NOT NULL DEFAULT '1', + `Account` varchar(64) NOT NULL DEFAULT '', + `ChoiceSubLength` tinyint(2) NOT NULL DEFAULT '0', + `CurrentSubLength` varchar(255) NOT NULL DEFAULT '0', + `ValidIdBilling` int(4) NOT NULL DEFAULT '0', + `GMId` int(4) NOT NULL DEFAULT '0', + `ExtendedPrivilege` varchar(128) NOT NULL DEFAULT '', + `ToolsGroup` varchar(20) NOT NULL DEFAULT '', + `Unsubscribe` date NOT NULL DEFAULT '0000-00-00', + `SubDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `SubIp` varchar(20) NOT NULL DEFAULT '', + `SecurePassword` varchar(32) NOT NULL DEFAULT '', + `LastInvoiceEmailCheck` date NOT NULL DEFAULT '0000-00-00', + `FromSource` varchar(8) NOT NULL DEFAULT '', + `ValidMerchantCode` varchar(13) NOT NULL DEFAULT '', + `PBC` tinyint(1) NOT NULL DEFAULT '0', + `ApiKeySeed` varchar(8) DEFAULT NULL, + PRIMARY KEY (`UId`), + KEY `LoginIndex` (`Login`), + KEY `GroupIndex` (`GroupName`), + KEY `ToolsGroup` (`ToolsGroup`), + KEY `CurrentSubLength` (`CurrentSubLength`), + KEY `Community` (`Community`), + KEY `Email` (`Email`), + KEY `GMId` (`GMId`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='contains all users information for login system' AUTO_INCREMENT=5 ; + +/*!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 */; diff --git a/code/web/sql/nel_tool.sql b/code/web/sql/nel_tool.sql new file mode 100644 index 000000000..8344b5f89 --- /dev/null +++ b/code/web/sql/nel_tool.sql @@ -0,0 +1,654 @@ +-- phpMyAdmin SQL Dump +-- version 3.4.10.1deb1 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Generation Time: Jul 14, 2014 at 10:03 AM +-- Server version: 5.5.37 +-- PHP Version: 5.3.10-1ubuntu3.11 + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!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 */; + +-- +-- Database: `nel_tool` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_annotations` +-- + +CREATE TABLE IF NOT EXISTS `neltool_annotations` ( + `annotation_id` int(11) NOT NULL AUTO_INCREMENT, + `annotation_domain_id` int(11) DEFAULT NULL, + `annotation_shard_id` int(11) DEFAULT NULL, + `annotation_data` varchar(255) NOT NULL DEFAULT '', + `annotation_user_name` varchar(32) NOT NULL DEFAULT '', + `annotation_date` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`annotation_id`), + UNIQUE KEY `annotation_shard_id` (`annotation_shard_id`), + UNIQUE KEY `annotation_domain_id` (`annotation_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=13 ; + +-- +-- Dumping data for table `neltool_annotations` +-- + +INSERT INTO `neltool_annotations` (`annotation_id`, `annotation_domain_id`, `annotation_shard_id`, `annotation_data`, `annotation_user_name`, `annotation_date`) VALUES +(12, NULL, 106, 'Welcome to the Shard Admin Website!', 'vl', 1272378352); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_applications` +-- + +CREATE TABLE IF NOT EXISTS `neltool_applications` ( + `application_id` int(11) NOT NULL AUTO_INCREMENT, + `application_name` varchar(64) NOT NULL DEFAULT '', + `application_uri` varchar(255) NOT NULL DEFAULT '', + `application_restriction` varchar(64) NOT NULL DEFAULT '', + `application_order` int(11) NOT NULL DEFAULT '0', + `application_visible` int(11) NOT NULL DEFAULT '0', + `application_icon` varchar(128) NOT NULL DEFAULT '', + PRIMARY KEY (`application_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=40 ; + +-- +-- Dumping data for table `neltool_applications` +-- + +INSERT INTO `neltool_applications` (`application_id`, `application_name`, `application_uri`, `application_restriction`, `application_order`, `application_visible`, `application_icon`) VALUES +(1, 'Main', 'index.php', '', 100, 1, 'imgs/icon_main.gif'), +(2, 'Logout', 'index.php?mode=logout', '', 999999, 1, 'imgs/icon_logout.gif'), +(3, 'Admin', 'tool_administration.php', 'tool_admin', 1500, 1, 'imgs/icon_admin.gif'), +(4, 'Prefs', 'tool_preferences.php', 'tool_preferences', 1000, 1, 'imgs/icon_preferences.gif'), +(5, 'Admin/Users', '', 'tool_admin_user', 1502, 0, ''), +(6, 'Admin/Applications', '', 'tool_admin_application', 1501, 0, ''), +(7, 'Admin/Domains', '', 'tool_admin_domain', 1504, 0, ''), +(8, 'Admin/Shards', '', 'tool_admin_shard', 1505, 0, ''), +(9, 'Admin/Groups', '', 'tool_admin_group', 1503, 0, ''), +(10, 'Admin/Logs', '', 'tool_admin_logs', 1506, 0, ''), +(11, 'Main/Start', '', 'tool_main_start', 101, 0, ''), +(12, 'Main/Stop', '', 'tool_main_stop', 102, 0, ''), +(13, 'Main/Restart', '', 'tool_main_restart', 103, 0, ''), +(14, 'Main/Kill', '', 'tool_main_kill', 104, 0, ''), +(15, 'Main/Abort', '', 'tool_main_abort', 105, 0, ''), +(16, 'Main/Execute', '', 'tool_main_execute', 108, 0, ''), +(18, 'Notes', 'tool_notes.php', 'tool_notes', 900, 1, 'imgs/icon_notes.gif'), +(19, 'Player Locator', 'tool_player_locator.php', 'tool_player_locator', 200, 1, 'imgs/icon_player_locator.gif'), +(20, 'Player Locator/Display Players', '', 'tool_player_locator_display_players', 201, 0, ''), +(21, 'Player Locator/Locate', '', 'tool_player_locator_locate', 202, 0, ''), +(22, 'Main/LockDomain', '', 'tool_main_lock_domain', 110, 0, ''), +(23, 'Main/LockShard', '', 'tool_main_lock_shard', 111, 0, ''), +(24, 'Main/WS', '', 'tool_main_ws', 112, 0, ''), +(25, 'Main/ResetCounters', '', 'tool_main_reset_counters', 113, 0, ''), +(26, 'Main/ServiceAutoStart', '', 'tool_main_service_autostart', 114, 0, ''), +(27, 'Main/ShardAutoStart', '', 'tool_main_shard_autostart', 115, 0, ''), +(28, 'Main/WS/Old', '', 'tool_main_ws_old', 112, 0, ''), +(29, 'Graphs', 'tool_graphs.php', 'tool_graph', 500, 1, 'imgs/icon_graphs.gif'), +(30, 'Notes/Global', '', 'tool_notes_global', 901, 0, ''), +(31, 'Log Analyser', 'tool_log_analyser.php', 'tool_las', 400, 1, 'imgs/icon_log_analyser.gif'), +(32, 'Guild Locator', 'tool_guild_locator.php', 'tool_guild_locator', 300, 1, 'imgs/icon_guild_locator.gif'), +(33, 'Player Locator/UserID Check', '', 'tool_player_locator_userid_check', 203, 0, ''), +(34, 'Player Locator/CSR Relocate', '', 'tool_player_locator_csr_relocate', 204, 0, ''), +(35, 'Guild Locator/Guilds Update', '', 'tool_guild_locator_manage_guild', 301, 0, ''), +(36, 'Guild Locator/Members Update', '', 'tool_guild_locator_manage_members', 302, 0, ''), +(37, 'Entities', 'tool_event_entities.php', 'tool_event_entities', 350, 1, 'imgs/icon_entity.gif'), +(38, 'Admin/Restarts', '', 'tool_admin_restart', 1507, 0, ''), +(39, 'Main/EasyRestart', '', 'tool_main_easy_restart', 116, 0, ''); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_domains` +-- + +CREATE TABLE IF NOT EXISTS `neltool_domains` ( + `domain_id` int(11) NOT NULL AUTO_INCREMENT, + `domain_name` varchar(128) NOT NULL DEFAULT '', + `domain_as_host` varchar(128) NOT NULL DEFAULT '', + `domain_as_port` int(11) NOT NULL DEFAULT '0', + `domain_rrd_path` varchar(255) NOT NULL DEFAULT '', + `domain_las_admin_path` varchar(255) NOT NULL DEFAULT '', + `domain_las_local_path` varchar(255) NOT NULL DEFAULT '', + `domain_application` varchar(128) NOT NULL DEFAULT '', + `domain_sql_string` varchar(128) NOT NULL DEFAULT '', + `domain_hd_check` int(11) NOT NULL DEFAULT '0', + `domain_mfs_web` text, + `domain_cs_sql_string` varchar(255) DEFAULT NULL, + PRIMARY KEY (`domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=21 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_groups` +-- + +CREATE TABLE IF NOT EXISTS `neltool_groups` ( + `group_id` int(11) NOT NULL AUTO_INCREMENT, + `group_name` varchar(32) NOT NULL DEFAULT 'NewGroup', + `group_level` int(11) NOT NULL DEFAULT '0', + `group_default` int(11) NOT NULL DEFAULT '0', + `group_active` int(11) NOT NULL DEFAULT '0', + `group_default_domain_id` tinyint(3) unsigned DEFAULT NULL, + `group_default_shard_id` smallint(3) unsigned DEFAULT NULL, + PRIMARY KEY (`group_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=12 ; + +-- +-- Dumping data for table `neltool_groups` +-- + +INSERT INTO `neltool_groups` (`group_id`, `group_name`, `group_level`, `group_default`, `group_active`, `group_default_domain_id`, `group_default_shard_id`) VALUES +(1, 'AdminGroup', 0, 0, 1, 20, 300), +(2, 'DeveloperGroup', 0, 1, 1, 20, 300), +(3, 'AdminDebugGroup', 10, 0, 1, 20, 300), +(4, 'SupportSGMGroup', 0, 0, 1, NULL, NULL), +(6, 'SupportGMGroup', 0, 0, 1, NULL, NULL), +(7, 'SupportReadOnlyGroup', 0, 0, 1, NULL, NULL), +(8, 'DeveloperLevelDesigners', 0, 0, 1, 20, 300), +(9, 'DeveloperReadOnlyGroup', 0, 0, 1, 20, 300); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_group_applications` +-- + +CREATE TABLE IF NOT EXISTS `neltool_group_applications` ( + `group_application_id` int(11) NOT NULL AUTO_INCREMENT, + `group_application_group_id` int(11) NOT NULL DEFAULT '0', + `group_application_application_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_application_id`), + KEY `group_application_group_id` (`group_application_group_id`), + KEY `group_application_application_id` (`group_application_application_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=966 ; + +-- +-- Dumping data for table `neltool_group_applications` +-- + +INSERT INTO `neltool_group_applications` (`group_application_id`, `group_application_group_id`, `group_application_application_id`) VALUES +(879, 1, 10), +(878, 1, 8), +(877, 1, 7), +(876, 1, 9), +(875, 1, 5), +(874, 1, 6), +(873, 1, 3), +(872, 1, 4), +(871, 1, 30), +(870, 1, 18), +(869, 1, 29), +(868, 1, 31), +(867, 1, 37), +(866, 1, 36), +(865, 1, 35), +(864, 1, 32), +(863, 1, 34), +(862, 1, 33), +(861, 1, 21), +(860, 1, 20), +(859, 1, 19), +(858, 1, 39), +(857, 1, 27), +(856, 1, 26), +(843, 3, 10), +(842, 3, 8), +(841, 3, 7), +(840, 3, 9), +(839, 3, 5), +(838, 3, 6), +(837, 3, 3), +(836, 3, 4), +(835, 3, 30), +(834, 3, 18), +(833, 3, 29), +(832, 3, 31), +(831, 3, 37), +(830, 3, 36), +(829, 3, 35), +(828, 3, 32), +(827, 3, 34), +(826, 3, 33), +(825, 3, 21), +(824, 3, 20), +(823, 3, 19), +(822, 3, 39), +(821, 3, 27), +(820, 3, 26), +(597, 4, 36), +(596, 4, 35), +(595, 4, 32), +(594, 4, 21), +(593, 4, 20), +(592, 4, 19), +(591, 4, 24), +(590, 4, 23), +(589, 4, 14), +(588, 4, 12), +(632, 2, 18), +(631, 2, 37), +(630, 2, 32), +(629, 2, 21), +(628, 2, 20), +(627, 2, 19), +(626, 2, 24), +(625, 2, 23), +(624, 2, 22), +(623, 2, 16), +(622, 2, 15), +(621, 2, 14), +(620, 2, 13), +(819, 3, 25), +(855, 1, 25), +(619, 2, 12), +(818, 3, 28), +(854, 1, 28), +(817, 3, 24), +(718, 5, 18), +(717, 5, 37), +(716, 5, 32), +(715, 5, 21), +(714, 5, 20), +(713, 5, 19), +(712, 5, 27), +(711, 5, 26), +(710, 5, 24), +(709, 5, 23), +(708, 5, 22), +(707, 5, 16), +(706, 5, 15), +(705, 5, 14), +(816, 3, 23), +(609, 6, 35), +(608, 6, 32), +(607, 6, 21), +(606, 6, 20), +(605, 6, 19), +(604, 6, 24), +(603, 6, 23), +(602, 6, 14), +(601, 6, 12), +(600, 6, 11), +(815, 3, 22), +(814, 3, 16), +(853, 1, 24), +(704, 5, 13), +(703, 5, 12), +(852, 1, 23), +(587, 4, 11), +(618, 2, 11), +(702, 5, 11), +(612, 7, 19), +(851, 1, 22), +(813, 3, 15), +(812, 3, 14), +(598, 4, 18), +(599, 4, 4), +(610, 6, 18), +(611, 6, 4), +(613, 7, 20), +(614, 7, 21), +(615, 7, 32), +(616, 7, 35), +(617, 7, 4), +(633, 2, 4), +(811, 3, 13), +(810, 3, 12), +(850, 1, 16), +(849, 1, 15), +(848, 1, 14), +(847, 1, 13), +(846, 1, 12), +(719, 5, 4), +(720, 8, 11), +(721, 8, 12), +(722, 8, 13), +(723, 8, 14), +(724, 8, 15), +(725, 8, 16), +(726, 8, 22), +(727, 8, 23), +(728, 8, 24), +(729, 8, 25), +(730, 8, 26), +(731, 8, 27), +(732, 8, 19), +(733, 8, 20), +(734, 8, 21), +(735, 8, 37), +(736, 8, 4), +(737, 9, 29), +(738, 9, 4), +(809, 3, 11), +(845, 1, 11), +(844, 3, 38), +(880, 1, 38), +(909, 10, 18), +(908, 10, 29), +(907, 10, 37), +(906, 10, 36), +(905, 10, 35), +(904, 10, 32), +(903, 10, 34), +(902, 10, 33), +(901, 10, 21), +(900, 10, 20), +(899, 10, 19), +(898, 10, 23), +(897, 10, 13), +(910, 10, 30), +(965, 11, 29), +(964, 11, 37), +(963, 11, 32), +(962, 11, 34), +(961, 11, 33), +(960, 11, 21), +(959, 11, 20), +(958, 11, 19); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_group_domains` +-- + +CREATE TABLE IF NOT EXISTS `neltool_group_domains` ( + `group_domain_id` int(11) NOT NULL AUTO_INCREMENT, + `group_domain_group_id` int(11) NOT NULL DEFAULT '0', + `group_domain_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_domain_id`), + KEY `group_domain_group_id` (`group_domain_group_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=97 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_group_shards` +-- + +CREATE TABLE IF NOT EXISTS `neltool_group_shards` ( + `group_shard_id` int(11) NOT NULL AUTO_INCREMENT, + `group_shard_group_id` int(11) NOT NULL DEFAULT '0', + `group_shard_shard_id` int(11) NOT NULL DEFAULT '0', + `group_shard_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_shard_id`), + KEY `group_shard_group_id` (`group_shard_group_id`), + KEY `group_shard_domain_id` (`group_shard_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1532 ; + +-- +-- Dumping data for table `neltool_group_shards` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_locks` +-- + +CREATE TABLE IF NOT EXISTS `neltool_locks` ( + `lock_id` int(11) NOT NULL AUTO_INCREMENT, + `lock_domain_id` int(11) DEFAULT NULL, + `lock_shard_id` int(11) DEFAULT NULL, + `lock_user_name` varchar(32) NOT NULL DEFAULT '', + `lock_date` int(11) NOT NULL DEFAULT '0', + `lock_update` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`lock_id`), + UNIQUE KEY `lock_shard_id` (`lock_shard_id`), + UNIQUE KEY `lock_domain_id` (`lock_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_logs` +-- + +CREATE TABLE IF NOT EXISTS `neltool_logs` ( + `logs_id` int(11) NOT NULL AUTO_INCREMENT, + `logs_user_name` varchar(32) NOT NULL DEFAULT '0', + `logs_date` int(11) NOT NULL DEFAULT '0', + `logs_data` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`logs_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=83 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_notes` +-- + +CREATE TABLE IF NOT EXISTS `neltool_notes` ( + `note_id` int(11) NOT NULL AUTO_INCREMENT, + `note_user_id` int(11) NOT NULL DEFAULT '0', + `note_title` varchar(128) NOT NULL DEFAULT '', + `note_data` text NOT NULL, + `note_date` int(11) NOT NULL DEFAULT '0', + `note_active` int(11) NOT NULL DEFAULT '0', + `note_global` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`note_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; + +-- +-- Dumping data for table `neltool_notes` +-- + +INSERT INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES +(2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters information.', 1272378065, 1, 1), +(3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), +(5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), +(4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voilà, you're done.', 1153314198, 1, 0), +(6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] & [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow "UP" process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), +(7, 27, 'opening if the egs is too high on reboot', '<kadael> here my note on admin about egs to high on startup\r\n<kadael> ---\r\n<kadael> If [EGS] is to high on startup:\r\n<kadael> [shut down egs]\r\n<kadael> [5 mins]\r\n<kadael> [IOS] & [GPMS] (at same time shut down )\r\n<kadael> after the services are down follow "UP" process with timers again.\r\n<kadael> IOS\r\n<kadael> [3 mins]\r\n<kadael> GPMS\r\n<kadael> [3 mins]\r\n<kadael> EGS\r\n<kadael> [5 mins]\r\n<kadael> bla bla...\r\n<kadael> ---', 1153395362, 1, 0), +(10, 27, 'Ring points', 'Commande pour donner tout les points ring à tout le monde :\r\n\r\nDans le DSS d'un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), +(9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] & [GPMS] (shut down at same time) \r\n \r\n After the services are down follow "UP" process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_restart_groups` +-- + +CREATE TABLE IF NOT EXISTS `neltool_restart_groups` ( + `restart_group_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_group_name` varchar(50) DEFAULT NULL, + `restart_group_list` varchar(50) DEFAULT NULL, + `restart_group_order` varchar(50) DEFAULT NULL, + PRIMARY KEY (`restart_group_id`), + UNIQUE KEY `restart_group_id` (`restart_group_id`), + KEY `restart_group_id_2` (`restart_group_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; + +-- +-- Dumping data for table `neltool_restart_groups` +-- + +INSERT INTO `neltool_restart_groups` (`restart_group_id`, `restart_group_name`, `restart_group_list`, `restart_group_order`) VALUES +(1, 'Low Level', 'rns,ts,ms', '1'), +(3, 'Mid Level', 'ios,gpms,egs', '2'), +(4, 'High Level', 'ais', '3'), +(5, 'Front Level', 'fes,sbs,dss,rws', '4'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_restart_messages` +-- + +CREATE TABLE IF NOT EXISTS `neltool_restart_messages` ( + `restart_message_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_message_name` varchar(20) DEFAULT NULL, + `restart_message_value` varchar(128) DEFAULT NULL, + `restart_message_lang` varchar(5) DEFAULT NULL, + PRIMARY KEY (`restart_message_id`), + UNIQUE KEY `restart_message_id` (`restart_message_id`), + KEY `restart_message_id_2` (`restart_message_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; + +-- +-- Dumping data for table `neltool_restart_messages` +-- + +INSERT INTO `neltool_restart_messages` (`restart_message_id`, `restart_message_name`, `restart_message_value`, `restart_message_lang`) VALUES +(5, 'reboot', 'The shard is about to go down. Please find a safe location and log out.', 'en'), +(4, 'reboot', 'Le serveur va redemarrer dans $minutes$ minutes. Merci de vous deconnecter en lieu sur.', 'fr'), +(6, 'reboot', 'Der Server wird heruntergefahren. Findet eine sichere Stelle und logt aus.', 'de'), +(10, 'reboot', 'Arret du serveur dans $minutes+1$ minutes', 'fr'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_restart_sequences` +-- + +CREATE TABLE IF NOT EXISTS `neltool_restart_sequences` ( + `restart_sequence_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_sequence_domain_id` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_shard_id` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_user_name` varchar(50) DEFAULT NULL, + `restart_sequence_step` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_date_start` int(11) DEFAULT NULL, + `restart_sequence_date_end` int(11) DEFAULT NULL, + `restart_sequence_timer` int(11) unsigned DEFAULT '0', + PRIMARY KEY (`restart_sequence_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_shards` +-- + +CREATE TABLE IF NOT EXISTS `neltool_shards` ( + `shard_id` int(11) NOT NULL AUTO_INCREMENT, + `shard_name` varchar(128) NOT NULL DEFAULT '', + `shard_as_id` varchar(255) NOT NULL DEFAULT '0', + `shard_domain_id` int(11) NOT NULL DEFAULT '0', + `shard_lang` char(2) NOT NULL DEFAULT 'en', + `shard_restart` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`shard_id`), + KEY `shard_domain_id` (`shard_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=403 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_stats_hd_datas` +-- + +CREATE TABLE IF NOT EXISTS `neltool_stats_hd_datas` ( + `hd_id` int(11) NOT NULL AUTO_INCREMENT, + `hd_domain_id` int(11) NOT NULL DEFAULT '0', + `hd_server` varchar(32) NOT NULL DEFAULT '', + `hd_device` varchar(64) NOT NULL DEFAULT '', + `hd_size` varchar(16) NOT NULL DEFAULT '', + `hd_used` varchar(16) NOT NULL DEFAULT '', + `hd_free` varchar(16) NOT NULL DEFAULT '', + `hd_percent` int(11) NOT NULL DEFAULT '0', + `hd_mount` varchar(128) NOT NULL DEFAULT '', + PRIMARY KEY (`hd_id`), + KEY `hd_domain_id` (`hd_domain_id`), + KEY `hd_server` (`hd_server`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_stats_hd_times` +-- + +CREATE TABLE IF NOT EXISTS `neltool_stats_hd_times` ( + `hd_domain_id` int(11) NOT NULL DEFAULT '0', + `hd_last_time` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`hd_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_users` +-- + +CREATE TABLE IF NOT EXISTS `neltool_users` ( + `user_id` int(11) NOT NULL AUTO_INCREMENT, + `user_name` varchar(32) NOT NULL DEFAULT '', + `user_password` varchar(64) NOT NULL DEFAULT '', + `user_group_id` int(11) NOT NULL DEFAULT '0', + `user_created` int(11) NOT NULL DEFAULT '0', + `user_active` int(11) NOT NULL DEFAULT '0', + `user_logged_last` int(11) NOT NULL DEFAULT '0', + `user_logged_count` int(11) NOT NULL DEFAULT '0', + `user_menu_style` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_login` (`user_name`), + KEY `user_group_id` (`user_group_id`), + KEY `user_active` (`user_active`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=34 ; + +-- +-- Dumping data for table `neltool_users` +-- + +INSERT INTO `neltool_users` (`user_id`, `user_name`, `user_password`, `user_group_id`, `user_created`, `user_active`, `user_logged_last`, `user_logged_count`, `user_menu_style`) VALUES +(33, 'guest', '084e0343a0486ff05530df6c705c8bb4', 1, 1405357395, 1, 0, 0, 0); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_user_applications` +-- + +CREATE TABLE IF NOT EXISTS `neltool_user_applications` ( + `user_application_id` int(11) NOT NULL AUTO_INCREMENT, + `user_application_user_id` int(11) NOT NULL DEFAULT '0', + `user_application_application_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_application_id`), + KEY `user_application_user_id` (`user_application_user_id`), + KEY `user_application_application_id` (`user_application_application_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=22 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_user_domains` +-- + +CREATE TABLE IF NOT EXISTS `neltool_user_domains` ( + `user_domain_id` int(11) NOT NULL AUTO_INCREMENT, + `user_domain_user_id` int(11) NOT NULL DEFAULT '0', + `user_domain_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_domain_id`), + KEY `user_domain_user_id` (`user_domain_user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=20 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `neltool_user_shards` +-- + +CREATE TABLE IF NOT EXISTS `neltool_user_shards` ( + `user_shard_id` int(11) NOT NULL AUTO_INCREMENT, + `user_shard_user_id` int(11) NOT NULL DEFAULT '0', + `user_shard_shard_id` int(11) NOT NULL DEFAULT '0', + `user_shard_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_shard_id`), + KEY `user_shard_user_id` (`user_shard_user_id`), + KEY `user_shard_domain_id` (`user_shard_domain_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=166 ; + +/*!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 */; diff --git a/code/web/sql/ring_domain.sql b/code/web/sql/ring_domain.sql new file mode 100644 index 000000000..e50d01fa8 --- /dev/null +++ b/code/web/sql/ring_domain.sql @@ -0,0 +1,417 @@ +-- phpMyAdmin SQL Dump +-- version 3.4.10.1deb1 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Generation Time: Jul 14, 2014 at 10:07 AM +-- Server version: 5.5.37 +-- PHP Version: 5.3.10-1ubuntu3.11 + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!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 */; + +-- +-- Database: `ring_mini01` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `characters` +-- + +CREATE TABLE IF NOT EXISTS `characters` ( + `char_id` int(10) unsigned NOT NULL DEFAULT '0', + `char_name` varchar(20) NOT NULL DEFAULT '', + `user_id` int(10) unsigned NOT NULL DEFAULT '0', + `guild_id` int(10) unsigned NOT NULL DEFAULT '0', + `best_combat_level` int(10) unsigned NOT NULL DEFAULT '0', + `home_mainland_session_id` int(10) unsigned NOT NULL DEFAULT '0', + `ring_access` varchar(63) NOT NULL DEFAULT '', + `race` enum('r_fyros','r_matis','r_tryker','r_zorai') NOT NULL DEFAULT 'r_fyros', + `civilisation` enum('c_neutral','c_fyros','c_fyros','c_matis','c_tryker','c_zorai') NOT NULL DEFAULT 'c_neutral', + `cult` enum('c_neutral','c_kami','c_karavan') NOT NULL DEFAULT 'c_neutral', + `current_session` int(11) unsigned NOT NULL DEFAULT '0', + `rrp_am` int(11) unsigned NOT NULL DEFAULT '0', + `rrp_masterless` int(11) unsigned NOT NULL DEFAULT '0', + `rrp_author` int(11) unsigned NOT NULL DEFAULT '0', + `newcomer` tinyint(1) NOT NULL DEFAULT '1', + `creation_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `last_played_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`char_id`), + UNIQUE KEY `char_name_idx` (`char_name`,`home_mainland_session_id`), + KEY `user_id_idx` (`user_id`), + KEY `guild_idx` (`guild_id`), + KEY `guild_id_idx` (`guild_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `folder` +-- + +CREATE TABLE IF NOT EXISTS `folder` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `owner` int(10) unsigned NOT NULL DEFAULT '0', + `title` varchar(40) NOT NULL DEFAULT '', + `comments` text NOT NULL, + PRIMARY KEY (`Id`), + KEY `owner_idx` (`owner`), + KEY `title_idx` (`title`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `folder_access` +-- + +CREATE TABLE IF NOT EXISTS `folder_access` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `folder_id` int(10) unsigned NOT NULL DEFAULT '0', + `user_id` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`Id`), + KEY `folder_id_idx` (`folder_id`), + KEY `user_idx` (`user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `guilds` +-- + +CREATE TABLE IF NOT EXISTS `guilds` ( + `guild_id` int(10) unsigned NOT NULL DEFAULT '0', + `guild_name` varchar(50) NOT NULL DEFAULT '', + `shard_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`guild_id`), + KEY `shard_id_idx` (`shard_id`), + KEY `guild_name_idx` (`guild_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `guild_invites` +-- + +CREATE TABLE IF NOT EXISTS `guild_invites` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `session_id` int(10) unsigned NOT NULL DEFAULT '0', + `guild_id` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`Id`), + KEY `guild_id_idx` (`guild_id`), + KEY `session_id_idx` (`session_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `journal_entry` +-- + +CREATE TABLE IF NOT EXISTS `journal_entry` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `session_id` int(10) unsigned NOT NULL DEFAULT '0', + `author` int(10) unsigned NOT NULL DEFAULT '0', + `type` enum('jet_credits','jet_notes') NOT NULL DEFAULT 'jet_notes', + `text` text NOT NULL, + `time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33', + PRIMARY KEY (`Id`), + KEY `session_id_idx` (`session_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `known_users` +-- + +CREATE TABLE IF NOT EXISTS `known_users` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `owner` int(10) unsigned NOT NULL DEFAULT '0', + `targer_user` int(10) unsigned NOT NULL DEFAULT '0', + `targer_character` int(10) unsigned NOT NULL DEFAULT '0', + `relation_type` enum('rt_friend','rt_banned','rt_friend_dm') NOT NULL DEFAULT 'rt_friend', + `comments` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`Id`), + KEY `user_index` (`owner`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mfs_erased_mail_series` +-- + +CREATE TABLE IF NOT EXISTS `mfs_erased_mail_series` ( + `erased_char_id` int(11) unsigned NOT NULL DEFAULT '0', + `erased_char_name` varchar(32) NOT NULL DEFAULT '', + `erased_series` int(11) unsigned NOT NULL AUTO_INCREMENT, + `erase_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`erased_series`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mfs_guild_thread` +-- + +CREATE TABLE IF NOT EXISTS `mfs_guild_thread` ( + `thread_id` int(11) NOT NULL AUTO_INCREMENT, + `guild_id` int(11) unsigned NOT NULL DEFAULT '0', + `topic` varchar(255) NOT NULL DEFAULT '', + `author_name` varchar(32) NOT NULL DEFAULT '', + `last_post_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `post_count` int(11) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`thread_id`), + KEY `guild_index` (`guild_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mfs_guild_thread_message` +-- + +CREATE TABLE IF NOT EXISTS `mfs_guild_thread_message` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `thread_id` int(11) unsigned NOT NULL DEFAULT '0', + `author_name` varchar(32) NOT NULL DEFAULT '', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `content` text NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mfs_mail` +-- + +CREATE TABLE IF NOT EXISTS `mfs_mail` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sender_name` varchar(32) NOT NULL DEFAULT '', + `subject` varchar(250) NOT NULL DEFAULT '', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `status` enum('ms_new','ms_read','ms_erased') NOT NULL DEFAULT 'ms_new', + `dest_char_id` int(11) unsigned NOT NULL DEFAULT '0', + `erase_series` int(11) unsigned NOT NULL DEFAULT '0', + `content` text NOT NULL, + PRIMARY KEY (`id`), + KEY `dest_index` (`dest_char_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `outlands` +-- + +CREATE TABLE IF NOT EXISTS `outlands` ( + `session_id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `island_name` text NOT NULL, + `billing_instance_id` int(11) unsigned NOT NULL DEFAULT '0', + `anim_session_id` int(11) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`session_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `player_rating` +-- + +CREATE TABLE IF NOT EXISTS `player_rating` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `scenario_id` int(10) unsigned NOT NULL DEFAULT '0', + `session_id` int(10) unsigned NOT NULL DEFAULT '0', + `rate_fun` tinyint(3) unsigned NOT NULL DEFAULT '0', + `rate_difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0', + `rate_accessibility` tinyint(3) unsigned NOT NULL DEFAULT '0', + `rate_originality` tinyint(3) unsigned NOT NULL DEFAULT '0', + `rate_direction` tinyint(3) unsigned NOT NULL DEFAULT '0', + `author` int(10) unsigned NOT NULL DEFAULT '0', + `rating` int(10) NOT NULL DEFAULT '0', + `comments` text NOT NULL, + `time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33', + PRIMARY KEY (`Id`), + KEY `session_id_idx` (`scenario_id`), + KEY `author_idx` (`author`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `ring_users` +-- + +CREATE TABLE IF NOT EXISTS `ring_users` ( + `user_id` int(10) unsigned NOT NULL DEFAULT '0', + `user_name` varchar(20) NOT NULL DEFAULT '', + `user_type` enum('ut_character','ut_pioneer') NOT NULL DEFAULT 'ut_character', + `current_session` int(10) unsigned NOT NULL DEFAULT '0', + `current_activity` enum('ca_none','ca_play','ca_edit','ca_anim') NOT NULL DEFAULT 'ca_none', + `current_status` enum('cs_offline','cs_logged','cs_online') NOT NULL DEFAULT 'cs_offline', + `public_level` enum('pl_none','pl_public') NOT NULL DEFAULT 'pl_none', + `account_type` enum('at_normal','at_gold') NOT NULL DEFAULT 'at_normal', + `content_access_level` varchar(20) NOT NULL DEFAULT '', + `description` text NOT NULL, + `lang` enum('lang_en','lang_fr','lang_de') NOT NULL DEFAULT 'lang_en', + `cookie` varchar(30) NOT NULL DEFAULT '', + `current_domain_id` int(10) NOT NULL DEFAULT '-1', + `pioneer_char_id` int(11) unsigned NOT NULL DEFAULT '0', + `current_char` int(11) NOT NULL DEFAULT '0', + `add_privileges` varchar(64) NOT NULL DEFAULT '', + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_name_idx` (`user_name`), + KEY `cookie_idx` (`cookie`), + KEY `current_session_idx` (`current_session`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `scenario` +-- + +CREATE TABLE IF NOT EXISTS `scenario` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `md5` varchar(64) NOT NULL DEFAULT '', + `title` varchar(32) NOT NULL DEFAULT '', + `description` text NOT NULL, + `author` varchar(32) NOT NULL DEFAULT '', + `rrp_total` int(11) unsigned NOT NULL DEFAULT '0', + `anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm', + `language` varchar(11) NOT NULL DEFAULT '', + `orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other', + `level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a', + `allow_free_trial` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `scenario_desc` +-- + +CREATE TABLE IF NOT EXISTS `scenario_desc` ( + `session_id` int(10) unsigned NOT NULL DEFAULT '0', + `parent_scenario` int(10) unsigned NOT NULL DEFAULT '0', + `description` text NOT NULL, + `relation_to_parent` enum('rtp_same','rtp_variant','rtp_different') NOT NULL DEFAULT 'rtp_same', + `title` varchar(40) NOT NULL DEFAULT '', + `num_player` int(10) unsigned NOT NULL DEFAULT '0', + `content_access_level` varchar(20) NOT NULL DEFAULT '', + PRIMARY KEY (`session_id`), + UNIQUE KEY `title_idx` (`title`), + KEY `parent_idx` (`parent_scenario`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `sessions` +-- + +CREATE TABLE IF NOT EXISTS `sessions` ( + `session_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `session_type` enum('st_edit','st_anim','st_outland','st_mainland') NOT NULL DEFAULT 'st_edit', + `title` varchar(40) NOT NULL DEFAULT '', + `owner` int(10) unsigned NOT NULL DEFAULT '0', + `plan_date` datetime NOT NULL DEFAULT '2005-09-21 12:41:33', + `start_date` datetime NOT NULL DEFAULT '2005-08-31 00:00:00', + `description` text NOT NULL, + `orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other', + `level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a', + `rule_type` enum('rt_strict','rt_liberal') NOT NULL DEFAULT 'rt_strict', + `access_type` enum('at_public','at_private') NOT NULL DEFAULT 'at_private', + `state` enum('ss_planned','ss_open','ss_locked','ss_closed') NOT NULL DEFAULT 'ss_planned', + `host_shard_id` int(11) NOT NULL DEFAULT '0', + `subscription_slots` int(11) unsigned NOT NULL DEFAULT '0', + `reserved_slots` int(10) unsigned NOT NULL DEFAULT '0', + `free_slots` int(10) unsigned NOT NULL DEFAULT '0', + `estimated_duration` enum('et_short','et_medium','et_long') NOT NULL DEFAULT 'et_short', + `final_duration` int(10) unsigned NOT NULL DEFAULT '0', + `folder_id` int(10) unsigned NOT NULL DEFAULT '0', + `lang` varchar(20) NOT NULL DEFAULT '', + `icone` varchar(70) NOT NULL DEFAULT '', + `anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm', + `race_filter` set('rf_fyros','rf_matis','rf_tryker','rf_zorai') NOT NULL DEFAULT '', + `religion_filter` set('rf_kami','rf_karavan','rf_neutral') NOT NULL DEFAULT '', + `guild_filter` enum('gf_only_my_guild','gf_any_player') DEFAULT 'gf_only_my_guild', + `shard_filter` set('sf_shard00','sf_shard01','sf_shard02','sf_shard03','sf_shard04','sf_shard05','sf_shard06','sf_shard07','sf_shard08','sf_shard09','sf_shard10','sf_shard11','sf_shard12','sf_shard13','sf_shard14','sf_shard15','sf_shard16','sf_shard17','sf_shard18','sf_shard19','sf_shard20','sf_shard21','sf_shard22','sf_shard23','sf_shard24','sf_shard25','sf_shard26','sf_shard27','sf_shard28','sf_shard29','sf_shard30','sf_shard31') NOT NULL DEFAULT 'sf_shard00,sf_shard01,sf_shard02,sf_shard03,sf_shard04,sf_shard05,sf_shard06,sf_shard07,sf_shard08,sf_shard09,sf_shard10,sf_shard11,sf_shard12,sf_shard13,sf_shard14,sf_shard15,sf_shard16,sf_shard17,sf_shard18,sf_shard19,sf_shard20,sf_shard21,sf_shard22,sf_shard23,sf_shard24,sf_shard25,sf_shard26,sf_shard27,sf_shard28,sf_shard29,sf_shard30,sf_shard31', + `level_filter` set('lf_a','lf_b','lf_c','lf_d','lf_e','lf_f') NOT NULL DEFAULT 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f', + `subscription_closed` tinyint(1) NOT NULL DEFAULT '0', + `newcomer` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0', + PRIMARY KEY (`session_id`), + KEY `owner_idx` (`owner`), + KEY `folder_idx` (`folder_id`), + KEY `state_type_idx` (`state`,`session_type`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC AUTO_INCREMENT=303 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `session_log` +-- + +CREATE TABLE IF NOT EXISTS `session_log` ( + `id` int(11) NOT NULL DEFAULT '0', + `scenario_id` int(11) unsigned NOT NULL DEFAULT '0', + `rrp_scored` int(11) unsigned NOT NULL DEFAULT '0', + `scenario_point_scored` int(11) unsigned NOT NULL DEFAULT '0', + `time_taken` int(11) unsigned NOT NULL DEFAULT '0', + `participants` text NOT NULL, + `launch_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `owner` varchar(32) NOT NULL DEFAULT '0', + `guild_name` varchar(50) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `session_participant` +-- + +CREATE TABLE IF NOT EXISTS `session_participant` ( + `Id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `session_id` int(10) unsigned NOT NULL DEFAULT '0', + `char_id` int(10) unsigned NOT NULL DEFAULT '0', + `status` enum('sps_play_subscribed','sps_play_invited','sps_edit_invited','sps_anim_invited','sps_playing','sps_editing','sps_animating') NOT NULL DEFAULT 'sps_play_subscribed', + `kicked` tinyint(1) unsigned NOT NULL DEFAULT '0', + `session_rated` tinyint(1) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`Id`), + KEY `session_idx` (`session_id`), + KEY `user_idx` (`char_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `shard` +-- + +CREATE TABLE IF NOT EXISTS `shard` ( + `shard_id` int(10) NOT NULL DEFAULT '0', + `WSOnline` tinyint(1) NOT NULL DEFAULT '0', + `MOTD` text NOT NULL, + `OldState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_restricted', + `RequiredState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev', + PRIMARY KEY (`shard_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED; + +/*!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 */; diff --git a/code/ryzom/tools/server/admin/config.php b/code/web/todo_cfg/admin/config.php similarity index 100% rename from code/ryzom/tools/server/admin/config.php rename to code/web/todo_cfg/admin/config.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.default.php b/code/web/todo_cfg/config.php similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/config.default.php rename to code/web/todo_cfg/config.php diff --git a/code/ryzom/tools/server/www/login/config.php b/code/web/todo_cfg/login/config.php similarity index 100% rename from code/ryzom/tools/server/www/login/config.php rename to code/web/todo_cfg/login/config.php