diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile index 5cf03c545..c827a12e4 100644 --- a/doc/developper/Doxyfile +++ b/doc/developper/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = noalyss # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = Version-7 +PROJECT_NUMBER = Version-7.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -656,7 +656,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = ../../html/addon ../../include/tfpdf ../../unit-test ../../include/ext ../../include/config.inc.php +EXCLUDE = ../../html/addon ../../unit-test ../../include/ext ../../include/config.inc.php # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 7462fe8b2..62d5713ea 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -191,6 +191,8 @@ $path = array( "ledger_show"=>"ajax_ledger_show", //Show the available distribution keys for analytic "anc_key_choice"=>"ajax_anc_key_choice" , + //Clean the detail for analytic + "anc_key_clean"=>"ajax_anc_key_clean" , // Show the activities computed with the selected distribution key "anc_key_compute"=>"ajax_anc_key_compute" , //From admin, revoke the access to a folder from an user diff --git a/html/extension.raw.php b/html/extension.raw.php index 728aafacc..d8f8abb72 100644 --- a/html/extension.raw.php +++ b/html/extension.raw.php @@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; global $g_user,$cn,$g_parameter; - +$http=new HttpInput(); $cn=Dossier::connect(); $g_user=new User($cn); $g_user->check(); @@ -42,7 +42,7 @@ $only_plugin=$g_user->check_dossier(dossier::id()); set_language(); $ext=new Extension($cn); -if ( $ext->search($_REQUEST['plugin_code']) != -1 ) +if ( $ext->search($http->request("plugin_code")) != -1 ) { /* security */ if ( !isset ($_SESSION['g_user']) || $ext->can_request($_SESSION['g_user']) == 0 ) diff --git a/html/install.php b/html/install.php index e82a329fa..191209ec2 100644 --- a/html/install.php +++ b/html/install.php @@ -73,6 +73,9 @@ session_start(); color: inherit; } + +

@@ -129,6 +132,13 @@ if ( ! isset($_GET['lang'])){ require_once '../include/constant.php'; include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; include_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; +include_once '../lib/function_javascript.php'; +load_all_script(); + + + + +echo '

'; if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8') { $_SESSION['g_lang']=$_GET['lang']; @@ -137,8 +147,11 @@ if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8') ?> +