Code cleaning : split database into database (for noalyss) and databasecore ,

with the functions

dev/SQL/index.php

@@ -9,7 +9,7 @@ require_once '../../include/constant.php';
 const REPOSITORY_DB=1;
 const ACCOUNT_DB=2;
 
-require_once NOALYSS_INCLUDE."/lib/database.class.php";
+require_once NOALYSS_INCLUDE."/class/database.class.php";
 require_once NOALYSS_INCLUDE."/lib/iselect.class.php";
 require_once NOALYSS_INCLUDE."/lib/http_input.class.php";
 

dev/SQL/template/script_sql.php

@@ -20,7 +20,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 
 /**

html/ajax.php

@@ -14,7 +14,7 @@
  */
 if ( ! defined ('ALLOWED') ) define ('ALLOWED',1);
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/extension.class.php';

html/ajax_misc.php

@@ -38,7 +38,7 @@
 if ( ! defined('ALLOWED')) define ('ALLOWED',1);
 
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iradio.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';

html/ajax_test.php

@@ -31,7 +31,7 @@
 
 include_once  "../include/constant.php";
 include_once NOALYSS_INCLUDE."/lib/ac_common.php";
-require_once  NOALYSS_INCLUDE."/lib/database.class.php";
+require_once  NOALYSS_INCLUDE."/class/database.class.php";
 require_once  NOALYSS_INCLUDE."/class/dossier.class.php";
 require_once  NOALYSS_INCLUDE."/lib/html_input.class.php";
 require_once  NOALYSS_INCLUDE."/lib/http_input.class.php";

html/compute.php

@@ -31,7 +31,7 @@
  * Must return at least tva, htva and tvac
  */
 require_once '../include/constant.php';
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_compute.class.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_tva.class.php';

html/direct.php

@@ -19,7 +19,7 @@
  */
 
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 
 $cn=Dossier::connect();

html/do.php

@@ -23,7 +23,7 @@ define('ALLOWED',1);
  * \brief Main file
  */
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/user_common.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';

html/export.php

@@ -27,7 +27,7 @@
 define ('ALLOWED',1);
 require_once '../include/constant.php';
 global $g_user,$cn,$g_parameter;
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $gDossier=dossier::id();

html/extension.raw.php

@@ -24,7 +24,7 @@
  * the security. Load several javascript files
  */
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';

html/fid.php

@@ -34,7 +34,7 @@
  */
 require_once '../include/constant.php';
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/user_common.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

html/fid_card.php

@@ -26,7 +26,7 @@
  */
 
 require_once '../include/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 /*!\brief

html/install.php

@@ -282,7 +282,7 @@ if ( ! file_exists(NOALYSS_INCLUDE.'/config.inc.php')) {
 // magic_quotes_sybase = Off
 // include_path
 require_once NOALYSS_INCLUDE.'/lib/config_file.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 // we shouldn't use it 
 // if ( defined ("MULTI") && MULTI==1) { create_htaccess();}

html/login.php

@@ -25,7 +25,7 @@ include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
  * \brief Login page
  */
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 // Verif if User and Pass match DB
     // if no, then redirect to the login page
 $rep=new Database();

html/logout.php

@@ -22,7 +22,7 @@
  */
 require_once '../include/constant.php';
 require_once ("lib/ac_common.php");
-require_once('lib/database.class.php');
+require_once('class/database.class.php');
 session_unset();
 
 html_page_start("classic");

html/popup.php

@@ -23,7 +23,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';

html/recherche.php

@@ -37,7 +37,7 @@ $http=new HttpInput();
 
 $gDossier=dossier::id();
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 /* Admin. Dossier */
 
 $cn=Dossier::connect();

html/test.php

@@ -31,7 +31,7 @@
 
 include_once("../include/constant.php");
 include_once("lib/ac_common.php");
-require_once('lib/database.class.php');
+require_once('class/database.class.php');
 require_once ('class/dossier.class.php');
 require_once('lib/html_input.class.php');
 require_once('lib/icon_action.class.php');

html/user_login.php

@@ -23,7 +23,7 @@
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once '../include/constant.php';
 include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';

include/admin_repo.inc.php

@@ -27,7 +27,7 @@ if ( ! defined ('ALLOWED_ADMIN')) { die (_('Non autorisé'));}
 include_once NOALYSS_INCLUDE."/class/user.class.php";
 require_once NOALYSS_INCLUDE."/lib/user_common.php";
 include_once NOALYSS_INCLUDE."/lib/ac_common.php";
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE."/lib/user_menu.php";
 require_once NOALYSS_INCLUDE."/lib/http_input.class.php";
 require_once NOALYSS_INCLUDE."/lib/icon_action.class.php";

include/ajax/ajax_anc_search.php

@@ -31,7 +31,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php';

include/ajax/ajax_auto_anc_card.php

@@ -6,7 +6,7 @@
    *@brief no used ?? 
    */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 $cn=Dossier::connect();
 

include/ajax/ajax_card.php

@@ -56,7 +56,7 @@
  */
 if ( ! defined('ALLOWED')) die (_('Accès non autorisé'));
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iradio.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';

include/ajax/ajax_get_receipt.php

@@ -30,7 +30,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';

include/ajax/ajax_history.php

@@ -25,7 +25,7 @@
    */
 if ( ! defined('ALLOWED')) die (_('Accès interdit'));
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';

include/ajax/ajax_ledger.php

@@ -30,7 +30,7 @@
 */
 if ( ! defined('ALLOWED')) die(_('Non authorisé'));
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';

include/ajax/ajax_mod_document.php

@@ -23,7 +23,7 @@
  * \brief show the detail of a document and let you modify it
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/document_modele.class.php';
 

include/ajax/ajax_poste.php

@@ -36,7 +36,7 @@ if ( ! defined('ALLOWED')) die (_('Non authorisé'));
 
 require_once  NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
 mb_internal_encoding("UTF-8");

include/ajax/ajax_search_operation.php

@@ -30,7 +30,7 @@ require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
 global $http;
 $gDossier=dossier::id();
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 /* Admin. Dossier */
 
 $cn=Dossier::connect();

include/ajax/ajax_todo_list.php

@@ -36,7 +36,7 @@
 if ( ! defined ('ALLOWED') ) die (_('Aucun accès direct'));
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once  NOALYSS_INCLUDE.'/class/todo_list.class.php';
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/user.class.php';
 mb_internal_encoding("UTF-8");
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';

include/ajax/ajax_update_predef.php

@@ -29,7 +29,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 

include/cfgfiche.inc.php

@@ -25,7 +25,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';

include/cfgledger.inc.php

@@ -29,7 +29,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/user_menu.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';

include/class/acc_account.class.php

@@ -24,7 +24,7 @@
  * \brief Manage the account from the table tmp_pcmn
  */
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/database/tmp_pcmn_sql.class.php';
 

include/class/acc_account_ledger.class.php

@@ -24,7 +24,7 @@
  * \brief Manage the account from the table jrn, jrnx or tmp_pcmn
  */
 require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 
 class Acc_Account_Ledger

include/class/acc_bilan.class.php

@@ -24,7 +24,7 @@
  *
  */
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/impress.class.php';
 require_once NOALYSS_INCLUDE.'/header_print.php';

include/class/acc_ledger_info.class.php

@@ -19,7 +19,7 @@
 
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 
 /*!\file

include/class/acc_reconciliation.class.php

@@ -25,7 +25,7 @@
  *
  */
 require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php';
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
 

include/class/acc_tva.class.php

@@ -23,7 +23,7 @@
  * \brief this class is used for the table tva_rate
  */
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 /*!\brief Acc_Tva is used for to map the table tva_rate
  * parameter are

include/class/admin.class.php

@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php';
 
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';

include/class/anc_group.class.php

@@ -23,7 +23,7 @@
  * \brief class for the group of the analytic account
  *
  */
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/constant.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/anc_print.class.php';

include/class/anc_group_operation.class.php

@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once  NOALYSS_INCLUDE.'/class/anc_operation.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/anc_plan.class.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 

include/class/anc_plan.class.php

@@ -29,7 +29,7 @@
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/database/poste_analytique_sql.class.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
 

include/class/anc_print.class.php

@@ -32,7 +32,7 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/constant.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once  NOALYSS_INCLUDE.'/class/anc_plan.class.php';

include/class/bank.class.php

@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php';
 
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';

include/class/customer.class.php

@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';

include/class/database.class.php

@@ -0,0 +1,116 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+/**
+ * \file
+ * \brief contains the class for connecting to Noalyss
+ */
+
+require_once NOALYSS_INCLUDE . '/lib/database_core.class.php';
+
+class Database extends DatabaseCore
+{
+    /**\brief constructor
+     * \param $p_database_id is the id of the dossier, or the modele following the
+     * p_type if = 0 then connect to the repository
+     * \param $p_type is 'DOS' (defaut) for dossier or 'MOD'
+     */
+
+    function __construct($p_database_id = 0, $p_type = 'dos')
+    {
+        if (IsNumber($p_database_id) == false || strlen($p_database_id) > 10)
+            die("-->Dossier invalide [$p_database_id]");
+        $noalyss_user = (defined("noalyss_user")) ? noalyss_user : phpcompta_user;
+        $password = (defined("noalyss_password")) ? noalyss_password : phpcompta_password;
+        $port = (defined("noalyss_psql_port")) ? noalyss_psql_port : phpcompta_psql_port;
+        $host = (!defined("noalyss_psql_host")) ? '127.0.0.1' : noalyss_psql_host;
+        if (defined("MULTI") && MULTI == "0") {
+            $l_dossier = dbname;
+        } else {
+
+            if ($p_database_id == 0) { /* connect to the repository */
+                $l_dossier = sprintf("%saccount_repository", strtolower(domaine));
+            } else if ($p_type == 'dos') { /* connect to a folder (dossier) */
+                $l_dossier = sprintf("%sdossier%d", strtolower(domaine), $p_database_id);
+            } else if ($p_type == 'mod') { /* connect to a template (modele) */
+                $l_dossier = sprintf("%smod%d", strtolower(domaine), $p_database_id);
+            } else if ($p_type == 'template') {
+                $l_dossier = 'template1';
+            } else {
+                throw new Exception('Connection invalide');
+            }
+        }
+
+        parent::__construct($noalyss_user, $password, $l_dossier, $host, $port);
+
+        if ($this->exist_schema('comptaproc')) {
+            $this->exec_sql('set search_path to public,comptaproc,pg_catalog;');
+        }
+        $this->exec_sql('set DateStyle to ISO, MDY;');
+
+    }
+
+    /***
+     * \brief Save a "piece justificative" , the name must be pj
+     *
+     * \param $seq jr_grpt_id
+     * \return $oid of the lob file if success
+     *         null if a error occurs
+     *
+     */
+    function save_receipt($seq)
+    {
+        $oid = $this->upload('pj');
+        if ($oid == false) {
+            return false;
+        }
+        // Remove old document
+        $ret = $this->exec_sql("select jr_pj from jrn where jr_grpt_id=$seq");
+        if (pg_num_rows($ret) != 0) {
+            $r = pg_fetch_array($ret, 0);
+            $old_oid = $r['jr_pj'];
+            if (strlen($old_oid) != 0)
+                pg_lo_unlink($cn, $old_oid);
+        }
+        // Load new document
+        $this->exec_sql("update jrn set jr_pj=$1 , jr_pj_name=$2,
+                                jr_pj_type=$3  where jr_grpt_id=$4",
+            array($oid, $_FILES['pj']['name'], $_FILES['pj']['type'], $seq));
+        return $oid;
+    }
+
+    /**
+     * \brief Get version of a database, the content of the
+     *        table version
+     *
+     * \return version number
+     *
+     */
+
+    function get_version()
+    {
+        $Res = $this->get_value("select max(val) from version");
+        return $Res;
+    }
+
+
+}

include/class/dossier.class.php

@@ -34,7 +34,7 @@
   "desc"=>"dos_description");
  *
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 

include/class/exercice.class.php

@@ -22,7 +22,7 @@
 /*!\file
  * \brief about the accountant exercice
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 class Exercice
 {

include/class/fiche_attr.class.php

@@ -6,7 +6,7 @@
  *
  *
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 
 class Fiche_Attr

include/class/manager.class.php

@@ -19,7 +19,7 @@
 
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';

include/class/periode.class.php

@@ -27,7 +27,7 @@
  * \brief For the periode tables parm_periode and jrn_periode
  */
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE."/database/parm_periode_sql.class.php";
 
 class Periode

include/class/print_ledger.class.php

@@ -23,7 +23,7 @@
  *
  * @author danydb
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/print_ledger_detail.class.php';
 require_once NOALYSS_INCLUDE.'/class/print_ledger_simple.class.php';
 require_once NOALYSS_INCLUDE.'/class/print_ledger_simple_without_vat.class.php';

include/class/supplier.class.php

@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';

include/class/user.class.php

@@ -1065,7 +1065,7 @@ class User
 			$Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description from ac_dossier
              where   dos_name ~* $1 or dos_description ~* $1 order by dos_name", array($p_filter));
 		}
-		require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+		require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 		$max = Database::num_row($Res);
 		if ($max == 0)

include/database/fiche_def_ref_sql.class.php

@@ -24,7 +24,7 @@
  * category of card
  */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 /**
  * @class

include/database/jrn_def_sql.class.php

@@ -28,7 +28,7 @@
 
   @endcode
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 
 /**

include/database/jrn_periode_sql.class.php

@@ -19,7 +19,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 
 /**

include/database/menu_ref_sql.class.php

@@ -25,7 +25,7 @@
  *
  *
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 

include/database/parm_periode_sql.class.php

@@ -19,7 +19,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 
 /**

include/database/poste_analytique_sql.class.php

@@ -28,7 +28,7 @@
  * 
  * @class
  * @brief abstract of the table public.poste_analytique */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 

include/database/profile_menu_sql.class.php

@@ -28,7 +28,7 @@
 
   @endcode
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 

include/database/profile_sql.class.php

@@ -28,7 +28,7 @@
 
   @endcode
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 

include/database/tag_sql.class.php

@@ -1,5 +1,5 @@
 <?php
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 /*

include/database/tva_rate_sql.class.php

@@ -19,7 +19,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 /**
  * class_tva_rate_sql.php

include/database/user_filter_sql.class.php

@@ -20,7 +20,7 @@
  * author : Dec 2017 , Dany De Bontridder (danydb@noalyss.eu)
  */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 /**
  * class_user_filter_sql.php

include/database/v_tva_rate_sql.class.php

@@ -19,7 +19,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 
 /**
  * class_tva_rate_sql.php

include/export/export_balance_csv.php

@@ -25,7 +25,7 @@ require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
 
 include_once ("lib/ac_common.php");
 include_once("class/acc_balance.class.php");
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 $gDossier=dossier::id();
 

include/export/export_balance_pdf.php

@@ -31,7 +31,7 @@
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 if (!defined('ALLOWED')) die('Appel direct ne sont pas permis');
 include_once("lib/ac_common.php");
-require_once NOALYSS_INCLUDE . '/lib/database.class.php';
+require_once NOALYSS_INCLUDE . '/class/database.class.php';
 include_once("class/acc_balance.class.php");
 require_once NOALYSS_INCLUDE . '/header_print.php';
 require_once NOALYSS_INCLUDE . '/class/dossier.class.php';

include/export/export_bilan_oth.php

@@ -23,7 +23,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once("lib/ac_common.php");
 include_once("lib/impress.class.php");
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/header_print.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_bilan.class.php';
 

include/export/export_document_template.php

@@ -21,7 +21,7 @@
 /*! \file
  * \brief send the document template
  */
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 

include/export/export_fiche_balance_csv.php

@@ -28,7 +28,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 
 // Security we check if user does exist and his privilege
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';

include/export/export_fiche_balance_pdf.php

@@ -26,7 +26,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 // Security we check if user does exist and his privilege
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';
 require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

include/export/export_fiche_csv.php

@@ -23,7 +23,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once NOALYSS_INCLUDE."/lib/ac_common.php";
 include_once NOALYSS_INCLUDE.'/class/fiche.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
 

include/export/export_fiche_detail_csv.php

@@ -22,7 +22,7 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once("lib/ac_common.php");
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';

include/export/export_fiche_detail_pdf.php

@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once("class/acc_account_ledger.class.php");
 include_once("lib/ac_common.php");
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 include_once("lib/impress.class.php");
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once  NOALYSS_INCLUDE.'/header_print.php';

include/export/export_fiche_pdf.php

@@ -27,7 +27,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 // Security we check if user does exist and his privilege
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';
 require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

include/export/export_form_csv.php

@@ -22,7 +22,7 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once  NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_report.class.php';
 require_once NOALYSS_INCLUDE.'/lib/impress.class.php';

include/export/export_form_pdf.php

@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once("class/acc_report.class.php");
 include_once("lib/ac_common.php");
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 include_once("lib/impress.class.php");
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once  NOALYSS_INCLUDE.'/header_print.php';

include/export/export_gl_csv.php

@@ -41,7 +41,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
 include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 include_once NOALYSS_INCLUDE.'/lib/impress.class.php';
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

include/export/export_gl_pdf.php

@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 include_once('class/acc_account_ledger.class.php');
 include_once('lib/ac_common.php');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 include_once('lib/impress.class.php');
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

include/export/export_ledger_csv.php

@@ -36,7 +36,7 @@ require_once NOALYSS_INCLUDE.'/class/print_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 $gDossier=dossier::id();
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
 

include/export/export_ledger_pdf.php

@@ -31,7 +31,7 @@ $gDossier = dossier::id();
 require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/impress.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';

include/export/export_poste_detail_csv.php

@@ -22,7 +22,7 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_operation.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';

include/export/export_poste_detail_pdf.php

@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/impress.class.php';
 require_once NOALYSS_INCLUDE.'/header_print.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';

include/export/export_rec_csv.php

@@ -11,7 +11,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 
 require_once NOALYSS_INCLUDE.'/class/acc_reconciliation.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';

include/export/export_receipt.php

@@ -25,7 +25,7 @@ if ( ! defined ('ALLOWED')) die (_('Non autorisé'));
 
 include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once  NOALYSS_INCLUDE.'/class/dossier.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $http=new HttpInput();
 

include/export/export_reportinit_csv.php

@@ -25,7 +25,7 @@
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once   NOALYSS_INCLUDE.'/constant.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/lib/user_common.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_report.class.php';

include/export/export_security_pdf.php

@@ -25,7 +25,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 $gDossier=dossier::id();
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $http=new HttpInput();

include/ext/dummy/dummy.php

@@ -1,7 +1,7 @@
 <?php
 require_once ('lib/icard.class.php');
 require_once('lib/ifile.class.php');
-require_once('lib/database.class.php');
+require_once('class/database.class.php');
 require_once('lib/iselect.class.php');
 require_once('class/dossier.class.php');
 require_once('class/fiche.class.php');

include/extension_choice.inc.php

@@ -3,7 +3,7 @@
 //see licence.txt
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/constant.php';

include/extension_get.inc.php

@@ -3,7 +3,7 @@
 //see licence.txt
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/constant.php';

include/fiche.inc.php

@@ -22,7 +22,7 @@
  * \brief printing of category of card  : balance, historic
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
 

include/header_print.php

@@ -24,7 +24,7 @@
  *
  */
 
-require_once  NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once  NOALYSS_INCLUDE.'/class/database.class.php';
 require_once  NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 

include/impress_bilan.inc.php

@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/exercice.class.php';
 //-----------------------------------------------------
 // Show the jrn and date
 //-----------------------------------------------------
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 global $g_user;
 //-----------------------------------------------------
 // Form

include/impress_gl_comptes.inc.php

@@ -33,7 +33,7 @@ require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php';
 //-----------------------------------------------------
 // Show the jrn and date
 //-----------------------------------------------------
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 global $g_user,$http;
 //-----------------------------------------------------
 // Form

include/impress_jrn.inc.php

@@ -28,7 +28,7 @@ require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once NOALYSS_INCLUDE.'/class/exercice.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_history.class.php';
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 $gDossier = dossier::id();
 global $g_user,$http;
 

include/impress_poste.inc.php

@@ -33,7 +33,7 @@ require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php';
 //-----------------------------------------------------
 // Show the jrn and date
 //-----------------------------------------------------
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
 global $g_user;
 

include/impress_rapport.inc.php

@@ -186,7 +186,7 @@ if ( isset( $_GET['bt_html'] ) )
 //-----------------------------------------------------
 // Show the jrn and date
 //-----------------------------------------------------
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 $ret=$cn->make_array("select fr_id,fr_label
                      from formdef
                      order by fr_label");

include/lib/ac_common.php

@@ -25,7 +25,7 @@
  * @brief common utilities for a lot of procedure, classe
  */
 
-require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';