diff --git a/html/setup.php b/html/admin-noalyss.php similarity index 100% rename from html/setup.php rename to html/admin-noalyss.php diff --git a/html/admin/setup.php b/html/admin/setup.php index fc7b4ade8..80b873e29 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -104,7 +104,7 @@ session_start(); if ( ! isset($_GET['lang'])){ ?>
- Enter your language : @@ -206,7 +206,7 @@ function create_htaccess() /* The config file is created here */ if (isset($_POST['save_config'])) { - require_once '../../include/config_file.php'; + require_once NOALYSS_INCLUDE.'/lib/config_file.php'; $url=config_file_create($_POST,1,$os); echo ' '. @@ -227,7 +227,8 @@ if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DI if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'config.inc.php')) { echo '

'._('Entrez les informations nécessaires à noalyss').'

'; echo ''; - require_once('../../include/config_file.php'); + require_once NOALYSS_INCLUDE.'/lib/config_file.php'; + echo config_file_form(); echo '
'; echo '

', @@ -633,5 +634,5 @@ for ($e=0;$e < $MaxDossier;$e++) { ?>

- +

\ No newline at end of file diff --git a/html/admin/setup.js b/html/js/setup.js similarity index 100% rename from html/admin/setup.js rename to html/js/setup.js diff --git a/html/user_login.php b/html/user_login.php index bb355e455..026c5c9ce 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -152,7 +152,7 @@ $result.=""; $result.=''; if ( $User->Admin() == 1 ) { - $result.=""; + $result.=""; } $result.='' . '' . '' . - '' . '', $mod['mod_id'], $mod['mod_name'], $mod['mod_desc']); }// for diff --git a/include/restore.inc.php b/include/restore.inc.php index a3ae8077a..3cc071ba5 100644 --- a/include/restore.inc.php +++ b/include/restore.inc.php @@ -77,22 +77,22 @@ if ( isset ($_REQUEST['sa'] )) $id=$cn->get_next_seq('dossier_id'); if ( strlen(trim($_REQUEST['database'])) == 0 ) - { + { $lname=$id." Restauration :".sql_string($_FILES['file']['name']); - } + } else - { + { $lname=$id." ".$_REQUEST['database']; - } + } - if (strlen(trim($_REQUEST['desc']))==0) - { - $ldesc=$lname; - } - else - { - $ldesc=sql_string($_REQUEST['desc']); - } + if (strlen(trim($_REQUEST['desc']))==0) + { + $ldesc=$lname; + } + else + { + $ldesc=sql_string($_REQUEST['desc']); + } $sql="insert into ac_dossier (dos_id,dos_name,dos_description) values ($1,$2,$3)"; $cn->start(); diff --git a/html/admin/sql/account_repository/comment.sql b/include/sql/account_repository/comment.sql similarity index 100% rename from html/admin/sql/account_repository/comment.sql rename to include/sql/account_repository/comment.sql diff --git a/html/admin/sql/account_repository/constraint.sql b/include/sql/account_repository/constraint.sql similarity index 100% rename from html/admin/sql/account_repository/constraint.sql rename to include/sql/account_repository/constraint.sql diff --git a/html/admin/sql/account_repository/data.sql b/include/sql/account_repository/data.sql similarity index 100% rename from html/admin/sql/account_repository/data.sql rename to include/sql/account_repository/data.sql diff --git a/html/admin/sql/account_repository/function.sql b/include/sql/account_repository/function.sql similarity index 100% rename from html/admin/sql/account_repository/function.sql rename to include/sql/account_repository/function.sql diff --git a/html/admin/sql/account_repository/index.sql b/include/sql/account_repository/index.sql similarity index 100% rename from html/admin/sql/account_repository/index.sql rename to include/sql/account_repository/index.sql diff --git a/html/admin/sql/account_repository/make-sql b/include/sql/account_repository/make-sql similarity index 100% rename from html/admin/sql/account_repository/make-sql rename to include/sql/account_repository/make-sql diff --git a/html/admin/sql/account_repository/schema.sql b/include/sql/account_repository/schema.sql similarity index 100% rename from html/admin/sql/account_repository/schema.sql rename to include/sql/account_repository/schema.sql diff --git a/html/admin/sql/account_repository/sequence.sql b/include/sql/account_repository/sequence.sql similarity index 100% rename from html/admin/sql/account_repository/sequence.sql rename to include/sql/account_repository/sequence.sql diff --git a/html/admin/sql/account_repository/table.sql b/include/sql/account_repository/table.sql similarity index 100% rename from html/admin/sql/account_repository/table.sql rename to include/sql/account_repository/table.sql diff --git a/html/admin/sql/account_repository/view.sql b/include/sql/account_repository/view.sql similarity index 100% rename from html/admin/sql/account_repository/view.sql rename to include/sql/account_repository/view.sql diff --git a/html/admin/sql/make-sql b/include/sql/make-sql similarity index 100% rename from html/admin/sql/make-sql rename to include/sql/make-sql diff --git a/html/admin/sql/mod1/comment.sql b/include/sql/mod1/comment.sql similarity index 100% rename from html/admin/sql/mod1/comment.sql rename to include/sql/mod1/comment.sql diff --git a/html/admin/sql/mod1/constraint.sql b/include/sql/mod1/constraint.sql similarity index 100% rename from html/admin/sql/mod1/constraint.sql rename to include/sql/mod1/constraint.sql diff --git a/html/admin/sql/mod1/data.sql b/include/sql/mod1/data.sql similarity index 100% rename from html/admin/sql/mod1/data.sql rename to include/sql/mod1/data.sql diff --git a/html/admin/sql/mod1/function.sql b/include/sql/mod1/function.sql similarity index 100% rename from html/admin/sql/mod1/function.sql rename to include/sql/mod1/function.sql diff --git a/html/admin/sql/mod1/index.sql b/include/sql/mod1/index.sql similarity index 100% rename from html/admin/sql/mod1/index.sql rename to include/sql/mod1/index.sql diff --git a/html/admin/sql/mod1/make-sql b/include/sql/mod1/make-sql similarity index 100% rename from html/admin/sql/mod1/make-sql rename to include/sql/mod1/make-sql diff --git a/html/admin/sql/mod1/schema.sql b/include/sql/mod1/schema.sql similarity index 100% rename from html/admin/sql/mod1/schema.sql rename to include/sql/mod1/schema.sql diff --git a/html/admin/sql/mod1/sequence.sql b/include/sql/mod1/sequence.sql similarity index 100% rename from html/admin/sql/mod1/sequence.sql rename to include/sql/mod1/sequence.sql diff --git a/html/admin/sql/mod1/table.sql b/include/sql/mod1/table.sql similarity index 100% rename from html/admin/sql/mod1/table.sql rename to include/sql/mod1/table.sql diff --git a/html/admin/sql/mod1/view.sql b/include/sql/mod1/view.sql similarity index 100% rename from html/admin/sql/mod1/view.sql rename to include/sql/mod1/view.sql diff --git a/html/admin/sql/mod2/data.sql b/include/sql/mod2/data.sql similarity index 100% rename from html/admin/sql/mod2/data.sql rename to include/sql/mod2/data.sql diff --git a/html/admin/sql/mod2/make-sql b/include/sql/mod2/make-sql similarity index 100% rename from html/admin/sql/mod2/make-sql rename to include/sql/mod2/make-sql diff --git a/html/admin/sql/patch/ac-upgrade10.sql b/include/sql/patch/ac-upgrade10.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade10.sql rename to include/sql/patch/ac-upgrade10.sql diff --git a/html/admin/sql/patch/ac-upgrade11.sql b/include/sql/patch/ac-upgrade11.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade11.sql rename to include/sql/patch/ac-upgrade11.sql diff --git a/html/admin/sql/patch/ac-upgrade12.sql b/include/sql/patch/ac-upgrade12.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade12.sql rename to include/sql/patch/ac-upgrade12.sql diff --git a/html/admin/sql/patch/ac-upgrade13.sql b/include/sql/patch/ac-upgrade13.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade13.sql rename to include/sql/patch/ac-upgrade13.sql diff --git a/html/admin/sql/patch/ac-upgrade14.sql b/include/sql/patch/ac-upgrade14.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade14.sql rename to include/sql/patch/ac-upgrade14.sql diff --git a/html/admin/sql/patch/ac-upgrade15.sql b/include/sql/patch/ac-upgrade15.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade15.sql rename to include/sql/patch/ac-upgrade15.sql diff --git a/html/admin/sql/patch/ac-upgrade4.sql b/include/sql/patch/ac-upgrade4.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade4.sql rename to include/sql/patch/ac-upgrade4.sql diff --git a/html/admin/sql/patch/ac-upgrade5.sql b/include/sql/patch/ac-upgrade5.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade5.sql rename to include/sql/patch/ac-upgrade5.sql diff --git a/html/admin/sql/patch/ac-upgrade6.sql b/include/sql/patch/ac-upgrade6.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade6.sql rename to include/sql/patch/ac-upgrade6.sql diff --git a/html/admin/sql/patch/ac-upgrade7.sql b/include/sql/patch/ac-upgrade7.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade7.sql rename to include/sql/patch/ac-upgrade7.sql diff --git a/html/admin/sql/patch/ac-upgrade8.sql b/include/sql/patch/ac-upgrade8.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade8.sql rename to include/sql/patch/ac-upgrade8.sql diff --git a/html/admin/sql/patch/ac-upgrade9.sql b/include/sql/patch/ac-upgrade9.sql similarity index 100% rename from html/admin/sql/patch/ac-upgrade9.sql rename to include/sql/patch/ac-upgrade9.sql diff --git a/html/admin/sql/patch/downgrade7.sql b/include/sql/patch/downgrade7.sql similarity index 100% rename from html/admin/sql/patch/downgrade7.sql rename to include/sql/patch/downgrade7.sql diff --git a/html/admin/sql/patch/upgrade10.sql b/include/sql/patch/upgrade10.sql similarity index 100% rename from html/admin/sql/patch/upgrade10.sql rename to include/sql/patch/upgrade10.sql diff --git a/html/admin/sql/patch/upgrade100.sql b/include/sql/patch/upgrade100.sql similarity index 100% rename from html/admin/sql/patch/upgrade100.sql rename to include/sql/patch/upgrade100.sql diff --git a/html/admin/sql/patch/upgrade101.sql b/include/sql/patch/upgrade101.sql similarity index 100% rename from html/admin/sql/patch/upgrade101.sql rename to include/sql/patch/upgrade101.sql diff --git a/html/admin/sql/patch/upgrade102.sql b/include/sql/patch/upgrade102.sql similarity index 100% rename from html/admin/sql/patch/upgrade102.sql rename to include/sql/patch/upgrade102.sql diff --git a/html/admin/sql/patch/upgrade103.sql b/include/sql/patch/upgrade103.sql similarity index 100% rename from html/admin/sql/patch/upgrade103.sql rename to include/sql/patch/upgrade103.sql diff --git a/html/admin/sql/patch/upgrade104.sql b/include/sql/patch/upgrade104.sql similarity index 100% rename from html/admin/sql/patch/upgrade104.sql rename to include/sql/patch/upgrade104.sql diff --git a/html/admin/sql/patch/upgrade105.sql b/include/sql/patch/upgrade105.sql similarity index 100% rename from html/admin/sql/patch/upgrade105.sql rename to include/sql/patch/upgrade105.sql diff --git a/html/admin/sql/patch/upgrade106.sql b/include/sql/patch/upgrade106.sql similarity index 100% rename from html/admin/sql/patch/upgrade106.sql rename to include/sql/patch/upgrade106.sql diff --git a/html/admin/sql/patch/upgrade107.sql b/include/sql/patch/upgrade107.sql similarity index 100% rename from html/admin/sql/patch/upgrade107.sql rename to include/sql/patch/upgrade107.sql diff --git a/html/admin/sql/patch/upgrade108.sql b/include/sql/patch/upgrade108.sql similarity index 100% rename from html/admin/sql/patch/upgrade108.sql rename to include/sql/patch/upgrade108.sql diff --git a/html/admin/sql/patch/upgrade109.sql b/include/sql/patch/upgrade109.sql similarity index 100% rename from html/admin/sql/patch/upgrade109.sql rename to include/sql/patch/upgrade109.sql diff --git a/html/admin/sql/patch/upgrade11.sql b/include/sql/patch/upgrade11.sql similarity index 100% rename from html/admin/sql/patch/upgrade11.sql rename to include/sql/patch/upgrade11.sql diff --git a/html/admin/sql/patch/upgrade110.sql b/include/sql/patch/upgrade110.sql similarity index 100% rename from html/admin/sql/patch/upgrade110.sql rename to include/sql/patch/upgrade110.sql diff --git a/html/admin/sql/patch/upgrade111.sql b/include/sql/patch/upgrade111.sql similarity index 100% rename from html/admin/sql/patch/upgrade111.sql rename to include/sql/patch/upgrade111.sql diff --git a/html/admin/sql/patch/upgrade112.sql b/include/sql/patch/upgrade112.sql similarity index 100% rename from html/admin/sql/patch/upgrade112.sql rename to include/sql/patch/upgrade112.sql diff --git a/html/admin/sql/patch/upgrade113.sql b/include/sql/patch/upgrade113.sql similarity index 100% rename from html/admin/sql/patch/upgrade113.sql rename to include/sql/patch/upgrade113.sql diff --git a/html/admin/sql/patch/upgrade114.sql b/include/sql/patch/upgrade114.sql similarity index 100% rename from html/admin/sql/patch/upgrade114.sql rename to include/sql/patch/upgrade114.sql diff --git a/html/admin/sql/patch/upgrade115.sql b/include/sql/patch/upgrade115.sql similarity index 100% rename from html/admin/sql/patch/upgrade115.sql rename to include/sql/patch/upgrade115.sql diff --git a/html/admin/sql/patch/upgrade116.sql b/include/sql/patch/upgrade116.sql similarity index 100% rename from html/admin/sql/patch/upgrade116.sql rename to include/sql/patch/upgrade116.sql diff --git a/html/admin/sql/patch/upgrade117.sql b/include/sql/patch/upgrade117.sql similarity index 100% rename from html/admin/sql/patch/upgrade117.sql rename to include/sql/patch/upgrade117.sql diff --git a/html/admin/sql/patch/upgrade118.sql b/include/sql/patch/upgrade118.sql similarity index 100% rename from html/admin/sql/patch/upgrade118.sql rename to include/sql/patch/upgrade118.sql diff --git a/html/admin/sql/patch/upgrade119.sql b/include/sql/patch/upgrade119.sql similarity index 100% rename from html/admin/sql/patch/upgrade119.sql rename to include/sql/patch/upgrade119.sql diff --git a/html/admin/sql/patch/upgrade12.sql b/include/sql/patch/upgrade12.sql similarity index 100% rename from html/admin/sql/patch/upgrade12.sql rename to include/sql/patch/upgrade12.sql diff --git a/html/admin/sql/patch/upgrade120.sql b/include/sql/patch/upgrade120.sql similarity index 100% rename from html/admin/sql/patch/upgrade120.sql rename to include/sql/patch/upgrade120.sql diff --git a/html/admin/sql/patch/upgrade13.sql b/include/sql/patch/upgrade13.sql similarity index 100% rename from html/admin/sql/patch/upgrade13.sql rename to include/sql/patch/upgrade13.sql diff --git a/html/admin/sql/patch/upgrade14.sql b/include/sql/patch/upgrade14.sql similarity index 100% rename from html/admin/sql/patch/upgrade14.sql rename to include/sql/patch/upgrade14.sql diff --git a/html/admin/sql/patch/upgrade15.sql b/include/sql/patch/upgrade15.sql similarity index 100% rename from html/admin/sql/patch/upgrade15.sql rename to include/sql/patch/upgrade15.sql diff --git a/html/admin/sql/patch/upgrade16.sql b/include/sql/patch/upgrade16.sql similarity index 100% rename from html/admin/sql/patch/upgrade16.sql rename to include/sql/patch/upgrade16.sql diff --git a/html/admin/sql/patch/upgrade17.sql b/include/sql/patch/upgrade17.sql similarity index 100% rename from html/admin/sql/patch/upgrade17.sql rename to include/sql/patch/upgrade17.sql diff --git a/html/admin/sql/patch/upgrade18.sql b/include/sql/patch/upgrade18.sql similarity index 100% rename from html/admin/sql/patch/upgrade18.sql rename to include/sql/patch/upgrade18.sql diff --git a/html/admin/sql/patch/upgrade19.sql b/include/sql/patch/upgrade19.sql similarity index 100% rename from html/admin/sql/patch/upgrade19.sql rename to include/sql/patch/upgrade19.sql diff --git a/html/admin/sql/patch/upgrade20.sql b/include/sql/patch/upgrade20.sql similarity index 100% rename from html/admin/sql/patch/upgrade20.sql rename to include/sql/patch/upgrade20.sql diff --git a/html/admin/sql/patch/upgrade21.sql b/include/sql/patch/upgrade21.sql similarity index 100% rename from html/admin/sql/patch/upgrade21.sql rename to include/sql/patch/upgrade21.sql diff --git a/html/admin/sql/patch/upgrade22.sql b/include/sql/patch/upgrade22.sql similarity index 100% rename from html/admin/sql/patch/upgrade22.sql rename to include/sql/patch/upgrade22.sql diff --git a/html/admin/sql/patch/upgrade23.sql b/include/sql/patch/upgrade23.sql similarity index 100% rename from html/admin/sql/patch/upgrade23.sql rename to include/sql/patch/upgrade23.sql diff --git a/html/admin/sql/patch/upgrade24.sql b/include/sql/patch/upgrade24.sql similarity index 100% rename from html/admin/sql/patch/upgrade24.sql rename to include/sql/patch/upgrade24.sql diff --git a/html/admin/sql/patch/upgrade25.sql b/include/sql/patch/upgrade25.sql similarity index 100% rename from html/admin/sql/patch/upgrade25.sql rename to include/sql/patch/upgrade25.sql diff --git a/html/admin/sql/patch/upgrade26.sql b/include/sql/patch/upgrade26.sql similarity index 100% rename from html/admin/sql/patch/upgrade26.sql rename to include/sql/patch/upgrade26.sql diff --git a/html/admin/sql/patch/upgrade27.sql b/include/sql/patch/upgrade27.sql similarity index 100% rename from html/admin/sql/patch/upgrade27.sql rename to include/sql/patch/upgrade27.sql diff --git a/html/admin/sql/patch/upgrade28.sql b/include/sql/patch/upgrade28.sql similarity index 100% rename from html/admin/sql/patch/upgrade28.sql rename to include/sql/patch/upgrade28.sql diff --git a/html/admin/sql/patch/upgrade29.sql b/include/sql/patch/upgrade29.sql similarity index 100% rename from html/admin/sql/patch/upgrade29.sql rename to include/sql/patch/upgrade29.sql diff --git a/html/admin/sql/patch/upgrade30.sql b/include/sql/patch/upgrade30.sql similarity index 100% rename from html/admin/sql/patch/upgrade30.sql rename to include/sql/patch/upgrade30.sql diff --git a/html/admin/sql/patch/upgrade31.sql b/include/sql/patch/upgrade31.sql similarity index 100% rename from html/admin/sql/patch/upgrade31.sql rename to include/sql/patch/upgrade31.sql diff --git a/html/admin/sql/patch/upgrade32.sql b/include/sql/patch/upgrade32.sql similarity index 100% rename from html/admin/sql/patch/upgrade32.sql rename to include/sql/patch/upgrade32.sql diff --git a/html/admin/sql/patch/upgrade33.sql b/include/sql/patch/upgrade33.sql similarity index 100% rename from html/admin/sql/patch/upgrade33.sql rename to include/sql/patch/upgrade33.sql diff --git a/html/admin/sql/patch/upgrade34.sql b/include/sql/patch/upgrade34.sql similarity index 100% rename from html/admin/sql/patch/upgrade34.sql rename to include/sql/patch/upgrade34.sql diff --git a/html/admin/sql/patch/upgrade35.sql b/include/sql/patch/upgrade35.sql similarity index 100% rename from html/admin/sql/patch/upgrade35.sql rename to include/sql/patch/upgrade35.sql diff --git a/html/admin/sql/patch/upgrade36.BE.sql b/include/sql/patch/upgrade36.BE.sql similarity index 100% rename from html/admin/sql/patch/upgrade36.BE.sql rename to include/sql/patch/upgrade36.BE.sql diff --git a/html/admin/sql/patch/upgrade36.FR.sql b/include/sql/patch/upgrade36.FR.sql similarity index 100% rename from html/admin/sql/patch/upgrade36.FR.sql rename to include/sql/patch/upgrade36.FR.sql diff --git a/html/admin/sql/patch/upgrade36.sql b/include/sql/patch/upgrade36.sql similarity index 100% rename from html/admin/sql/patch/upgrade36.sql rename to include/sql/patch/upgrade36.sql diff --git a/html/admin/sql/patch/upgrade37.sql b/include/sql/patch/upgrade37.sql similarity index 100% rename from html/admin/sql/patch/upgrade37.sql rename to include/sql/patch/upgrade37.sql diff --git a/html/admin/sql/patch/upgrade38.sql b/include/sql/patch/upgrade38.sql similarity index 100% rename from html/admin/sql/patch/upgrade38.sql rename to include/sql/patch/upgrade38.sql diff --git a/html/admin/sql/patch/upgrade39.sql b/include/sql/patch/upgrade39.sql similarity index 100% rename from html/admin/sql/patch/upgrade39.sql rename to include/sql/patch/upgrade39.sql diff --git a/html/admin/sql/patch/upgrade4.sql b/include/sql/patch/upgrade4.sql similarity index 100% rename from html/admin/sql/patch/upgrade4.sql rename to include/sql/patch/upgrade4.sql diff --git a/html/admin/sql/patch/upgrade40.sql b/include/sql/patch/upgrade40.sql similarity index 100% rename from html/admin/sql/patch/upgrade40.sql rename to include/sql/patch/upgrade40.sql diff --git a/html/admin/sql/patch/upgrade41.sql b/include/sql/patch/upgrade41.sql similarity index 100% rename from html/admin/sql/patch/upgrade41.sql rename to include/sql/patch/upgrade41.sql diff --git a/html/admin/sql/patch/upgrade42.sql b/include/sql/patch/upgrade42.sql similarity index 100% rename from html/admin/sql/patch/upgrade42.sql rename to include/sql/patch/upgrade42.sql diff --git a/html/admin/sql/patch/upgrade43.sql b/include/sql/patch/upgrade43.sql similarity index 100% rename from html/admin/sql/patch/upgrade43.sql rename to include/sql/patch/upgrade43.sql diff --git a/html/admin/sql/patch/upgrade44.sql b/include/sql/patch/upgrade44.sql similarity index 100% rename from html/admin/sql/patch/upgrade44.sql rename to include/sql/patch/upgrade44.sql diff --git a/html/admin/sql/patch/upgrade45.sql b/include/sql/patch/upgrade45.sql similarity index 100% rename from html/admin/sql/patch/upgrade45.sql rename to include/sql/patch/upgrade45.sql diff --git a/html/admin/sql/patch/upgrade46.sql b/include/sql/patch/upgrade46.sql similarity index 100% rename from html/admin/sql/patch/upgrade46.sql rename to include/sql/patch/upgrade46.sql diff --git a/html/admin/sql/patch/upgrade47.sql b/include/sql/patch/upgrade47.sql similarity index 100% rename from html/admin/sql/patch/upgrade47.sql rename to include/sql/patch/upgrade47.sql diff --git a/html/admin/sql/patch/upgrade48.sql b/include/sql/patch/upgrade48.sql similarity index 100% rename from html/admin/sql/patch/upgrade48.sql rename to include/sql/patch/upgrade48.sql diff --git a/html/admin/sql/patch/upgrade49.sql b/include/sql/patch/upgrade49.sql similarity index 100% rename from html/admin/sql/patch/upgrade49.sql rename to include/sql/patch/upgrade49.sql diff --git a/html/admin/sql/patch/upgrade5.sql b/include/sql/patch/upgrade5.sql similarity index 100% rename from html/admin/sql/patch/upgrade5.sql rename to include/sql/patch/upgrade5.sql diff --git a/html/admin/sql/patch/upgrade50.sql b/include/sql/patch/upgrade50.sql similarity index 100% rename from html/admin/sql/patch/upgrade50.sql rename to include/sql/patch/upgrade50.sql diff --git a/html/admin/sql/patch/upgrade51.sql b/include/sql/patch/upgrade51.sql similarity index 100% rename from html/admin/sql/patch/upgrade51.sql rename to include/sql/patch/upgrade51.sql diff --git a/html/admin/sql/patch/upgrade52.sql b/include/sql/patch/upgrade52.sql similarity index 100% rename from html/admin/sql/patch/upgrade52.sql rename to include/sql/patch/upgrade52.sql diff --git a/html/admin/sql/patch/upgrade53.sql b/include/sql/patch/upgrade53.sql similarity index 100% rename from html/admin/sql/patch/upgrade53.sql rename to include/sql/patch/upgrade53.sql diff --git a/html/admin/sql/patch/upgrade54.sql b/include/sql/patch/upgrade54.sql similarity index 100% rename from html/admin/sql/patch/upgrade54.sql rename to include/sql/patch/upgrade54.sql diff --git a/html/admin/sql/patch/upgrade55.sql b/include/sql/patch/upgrade55.sql similarity index 100% rename from html/admin/sql/patch/upgrade55.sql rename to include/sql/patch/upgrade55.sql diff --git a/html/admin/sql/patch/upgrade56.sql b/include/sql/patch/upgrade56.sql similarity index 100% rename from html/admin/sql/patch/upgrade56.sql rename to include/sql/patch/upgrade56.sql diff --git a/html/admin/sql/patch/upgrade57.sql b/include/sql/patch/upgrade57.sql similarity index 100% rename from html/admin/sql/patch/upgrade57.sql rename to include/sql/patch/upgrade57.sql diff --git a/html/admin/sql/patch/upgrade58.sql b/include/sql/patch/upgrade58.sql similarity index 100% rename from html/admin/sql/patch/upgrade58.sql rename to include/sql/patch/upgrade58.sql diff --git a/html/admin/sql/patch/upgrade59.sql b/include/sql/patch/upgrade59.sql similarity index 100% rename from html/admin/sql/patch/upgrade59.sql rename to include/sql/patch/upgrade59.sql diff --git a/html/admin/sql/patch/upgrade6.sql b/include/sql/patch/upgrade6.sql similarity index 100% rename from html/admin/sql/patch/upgrade6.sql rename to include/sql/patch/upgrade6.sql diff --git a/html/admin/sql/patch/upgrade60.sql b/include/sql/patch/upgrade60.sql similarity index 100% rename from html/admin/sql/patch/upgrade60.sql rename to include/sql/patch/upgrade60.sql diff --git a/html/admin/sql/patch/upgrade61.BE.sql b/include/sql/patch/upgrade61.BE.sql similarity index 100% rename from html/admin/sql/patch/upgrade61.BE.sql rename to include/sql/patch/upgrade61.BE.sql diff --git a/html/admin/sql/patch/upgrade61.FR.sql b/include/sql/patch/upgrade61.FR.sql similarity index 100% rename from html/admin/sql/patch/upgrade61.FR.sql rename to include/sql/patch/upgrade61.FR.sql diff --git a/html/admin/sql/patch/upgrade61.sql b/include/sql/patch/upgrade61.sql similarity index 100% rename from html/admin/sql/patch/upgrade61.sql rename to include/sql/patch/upgrade61.sql diff --git a/html/admin/sql/patch/upgrade62.sql b/include/sql/patch/upgrade62.sql similarity index 100% rename from html/admin/sql/patch/upgrade62.sql rename to include/sql/patch/upgrade62.sql diff --git a/html/admin/sql/patch/upgrade63.sql b/include/sql/patch/upgrade63.sql similarity index 100% rename from html/admin/sql/patch/upgrade63.sql rename to include/sql/patch/upgrade63.sql diff --git a/html/admin/sql/patch/upgrade64.sql b/include/sql/patch/upgrade64.sql similarity index 100% rename from html/admin/sql/patch/upgrade64.sql rename to include/sql/patch/upgrade64.sql diff --git a/html/admin/sql/patch/upgrade65.sql b/include/sql/patch/upgrade65.sql similarity index 100% rename from html/admin/sql/patch/upgrade65.sql rename to include/sql/patch/upgrade65.sql diff --git a/html/admin/sql/patch/upgrade66.sql b/include/sql/patch/upgrade66.sql similarity index 100% rename from html/admin/sql/patch/upgrade66.sql rename to include/sql/patch/upgrade66.sql diff --git a/html/admin/sql/patch/upgrade67.sql b/include/sql/patch/upgrade67.sql similarity index 100% rename from html/admin/sql/patch/upgrade67.sql rename to include/sql/patch/upgrade67.sql diff --git a/html/admin/sql/patch/upgrade68.sql b/include/sql/patch/upgrade68.sql similarity index 100% rename from html/admin/sql/patch/upgrade68.sql rename to include/sql/patch/upgrade68.sql diff --git a/html/admin/sql/patch/upgrade69.sql b/include/sql/patch/upgrade69.sql similarity index 100% rename from html/admin/sql/patch/upgrade69.sql rename to include/sql/patch/upgrade69.sql diff --git a/html/admin/sql/patch/upgrade7.sql b/include/sql/patch/upgrade7.sql similarity index 100% rename from html/admin/sql/patch/upgrade7.sql rename to include/sql/patch/upgrade7.sql diff --git a/html/admin/sql/patch/upgrade70.sql b/include/sql/patch/upgrade70.sql similarity index 100% rename from html/admin/sql/patch/upgrade70.sql rename to include/sql/patch/upgrade70.sql diff --git a/html/admin/sql/patch/upgrade71.sql b/include/sql/patch/upgrade71.sql similarity index 100% rename from html/admin/sql/patch/upgrade71.sql rename to include/sql/patch/upgrade71.sql diff --git a/html/admin/sql/patch/upgrade72.sql b/include/sql/patch/upgrade72.sql similarity index 100% rename from html/admin/sql/patch/upgrade72.sql rename to include/sql/patch/upgrade72.sql diff --git a/html/admin/sql/patch/upgrade73.sql b/include/sql/patch/upgrade73.sql similarity index 100% rename from html/admin/sql/patch/upgrade73.sql rename to include/sql/patch/upgrade73.sql diff --git a/html/admin/sql/patch/upgrade74.sql b/include/sql/patch/upgrade74.sql similarity index 100% rename from html/admin/sql/patch/upgrade74.sql rename to include/sql/patch/upgrade74.sql diff --git a/html/admin/sql/patch/upgrade75.sql b/include/sql/patch/upgrade75.sql similarity index 100% rename from html/admin/sql/patch/upgrade75.sql rename to include/sql/patch/upgrade75.sql diff --git a/html/admin/sql/patch/upgrade76.sql b/include/sql/patch/upgrade76.sql similarity index 100% rename from html/admin/sql/patch/upgrade76.sql rename to include/sql/patch/upgrade76.sql diff --git a/html/admin/sql/patch/upgrade77.sql b/include/sql/patch/upgrade77.sql similarity index 100% rename from html/admin/sql/patch/upgrade77.sql rename to include/sql/patch/upgrade77.sql diff --git a/html/admin/sql/patch/upgrade78.sql b/include/sql/patch/upgrade78.sql similarity index 100% rename from html/admin/sql/patch/upgrade78.sql rename to include/sql/patch/upgrade78.sql diff --git a/html/admin/sql/patch/upgrade79.sql b/include/sql/patch/upgrade79.sql similarity index 100% rename from html/admin/sql/patch/upgrade79.sql rename to include/sql/patch/upgrade79.sql diff --git a/html/admin/sql/patch/upgrade8.sql b/include/sql/patch/upgrade8.sql similarity index 100% rename from html/admin/sql/patch/upgrade8.sql rename to include/sql/patch/upgrade8.sql diff --git a/html/admin/sql/patch/upgrade80.sql b/include/sql/patch/upgrade80.sql similarity index 100% rename from html/admin/sql/patch/upgrade80.sql rename to include/sql/patch/upgrade80.sql diff --git a/html/admin/sql/patch/upgrade81.sql b/include/sql/patch/upgrade81.sql similarity index 100% rename from html/admin/sql/patch/upgrade81.sql rename to include/sql/patch/upgrade81.sql diff --git a/html/admin/sql/patch/upgrade82.sql b/include/sql/patch/upgrade82.sql similarity index 100% rename from html/admin/sql/patch/upgrade82.sql rename to include/sql/patch/upgrade82.sql diff --git a/html/admin/sql/patch/upgrade83.sql b/include/sql/patch/upgrade83.sql similarity index 100% rename from html/admin/sql/patch/upgrade83.sql rename to include/sql/patch/upgrade83.sql diff --git a/html/admin/sql/patch/upgrade84.sql b/include/sql/patch/upgrade84.sql similarity index 100% rename from html/admin/sql/patch/upgrade84.sql rename to include/sql/patch/upgrade84.sql diff --git a/html/admin/sql/patch/upgrade85.sql b/include/sql/patch/upgrade85.sql similarity index 100% rename from html/admin/sql/patch/upgrade85.sql rename to include/sql/patch/upgrade85.sql diff --git a/html/admin/sql/patch/upgrade86.sql b/include/sql/patch/upgrade86.sql similarity index 100% rename from html/admin/sql/patch/upgrade86.sql rename to include/sql/patch/upgrade86.sql diff --git a/html/admin/sql/patch/upgrade87.sql b/include/sql/patch/upgrade87.sql similarity index 100% rename from html/admin/sql/patch/upgrade87.sql rename to include/sql/patch/upgrade87.sql diff --git a/html/admin/sql/patch/upgrade88.sql b/include/sql/patch/upgrade88.sql similarity index 100% rename from html/admin/sql/patch/upgrade88.sql rename to include/sql/patch/upgrade88.sql diff --git a/html/admin/sql/patch/upgrade89.sql b/include/sql/patch/upgrade89.sql similarity index 100% rename from html/admin/sql/patch/upgrade89.sql rename to include/sql/patch/upgrade89.sql diff --git a/html/admin/sql/patch/upgrade9.sql b/include/sql/patch/upgrade9.sql similarity index 100% rename from html/admin/sql/patch/upgrade9.sql rename to include/sql/patch/upgrade9.sql diff --git a/html/admin/sql/patch/upgrade90.sql b/include/sql/patch/upgrade90.sql similarity index 100% rename from html/admin/sql/patch/upgrade90.sql rename to include/sql/patch/upgrade90.sql diff --git a/html/admin/sql/patch/upgrade91.sql b/include/sql/patch/upgrade91.sql similarity index 100% rename from html/admin/sql/patch/upgrade91.sql rename to include/sql/patch/upgrade91.sql diff --git a/html/admin/sql/patch/upgrade92.sql b/include/sql/patch/upgrade92.sql similarity index 100% rename from html/admin/sql/patch/upgrade92.sql rename to include/sql/patch/upgrade92.sql diff --git a/html/admin/sql/patch/upgrade93.sql b/include/sql/patch/upgrade93.sql similarity index 100% rename from html/admin/sql/patch/upgrade93.sql rename to include/sql/patch/upgrade93.sql diff --git a/html/admin/sql/patch/upgrade94.sql b/include/sql/patch/upgrade94.sql similarity index 100% rename from html/admin/sql/patch/upgrade94.sql rename to include/sql/patch/upgrade94.sql diff --git a/html/admin/sql/patch/upgrade95.sql b/include/sql/patch/upgrade95.sql similarity index 100% rename from html/admin/sql/patch/upgrade95.sql rename to include/sql/patch/upgrade95.sql diff --git a/html/admin/sql/patch/upgrade96.sql b/include/sql/patch/upgrade96.sql similarity index 100% rename from html/admin/sql/patch/upgrade96.sql rename to include/sql/patch/upgrade96.sql diff --git a/html/admin/sql/patch/upgrade97.sql b/include/sql/patch/upgrade97.sql similarity index 100% rename from html/admin/sql/patch/upgrade97.sql rename to include/sql/patch/upgrade97.sql diff --git a/html/admin/sql/patch/upgrade98.sql b/include/sql/patch/upgrade98.sql similarity index 100% rename from html/admin/sql/patch/upgrade98.sql rename to include/sql/patch/upgrade98.sql diff --git a/html/admin/sql/patch/upgrade99.sql b/include/sql/patch/upgrade99.sql similarity index 100% rename from html/admin/sql/patch/upgrade99.sql rename to include/sql/patch/upgrade99.sql diff --git a/html/admin/template_config_form.php b/include/template/template_config_form.php similarity index 100% rename from html/admin/template_config_form.php rename to include/template/template_config_form.php
Administration "._("Administration")." '; $result.=''._('Préférence').''; diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php index 88339907f..7ca886193 100644 --- a/include/admin_repo.inc.php +++ b/include/admin_repo.inc.php @@ -21,15 +21,15 @@ * \brief Administration of the repository : creation of user, folder, security, * templates... Accessible only by the administrator */ -if ( ! defined ('ALLOWED')) { die ('Non autorisé');} +if ( ! defined ('ALLOWED')) { die (_('Non autorisé'));} +include_once NOALYSS_INCLUDE."/class/class_user.php"; require_once NOALYSS_INCLUDE."/lib/user_common.php"; include_once NOALYSS_INCLUDE."/lib/ac_common.php"; require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE."/lib/user_menu.php"; $rep=new Database(); -include_once ("class/class_user.php"); $User=new User($rep); $User->Check(); @@ -37,11 +37,14 @@ html_page_start($User->theme); if ($User->admin != 1) { + echo "

"; + echo _("Vous n'êtes pas administateur"); + echo "

"; html_page_stop(); return; } load_all_script(); -echo '

'._('Administration Globale').'

'; +echo '

'._('Administration').'

'; echo '
'; echo MenuAdmin()."
"; @@ -60,7 +63,7 @@ if ( isset ($_REQUEST["action"]) ) //---------------------------------------------------------------------- // User management //---------------------------------------------------------------------- - require_once("user.inc.php"); + require_once NOALYSS_INCLUDE."/user.inc.php"; } // action=user_mgt if ( $_REQUEST["action"]=="dossier_mgt") @@ -68,25 +71,29 @@ if ( isset ($_REQUEST["action"]) ) //----------------------------------------------------------------------- // action = dossier_mgt //----------------------------------------------------------------------- - require_once("dossier.inc.php"); + require_once NOALYSS_INCLUDE."/dossier.inc.php"; } if ( $_REQUEST["action"] == "modele_mgt" ) { //----------------------------------------------------------------------- // Template Management //----------------------------------------------------------------------- - require_once("modele.inc.php"); + require_once NOALYSS_INCLUDE."/modele.inc.php"; } // action is set if ( $_REQUEST['action'] == 'restore') { // Backup and restaure folders - require_once("restore.inc.php"); + require_once NOALYSS_INCLUDE."/restore.inc.php"; } if ($_REQUEST['action'] == 'audit_log') - { + { /* List the connexion successuf and failed */ - require_once('audit_log.php'); - } + require_once NOALYSS_INCLUDE."/audit_log.php"; + } + if ( $_REQUEST['action'] == 'backup') { + /* take backup */ + require_once NOALYSS_INCLUDE."/backup.inc.php"; + } }// action = modele_mgt ?> diff --git a/html/backup.php b/include/backup.inc.php similarity index 86% rename from html/backup.php rename to include/backup.inc.php index 6dc1e47a2..176e3ba1d 100644 --- a/html/backup.php +++ b/include/backup.inc.php @@ -16,32 +16,18 @@ * along with NOALYSS; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/*!\file + * \brief Make and restore backup + */ +if ( !defined("ALLOWED")) { die (_("Non autorisé")); } // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once '../include/constant.php'; -require_once("constant.php"); -require_once('lib/class_database.php'); -require_once ("class/class_user.php"); -require_once ('lib/ac_common.php'); - -$rep=new Database(); -$User=new User($rep); -$User->Check(); - - -if ($User->admin != 1) -{ - echo ""; - return; -} $dossier_number=HtmlInput::default_value_request("d", 0); if ($dossier_number == 0 || isNumber($dossier_number) ==0 ) { die ('Invalid folder number'); } -/*!\file - * \brief Make and restore backup - */ + if ( isset ($_REQUEST['sa']) ) { if ( defined ('PG_PATH') ) @@ -50,7 +36,7 @@ if ( isset ($_REQUEST['sa']) ) if ( ! isset($_REQUEST['t'])) { - echo "Erreur : paramètre manquant "; + echo _("Erreur : paramètre manquant "); exit(); } diff --git a/include/dossier.inc.php b/include/dossier.inc.php index 85adeff4b..ec3a31cad 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -274,7 +274,7 @@ if ( $sa == 'list' ) echo td(HtmlInput::anchor(_('Modifier'),'?action=dossier_mgt&sa=mod&d=' .$Dossier['dos_id']," onclick=\"folder_modify('".$Dossier['dos_id']."')\"")); - echo td(HtmlInput::anchor(_('Backup'),'backup.php?action=backup&sa=b&t=d&d=' + echo td(HtmlInput::anchor(_('Backup'),'?action=backup&sa=b&t=d&d=' .$Dossier['dos_id'])); } else { diff --git a/include/config_file.php b/include/lib/config_file.php similarity index 100% rename from include/config_file.php rename to include/lib/config_file.php diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php index ae0f1b04a..dcd1807ea 100644 --- a/include/lib/user_menu.php +++ b/include/lib/user_menu.php @@ -107,11 +107,11 @@ function MenuAdmin() } if (!defined("MULTI")||(defined("MULTI")&&MULTI==1)) { - $item=array (array("admin_repo.php?action=user_mgt",_("Utilisateurs"),_('Gestion des utilisateurs'),0), - array("admin_repo.php?action=dossier_mgt",_("Dossiers"),_('Gestion des dossiers'),1), - array("admin_repo.php?action=modele_mgt",_("Modèles"),_('Gestion des modèles'),2), - array("admin_repo.php?action=restore",_("Restaure"),_("Restaure une base de données"),3), - array("admin_repo.php?action=audit_log",_("Audit"),_("Utilisateurs qui se sont connectés"),4), + $item=array (array("admin-noalyss.php?action=user_mgt",_("Utilisateurs"),_('Gestion des utilisateurs'),0), + array("admin-noalyss.php?action=dossier_mgt",_("Dossiers"),_('Gestion des dossiers'),1), + array("admin-noalyss.php?action=modele_mgt",_("Modèles"),_('Gestion des modèles'),2), + array("admin-noalyss.php?action=restore",_("Restaure"),_("Restaure une base de données"),3), + array("admin-noalyss.php?action=audit_log",_("Audit"),_("Utilisateurs qui se sont connectés"),4), array("login.php",_("Accueil")) ); } diff --git a/include/modele.inc.php b/include/modele.inc.php index a7f1d454b..805fae8f0 100644 --- a/include/modele.inc.php +++ b/include/modele.inc.php @@ -289,7 +289,7 @@ if ($sa == 'list') '		' . HtmlInput::anchor(_('Modifie'), '?action=modele_mgt&sa=mod&m=' . $mod['mod_id']," onclick = \"modele_modify('{$mod['mod_id']}') \"") . '' . HtmlInput::anchor(_('Backup'), 'backup.php?action=backup&sa=b&t=m&d=' + '' . HtmlInput::anchor(_('Backup'), '?action=backup&sa=b&t=m&d=' . $mod['mod_id']) . '