diff --git a/.hgignore b/.hgignore index 5725e21a2..a029f4c6e 100644 --- a/.hgignore +++ b/.hgignore @@ -9,8 +9,6 @@ ReleaseDebug DebugFast ReleaseDebugStatic DebugFastStatic -nel_tools_win* -ryzom_tools_win* # Test and application directories screenshots @@ -228,3 +226,14 @@ code\ryzom\tools\server\ryzom_ams\old # AMS ignore code/ryzom/tools/server/ryzom_ams/www/config.php + +#tools and external dir's +external +external_stlport +nel_tools* +ryzom_tools* + +#Dumps +*.dmp + + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index 9f8d61cbc..40a96f6c1 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -33,7 +33,7 @@ class Helpers{ $smarty -> debugging = false; // caching must be disabled for multi-language support $smarty -> caching = false; - $smarty -> cache_lifetime = 120; + $smarty -> cache_lifetime = 5; //needed by smarty. helpers :: create_folders (); diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.default.php b/code/ryzom/tools/server/ryzom_ams/www/config.default.php index 222f0eba0..c20ad4cdc 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.default.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.default.php @@ -95,8 +95,8 @@ $AMS_CACHEDIR = $AMS_LIB . '/cache'; $SITEBASE = dirname( __FILE__ ) . '/html/' ; //the paths to your website url -$BASE_WEBPATH = dirname($_SERVER['PHP_SELF']); -$IMAGELOC_WEBPATH = $_SERVER['REQUEST_URI'].'/img'; +$BASE_WEBPATH = ''; +$IMAGELOC_WEBPATH = $BASE_WEBPATH.'img'; $WEBPATH = $BASE_WEBPATH . '/index.php'; $INGAME_WEBPATH = $BASE_WEBPATH . '/index.php'; $CONFIG_PATH = dirname( __FILE__ ); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder b/code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php index b27598e15..56a9c5b24 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php @@ -13,6 +13,7 @@ error_reporting( E_ALL ); $return = array(); + $return['no_visible_elements'] = false; helpers :: loadTemplate( "install" , $return ); exit; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder new file mode 100644 index 000000000..e69de29bb