diff --git a/html/admin/setup.php b/html/admin/setup.php index bfd9ca116..d2d9d122b 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -213,7 +213,7 @@ if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.D // magic_quotes_sybase = Off // include_path require_once NOALYSS_INCLUDE.'/config_file.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; if ( defined ("MULTI") && MULTI==1) { create_htaccess();} @@ -386,8 +386,8 @@ if ( $Res==0) { ?> Check(); diff --git a/html/ajax.php b/html/ajax.php index cab34f086..9fa9e8146 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -13,12 +13,12 @@ */ if ( ! defined ('ALLOWED') ) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; if ( !isset ($_REQUEST['gDossier'])) exit(); -require_once NOALYSS_INCLUDE.'/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; mb_internal_encoding("UTF-8"); global $g_user,$cn,$g_parameter; diff --git a/html/ajax_card.php b/html/ajax_card.php index c33f2a945..dab6056d4 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -56,13 +56,13 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; mb_internal_encoding("UTF-8"); @@ -356,7 +356,7 @@ case 'sc': * *----------------------------------------------------------------------*/ case 'fs': - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $r=HtmlInput::title_box(_("Détail fiche"), 'search_card'); $r.='
'; $q=new IText('query'); @@ -434,14 +434,14 @@ case 'fs': $html=$r; break; case 'action_add_concerned_card': - require_once NOALYSS_INCLUDE.'/ajax_add_concerned_card.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_add_concerned_card.php'; return; break; case 'action_save_concerned': - require 'ajax_action_save_concerned.php'; + require 'ajax/ajax_action_save_concerned.php'; return; case 'action_remove_concerned': - require 'ajax_action_remove_concerned.php'; + require 'ajax/ajax_action_remove_concerned.php'; return; case 'ac': if ( $g_user->check_action(FICCAT)==1 ) diff --git a/html/ajax_history.php b/html/ajax_history.php index 0e7792090..0a84cdf00 100644 --- a/html/ajax_history.php +++ b/html/ajax_history.php @@ -26,13 +26,13 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; $div=$_REQUEST['div']; mb_internal_encoding("UTF-8"); diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 842b6763d..aaa5f3103 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -31,16 +31,16 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; /** * Check if we receive the needed data (jr_id...) */ diff --git a/html/ajax_misc.php b/html/ajax_misc.php index f30f47019..69c578ce1 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -37,12 +37,12 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; mb_internal_encoding("UTF-8"); $var = array('gDossier', 'op'); @@ -102,7 +102,7 @@ if ( LOGINPUT) switch ($op) { case 'pcmn_update': - require 'ajax_pcmn_update.php'; + require 'ajax/ajax_pcmn_update.php'; return; case "remove_anc": if ($g_user->check_module('ANCODS') == 0) @@ -122,7 +122,7 @@ switch ($op) //-------------------------------------------------- // get the last date of a ledger case 'lastdate': - require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); $html = $ledger->get_last_date(); $html = escape_xml($html); @@ -137,7 +137,7 @@ EOF; break; case 'bkname': - require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); $html = $ledger->get_bank_name(); $html = escape_xml($html); @@ -152,7 +152,7 @@ EOF; break; // display new calendar case 'cal': - require_once NOALYSS_INCLUDE.'/class_calendar.php'; + require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; /* others report */ $cal = new Calendar(); $cal->set_periode($per); @@ -170,7 +170,7 @@ EOF; break; /* rem a cat of document */ case 'rem_cat_doc': - require_once NOALYSS_INCLUDE.'/class_document_type.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; // if user can not return error message $message=""; if ($g_user->check_action(PARCATDOC) == 0) @@ -309,7 +309,7 @@ EOF; * display the lettering */ case 'dl': - require_once NOALYSS_INCLUDE.'/class_lettering.php'; + require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; $exercice = $g_user->get_exercice(); if ($g_user->check_module("LETCARD") == 0 && $g_user->check_module("LETACC") == 0) exit(); @@ -516,43 +516,43 @@ EOF; EOF; break; case 'mod_doc': - require_once NOALYSS_INCLUDE.'/ajax_mod_document.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_document.php'; break; case 'input_per': - require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_periode.php'; break; case 'save_per': - require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_periode.php'; break; case 'mod_predf': - require_once NOALYSS_INCLUDE.'/ajax_mod_predf_op.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_predf_op.php'; break; case 'save_predf': - require_once NOALYSS_INCLUDE.'/ajax_save_predf_op.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_save_predf_op.php'; break; case 'search_op': require_once NOALYSS_INCLUDE.'/search.inc.php'; break; case 'search_action': - require_once NOALYSS_INCLUDE.'/ajax_search_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_action.php'; break; case 'display_profile': - require_once NOALYSS_INCLUDE.'/ajax_get_profile.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_profile.php'; break; case 'det_menu': - require_once NOALYSS_INCLUDE.'/ajax_get_menu_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_menu_detail.php'; break; case 'add_menu': - require_once NOALYSS_INCLUDE.'/ajax_add_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_add_menu.php'; break; case 'display_submenu': - require_once NOALYSS_INCLUDE.'/ajax_display_submenu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_display_submenu.php'; break; case 'remove_submenu': - require_once NOALYSS_INCLUDE.'/ajax_remove_submenu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_remove_submenu.php'; break; case 'cardsearch': - require_once NOALYSS_INCLUDE.'/ajax_boxcard_search.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_boxcard_search.php'; break; case 'add_plugin': $me_code = new IText('me_code'); @@ -561,7 +561,7 @@ EOF; $me_description = new IText("me_description"); $me_parameter = new IText("me_parameter"); $new = true; - require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_plugin_detail.php'; break; case 'mod_plugin': $m = $cn->get_array("select me_code,me_file,me_menu,me_description,me_parameter @@ -578,71 +578,71 @@ EOF; $me_description = new IText("me_description", $m[0] ['me_description']); $me_parameter = new IText("me_parameter", $m[0] ['me_parameter']); $new = false; - require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_plugin_detail.php'; break; case 'saldo': - require_once NOALYSS_INCLUDE.'/ajax_bank_saldo.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_bank_saldo.php'; break; case 'up_predef': - require_once NOALYSS_INCLUDE.'/ajax_update_predef.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_update_predef.php'; break; case 'upd_receipt': - require_once NOALYSS_INCLUDE.'/ajax_get_receipt.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_receipt.php'; break; case 'up_pay_method': - require_once NOALYSS_INCLUDE.'/ajax_update_payment.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_update_payment.php'; break; case 'openancsearch': case 'resultancsearch': - require_once NOALYSS_INCLUDE.'/ajax_anc_search.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_search.php'; break; case 'autoanc': - require_once NOALYSS_INCLUDE.'/ajax_auto_anc_card.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_auto_anc_card.php'; break; case 'create_menu'; - require_once NOALYSS_INCLUDE.'/ajax_create_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_create_menu.php'; break; case 'modify_menu'; - require_once NOALYSS_INCLUDE.'/ajax_mod_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_menu.php'; break; case 'mod_stock_repo': - require_once NOALYSS_INCLUDE.'/ajax_mod_stock_repo.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_stock_repo.php'; break; case 'view_mod_stock': - require_once NOALYSS_INCLUDE.'/ajax_view_mod_stock.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_view_mod_stock.php'; break; case 'fddetail': - require_once NOALYSS_INCLUDE.'/ajax_fiche_def_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_fiche_def_detail.php'; break; case 'vw_action': - require_once NOALYSS_INCLUDE.'/ajax_view_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_view_action.php'; break; case 'minrow': - require_once NOALYSS_INCLUDE.'/ajax_min_row.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_min_row.php'; break; case 'navigator': - require_once NOALYSS_INCLUDE.'/ajax_navigator.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_navigator.php'; break; case 'preference': - require_once NOALYSS_INCLUDE.'/ajax_preference.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_preference.php'; break; case 'bookmark': - require_once NOALYSS_INCLUDE.'/ajax_bookmark.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_bookmark.php'; break; case 'tag_detail': - require_once NOALYSS_INCLUDE.'/ajax_tag_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_detail.php'; break; case 'tag_save': - require_once NOALYSS_INCLUDE.'/ajax_tag_save.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_save.php'; break; case 'tag_list': - require_once NOALYSS_INCLUDE.'/ajax_tag_list.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_list.php'; break; case 'tag_add': - require_once NOALYSS_INCLUDE.'/ajax_tag_add_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_add_action.php'; break; case 'tag_remove': - require_once NOALYSS_INCLUDE.'/ajax_tag_remove_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_remove_action.php'; break; case 'tag_choose': require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; @@ -651,19 +651,19 @@ EOF; require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; break; case 'search_display_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_display_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_display_tag.php'; break; case 'search_add_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_add_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_add_tag.php'; break; case 'search_clear_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_clear_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_clear_tag.php'; break; case 'calendar_zoom': - require_once NOALYSS_INCLUDE.'/ajax_calendar_zoom.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_calendar_zoom.php'; break; case 'ledger_show': - require_once NOALYSS_INCLUDE.'/ajax_ledger_show.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_ledger_show.php'; case 'ledger_description': $ajrn=$cn->get_array('select jrn_def_name,jrn_def_description from jrn_def where jrn_def_id=$1',array($l)); if ( count($ajrn)==1) @@ -682,67 +682,67 @@ EOF; /* * Show the available distribution keys for analytic */ - require_once NOALYSS_INCLUDE.'/ajax_anc_key_choice.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_key_choice.php'; break; case 'anc_key_compute': /* * Show the activities computed with the selected distribution key */ - require_once NOALYSS_INCLUDE.'/ajax_anc_key_compute.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_key_compute.php'; break; case 'account_update': /** * update an accounting (from CFGPCMN) */ - require_once NOALYSS_INCLUDE.'/ajax_account_update.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_account_update.php'; break; // From admin, revoke the access to a folder from an // user case 'folder_remove': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display a list of folder to which the user has // no access case 'folder_display': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, grant the access to a folder to an // user case 'folder_add': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display info and propose to drop the folder case 'folder_drop': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display the information of a folder you can // modify case 'folder_modify': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display info and propose to drop the template case 'modele_drop': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display the information of a template you can // modify case 'modele_modify': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From dashboard, display detail about last operation case 'action_show': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; // From dashboard, display form for a new event case 'action_add': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; // Save a event given in the short form case 'action_save': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; default: var_dump($_GET); diff --git a/html/ajax_poste.php b/html/ajax_poste.php index 13f0e1d91..ea6f1b2ba 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -35,11 +35,11 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; mb_internal_encoding("UTF-8"); extract($_REQUEST); @@ -60,7 +60,7 @@ set_language(); if ( $cont != 0 ) exit(); $cn=new Database(dossier::id()); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/ajax_todo_list.php b/html/ajax_todo_list.php index e71f29d9b..2cc50273d 100644 --- a/html/ajax_todo_list.php +++ b/html/ajax_todo_list.php @@ -35,10 +35,10 @@ */ define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_todo_list.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_todo_list.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; mb_internal_encoding("UTF-8"); $cn= Dossier::connect(); diff --git a/html/backup.php b/html/backup.php index 127a5a0ad..6dc1e47a2 100644 --- a/html/backup.php +++ b/html/backup.php @@ -20,9 +20,9 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; require_once("constant.php"); -require_once('class_database.php'); -require_once ("class_user.php"); -require_once ('ac_common.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); diff --git a/html/compute.php b/html/compute.php index 8e5d441fa..a98407fb0 100644 --- a/html/compute.php +++ b/html/compute.php @@ -31,11 +31,11 @@ * Must return at least tva, htva and tvac */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_tva.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_tva.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; // Check if the needed field does exist extract ($_GET); diff --git a/html/direct.php b/html/direct.php index 12f0e80ea..36fed4b12 100644 --- a/html/direct.php +++ b/html/direct.php @@ -19,8 +19,8 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $cn=new Database($_GET['gDossier']); global $g_user; diff --git a/html/do.php b/html/do.php index 6354d6062..b30581996 100644 --- a/html/do.php +++ b/html/do.php @@ -24,13 +24,13 @@ define('ALLOWED',1); * \brief Main file */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/constant.security.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; mb_internal_encoding("UTF-8"); // if gDossier is not set redirect to form to choose a folder diff --git a/html/export.php b/html/export.php index 14038c3fd..1124fc319 100644 --- a/html/export.php +++ b/html/export.php @@ -27,8 +27,8 @@ define ('ALLOWED',1); require_once '../include/constant.php'; global $g_user,$cn,$g_parameter; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $gDossier=dossier::id(); $cn=new Database($gDossier); mb_internal_encoding("UTF-8"); @@ -52,5 +52,5 @@ if ($action == null ) if ( $prfile == "") { die (_('Export impossible')); } - require_once $prfile; + require_once NOALYSS_INCLUDE."/export/$prfile"; ?> \ No newline at end of file diff --git a/html/extension.raw.php b/html/extension.raw.php index 7000f1414..5ff457679 100644 --- a/html/extension.raw.php +++ b/html/extension.raw.php @@ -24,14 +24,14 @@ * the security. Load several javascript files */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user,$cn,$g_parameter; diff --git a/html/fid.php b/html/fid.php index 7284bb280..3e02cdfc2 100644 --- a/html/fid.php +++ b/html/fid.php @@ -33,13 +33,13 @@ *\note if the j is -1 then all the card are shown */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once('class_user.php'); +require_once('class/class_user.php'); $cn=new Database(dossier::id()); global $g_user; diff --git a/html/fid_card.php b/html/fid_card.php index 8af3a6498..d9842fc27 100644 --- a/html/fid_card.php +++ b/html/fid_card.php @@ -26,8 +26,8 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; /*!\brief * Received parameters are * - j for the ledger @@ -48,7 +48,7 @@ $cn=new Database(dossier::id()); $d=$_REQUEST['e']; $filter_card=''; -require_once('class_user.php'); +require_once('class/class_user.php'); global $g_user; $g_user=new User($cn); $g_user->check(); diff --git a/html/index.php b/html/index.php index d6512919c..5eb72b2ab 100644 --- a/html/index.php +++ b/html/index.php @@ -45,7 +45,7 @@ *
  • Dans le répertoire include: Les noms de fichier ajax* correspondent aux fichiers appelé par une fonction javascript en ajax, * normalement le nom de fichier est basé sur le nom de la fonction javascript * exemple pour la fonction javascript anc_key_choice le fichier correspondant est - * ajax_anc_key_choice.php + * ajax/ajax_anc_key_choice.php *
  • Dans le répertoire include/template: les fichiers de * présentation HTML
    • *
  • Utiliser sql/upgrade.sql comme fichier temporaire pour modifier la base de données, en général @@ -96,7 +96,7 @@ * class_*.php if it is related to a class.
    • *
  • In the folder include, files starting with ajax are executed by ajax call, usually, the file name is * based on the javascript function, example for the javascript function anc_key_choice the corresponding file is - * ajax_anc_key_choice.php + * ajax/ajax_anc_key_choice.php * *
  • In the folder include/template: files for the HTML presentation *
    • @@ -208,7 +208,7 @@ background-repeat: repeat-x repeat-y; $my_domain=""; require_once '../include/constant.php'; require_once '../include/config.inc.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; if ( strlen(domaine) > 0 ) { diff --git a/html/login.php b/html/login.php index 5b8725fcf..7f0815423 100644 --- a/html/login.php +++ b/html/login.php @@ -19,13 +19,13 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /*! \file * \brief Login page */ -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; // Verif if User and Pass match DB // if no, then redirect to the login page $rep=new Database(); @@ -53,7 +53,7 @@ if ( isset ($_POST["p_user"] ) ) echo ""; exit(); } - include_once NOALYSS_INCLUDE."/class_user.php"; + include_once NOALYSS_INCLUDE."/class/class_user.php"; $User=new User($rep); $User->Check(false,'LOGIN'); if ($g_captcha == true) @@ -92,7 +92,7 @@ else } - include_once ("class_user.php"); + include_once ("class/class_user.php"); $User=new User($rep); $User->Check(); diff --git a/html/logout.php b/html/logout.php index de566e04e..64db90d53 100644 --- a/html/logout.php +++ b/html/logout.php @@ -21,8 +21,8 @@ * \brief Logout */ require_once '../include/constant.php'; -require_once ("ac_common.php"); -require_once('class_database.php'); +require_once ("lib/ac_common.php"); +require_once('lib/class_database.php'); html_page_start("classic"); diff --git a/html/not_implemented.php b/html/not_implemented.php index 9b7c1d1be..0c2656c46 100644 --- a/html/not_implemented.php +++ b/html/not_implemented.php @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -include_once("ac_common.php"); +include_once("lib/ac_common.php"); html_page_start(); echo '

    Not Implemented

    '; html_page_stop(); diff --git a/html/popup.php b/html/popup.php index 727efb778..d756cd5b1 100644 --- a/html/popup.php +++ b/html/popup.php @@ -18,13 +18,13 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; html_page_start($_SESSION['g_theme']); diff --git a/html/recherche.php b/html/recherche.php index cd59fa2e4..30f84903c 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -21,9 +21,9 @@ * \brief Search module */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; html_page_start($_SESSION['g_theme']); @@ -32,11 +32,11 @@ load_all_script(); $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; /* Admin. Dossier */ $cn=new Database($gDossier); -include_once NOALYSS_INCLUDE.'/class_user.php'; +include_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); diff --git a/html/show_document.php b/html/show_document.php index 67ac28bb2..728333d69 100644 --- a/html/show_document.php +++ b/html/show_document.php @@ -23,15 +23,15 @@ * \brief retrieve a document */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier = dossier::id(); $cn = new Database($gDossier); $action = (isset($_REQUEST['a'])) ? $_REQUEST['a'] : 'sh'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user = new User($cn); $g_user->Check(); diff --git a/html/show_document_modele.php b/html/show_document_modele.php index c641cb663..0c993d3f9 100644 --- a/html/show_document_modele.php +++ b/html/show_document_modele.php @@ -22,15 +22,15 @@ * \brief send the document template */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); $cn=new Database($gDossier); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/show_pj.php b/html/show_pj.php index 7563e824d..7811e3fc6 100644 --- a/html/show_pj.php +++ b/html/show_pj.php @@ -22,8 +22,8 @@ * \brief show an attach of an operation */ require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); if ( !isset ($_GET['jrn'] ) || @@ -32,7 +32,7 @@ if ( !isset ($_GET['jrn'] ) || echo_error("Missing parameters"); } -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; set_language(); $jr_grpt_id=$_GET['jr_grpt_id']; @@ -40,7 +40,7 @@ $jr_grpt_id=$_GET['jr_grpt_id']; $cn=new Database($gDossier); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/test.php b/html/test.php index 2dc2fb563..e0f99eb42 100644 --- a/html/test.php +++ b/html/test.php @@ -30,12 +30,12 @@ include_once("../include/constant.php"); -include_once("ac_common.php"); -require_once('class_database.php'); -require_once ('class_dossier.php'); -require_once('class_html_input.php'); -require_once ('function_javascript.php'); -require_once 'class_user.php'; +include_once("lib/ac_common.php"); +require_once('lib/class_database.php'); +require_once ('class/class_dossier.php'); +require_once('lib/class_html_input.php'); +require_once ('lib/function_javascript.php'); +require_once 'class/class_user.php'; load_all_script(); $gDossier=HtmlInput::default_value_get('gDossier', -1); if ($gDossier==-1) diff --git a/html/user_login.php b/html/user_login.php index af9808fda..162f8cfcf 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -22,14 +22,14 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; @html_page_start($_SESSION['g_theme']); $rep=new Database(); -include_once NOALYSS_INCLUDE.'/class_user.php'; +include_once NOALYSS_INCLUDE.'/class/class_user.php'; $User=new User($rep); $User->Check(); diff --git a/include/action.inc.php b/include/action.inc.php index ff2ea68c3..d0d00f5f4 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -28,11 +28,11 @@ $retour=HtmlInput::button_anchor(_('Retour liste'), //----------------------------------------------------- // Follow_Up //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /*!\brief Show the list of action, this code should be common * to several webpage. But for the moment we keep like that * because it is used only by this file. diff --git a/include/adm.inc.php b/include/adm.inc.php index 6e32b3bd7..330825330 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -21,13 +21,13 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_customer.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_admin.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/class/class_admin.php'; global $g_user; diff --git a/include/ajax_account_update.php b/include/ajax/ajax_account_update.php similarity index 100% rename from include/ajax_account_update.php rename to include/ajax/ajax_account_update.php diff --git a/include/ajax_action_remove_concerned.php b/include/ajax/ajax_action_remove_concerned.php similarity index 97% rename from include/ajax_action_remove_concerned.php rename to include/ajax/ajax_action_remove_concerned.php index e6da62534..7a0b47f08 100644 --- a/include/ajax_action_remove_concerned.php +++ b/include/ajax/ajax_action_remove_concerned.php @@ -23,7 +23,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $ag_id=HtmlInput::default_value_get("ag_id", "0"); $f_id=HtmlInput::default_value_get("f_id", "0"); if ( $ag_id == 0 || $f_id == 0 ) throw new Exception ("Invalid values", 0); -require_once 'class_follow_up.php'; +require_once 'class/class_follow_up.php'; $follow=new Follow_Up($cn,$ag_id); ob_start(); diff --git a/include/ajax_action_save_concerned.php b/include/ajax/ajax_action_save_concerned.php similarity index 97% rename from include/ajax_action_save_concerned.php rename to include/ajax/ajax_action_save_concerned.php index b8b780e7d..e1600a96f 100644 --- a/include/ajax_action_save_concerned.php +++ b/include/ajax/ajax_action_save_concerned.php @@ -24,7 +24,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); /** * Insert into follow-up the card (f_id) for the action_gestion (ag_id) */ -require_once 'class_follow_up.php'; +require_once 'class/class_follow_up.php'; $follow=new Follow_Up($cn,$ag_id); $follow->insert_linked_card($f_id); /** diff --git a/include/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php similarity index 98% rename from include/ajax_add_concerned_card.php rename to include/ajax/ajax_add_concerned_card.php index da09c7122..7f6e22a03 100644 --- a/include/ajax_add_concerned_card.php +++ b/include/ajax/ajax_add_concerned_card.php @@ -28,7 +28,7 @@ $ag_id=HtmlInput::default_value_get("ag_id", "0"); if ($ag_id == 0 ) throw new Exception('ag_id is null'); -require_once('class_acc_ledger.php'); +require_once('class/class_acc_ledger.php'); $r=HtmlInput::title_box(_("Détail fiche"), 'search_card'); $r.=''; diff --git a/include/ajax_add_menu.php b/include/ajax/ajax_add_menu.php similarity index 100% rename from include/ajax_add_menu.php rename to include/ajax/ajax_add_menu.php diff --git a/include/ajax_admin.php b/include/ajax/ajax_admin.php similarity index 100% rename from include/ajax_admin.php rename to include/ajax/ajax_admin.php diff --git a/include/ajax_anc_key_choice.php b/include/ajax/ajax_anc_key_choice.php similarity index 97% rename from include/ajax_anc_key_choice.php rename to include/ajax/ajax_anc_key_choice.php index d2d38ee29..bf6cde79c 100644 --- a/include/ajax_anc_key_choice.php +++ b/include/ajax/ajax_anc_key_choice.php @@ -32,7 +32,7 @@ $ledger=HtmlInput::default_value_get('led',0); if ($table_id == "" || isNumber($amount) == 0 || isNumber($ledger) == 0) die ('Invalid Parameter'); -require_once 'class_anc_key.php'; +require_once 'class/class_anc_key.php'; ob_start(); echo HtmlInput::title_box(_("Choix d'une clef"), 'div_anc_key_choice'); diff --git a/include/ajax_anc_key_compute.php b/include/ajax/ajax_anc_key_compute.php similarity index 96% rename from include/ajax_anc_key_compute.php rename to include/ajax/ajax_anc_key_compute.php index 499ad16f0..58c5e3701 100644 --- a/include/ajax_anc_key_compute.php +++ b/include/ajax/ajax_anc_key_compute.php @@ -28,7 +28,7 @@ // if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_key.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_key.php'; ob_start(); ///// $key=HtmlInput::default_value_get('key',0); diff --git a/include/ajax_anc_search.php b/include/ajax/ajax_anc_search.php similarity index 84% rename from include/ajax_anc_search.php rename to include/ajax/ajax_anc_search.php index 7c313c0b6..db7321e49 100644 --- a/include/ajax_anc_search.php +++ b/include/ajax/ajax_anc_search.php @@ -28,15 +28,15 @@ // parameter are gDossier , c1 : the control id to update, // c2 the control id which contains the pa_id if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; echo HtmlInput::title_box(_("Recherche activité"), $ctl); diff --git a/include/ajax_auto_anc_card.php b/include/ajax/ajax_auto_anc_card.php similarity index 89% rename from include/ajax_auto_anc_card.php rename to include/ajax/ajax_auto_anc_card.php index 4d17610b7..912bd1f8b 100644 --- a/include/ajax_auto_anc_card.php +++ b/include/ajax/ajax_auto_anc_card.php @@ -3,8 +3,8 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $cn=new Database($_GET['gDossier']); diff --git a/include/ajax_bank_saldo.php b/include/ajax/ajax_bank_saldo.php similarity index 92% rename from include/ajax_bank_saldo.php rename to include/ajax/ajax_bank_saldo.php index 56a3e8434..a74b5eb21 100644 --- a/include/ajax_bank_saldo.php +++ b/include/ajax/ajax_bank_saldo.php @@ -35,9 +35,9 @@ * - ctl the ctl where to get the quick_code */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; extract($_GET); /* check the parameters */ foreach ( array('j','ctl') as $a ) diff --git a/include/ajax_bookmark.php b/include/ajax/ajax_bookmark.php similarity index 100% rename from include/ajax_bookmark.php rename to include/ajax/ajax_bookmark.php diff --git a/include/ajax_boxcard_search.php b/include/ajax/ajax_boxcard_search.php similarity index 100% rename from include/ajax_boxcard_search.php rename to include/ajax/ajax_boxcard_search.php diff --git a/include/ajax_calendar_zoom.php b/include/ajax/ajax_calendar_zoom.php similarity index 96% rename from include/ajax_calendar_zoom.php rename to include/ajax/ajax_calendar_zoom.php index 545823586..f30e0f60c 100644 --- a/include/ajax_calendar_zoom.php +++ b/include/ajax/ajax_calendar_zoom.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_calendar.php'; +require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; ob_start(); if ( $notitle== 0 ) echo HtmlInput::title_box(_("Calendrier"), "calendar_zoom_div"); $cal=new Calendar(); diff --git a/include/ajax_create_menu.php b/include/ajax/ajax_create_menu.php similarity index 89% rename from include/ajax_create_menu.php rename to include/ajax/ajax_create_menu.php index 6f5726dec..856c1b396 100644 --- a/include/ajax_create_menu.php +++ b/include/ajax/ajax_create_menu.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; $msg=_("Création"); $m=new Menu_Ref($cn); echo ''; diff --git a/include/ajax_display_submenu.php b/include/ajax/ajax_display_submenu.php similarity index 98% rename from include/ajax_display_submenu.php rename to include/ajax/ajax_display_submenu.php index d8271f1fd..3d5908c94 100644 --- a/include/ajax_display_submenu.php +++ b/include/ajax/ajax_display_submenu.php @@ -45,7 +45,7 @@ if ($module == "" return; } -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; $p_level++; $profile=new Profile_Menu($cn); $profile->p_id=$p_id; diff --git a/include/ajax_fiche_def_detail.php b/include/ajax/ajax_fiche_def_detail.php similarity index 91% rename from include/ajax_fiche_def_detail.php rename to include/ajax/ajax_fiche_def_detail.php index effdb4993..fbd5fc0ea 100644 --- a/include/ajax_fiche_def_detail.php +++ b/include/ajax/ajax_fiche_def_detail.php @@ -26,8 +26,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; global $g_user; $g_user->can_request(FICCAT,0); diff --git a/include/ajax_gestion.php b/include/ajax/ajax_gestion.php similarity index 95% rename from include/ajax_gestion.php rename to include/ajax/ajax_gestion.php index d59c68105..a7f1e3a36 100644 --- a/include/ajax_gestion.php +++ b/include/ajax/ajax_gestion.php @@ -30,7 +30,7 @@ if ($op=='action_show') /** * display action */ - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $gestion=new Follow_Up($cn); $array=$gestion->get_last(25); $len_array=count($array); @@ -39,14 +39,14 @@ if ($op=='action_show') } if ($op=='action_add') { - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $gestion=new Follow_Up($cn); $gestion->display_short(); return; } if ($op=='action_save') { - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /** * save info from the get diff --git a/include/ajax_get_menu_detail.php b/include/ajax/ajax_get_menu_detail.php similarity index 100% rename from include/ajax_get_menu_detail.php rename to include/ajax/ajax_get_menu_detail.php diff --git a/include/ajax_get_profile.php b/include/ajax/ajax_get_profile.php similarity index 96% rename from include/ajax_get_profile.php rename to include/ajax/ajax_get_profile.php index 8dcab3b77..18f82cd0e 100644 --- a/include/ajax_get_profile.php +++ b/include/ajax/ajax_get_profile.php @@ -31,9 +31,9 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); // Security if ( $g_user->check_module('CFGPRO') == 0 ) die(); -require_once NOALYSS_INCLUDE.'/class_profile_sql.php'; -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; $p_id=HtmlInput::default_value_request('p_id', -1); $profile=new Profile_sql($cn,$p_id); $gDossier=Dossier::id(); diff --git a/include/ajax_get_receipt.php b/include/ajax/ajax_get_receipt.php similarity index 87% rename from include/ajax_get_receipt.php rename to include/ajax/ajax_get_receipt.php index 472c9fa14..1f6159b28 100644 --- a/include/ajax_get_receipt.php +++ b/include/ajax/ajax_get_receipt.php @@ -30,10 +30,10 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; // Check if the needed field does exist extract ($_GET); diff --git a/include/ajax_ledger_show.php b/include/ajax/ajax_ledger_show.php similarity index 84% rename from include/ajax_ledger_show.php rename to include/ajax/ajax_ledger_show.php index db9534c29..6afa939ae 100644 --- a/include/ajax_ledger_show.php +++ b/include/ajax/ajax_ledger_show.php @@ -14,8 +14,8 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; if ( ! isset ($r_jrn)) { $r_jrn=null;} $ctl='div_jrn'.$div; ob_start(); diff --git a/include/ajax_min_row.php b/include/ajax/ajax_min_row.php similarity index 92% rename from include/ajax_min_row.php rename to include/ajax/ajax_min_row.php index c454ccc8f..05302cdbb 100644 --- a/include/ajax_min_row.php +++ b/include/ajax/ajax_min_row.php @@ -26,8 +26,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; extract($_GET); /* check the parameters */ foreach ( array('j','ctl') as $a ) diff --git a/include/ajax_mod_document.php b/include/ajax/ajax_mod_document.php similarity index 88% rename from include/ajax_mod_document.php rename to include/ajax/ajax_mod_document.php index 157d25b10..eaf004e8c 100644 --- a/include/ajax_mod_document.php +++ b/include/ajax/ajax_mod_document.php @@ -23,9 +23,9 @@ * \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.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_document_modele.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; /* 1. Check security */ $cn=new Database(dossier::id()); diff --git a/include/ajax_mod_menu.php b/include/ajax/ajax_mod_menu.php similarity index 90% rename from include/ajax_mod_menu.php rename to include/ajax/ajax_mod_menu.php index 7d32b3fe2..b3136d45d 100644 --- a/include/ajax_mod_menu.php +++ b/include/ajax/ajax_mod_menu.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; $m=new Menu_Ref($cn,$me_code); $msg="Modification ".$m->me_code.' '.h($m->me_menu); echo ''; diff --git a/include/ajax_mod_periode.php b/include/ajax/ajax_mod_periode.php similarity index 98% rename from include/ajax_mod_periode.php rename to include/ajax/ajax_mod_periode.php index f28cd13c4..b2d9f15a0 100644 --- a/include/ajax_mod_periode.php +++ b/include/ajax/ajax_mod_periode.php @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; /**\file * \brief display or save a periode diff --git a/include/ajax_mod_predf_op.php b/include/ajax/ajax_mod_predf_op.php similarity index 97% rename from include/ajax_mod_predf_op.php rename to include/ajax/ajax_mod_predf_op.php index 1e5ea89c2..9c4745432 100644 --- a/include/ajax_mod_predf_op.php +++ b/include/ajax/ajax_mod_predf_op.php @@ -25,7 +25,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); ob_start(); -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; $op=new Pre_Operation($cn,$_GET['id']); $array=$op->load(); echo HtmlInput::anchor_close('mod_predf_op'); diff --git a/include/ajax_mod_stock_repo.php b/include/ajax/ajax_mod_stock_repo.php similarity index 97% rename from include/ajax_mod_stock_repo.php rename to include/ajax/ajax_mod_stock_repo.php index e808e7de4..12a9ed527 100644 --- a/include/ajax_mod_stock_repo.php +++ b/include/ajax/ajax_mod_stock_repo.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_sql.php'; $st=new Stock_Sql($_GET['r_id']); ?> diff --git a/include/ajax_navigator.php b/include/ajax/ajax_navigator.php similarity index 100% rename from include/ajax_navigator.php rename to include/ajax/ajax_navigator.php diff --git a/include/ajax_pcmn_update.php b/include/ajax/ajax_pcmn_update.php similarity index 100% rename from include/ajax_pcmn_update.php rename to include/ajax/ajax_pcmn_update.php diff --git a/include/ajax_plugin_detail.php b/include/ajax/ajax_plugin_detail.php similarity index 100% rename from include/ajax_plugin_detail.php rename to include/ajax/ajax_plugin_detail.php diff --git a/include/ajax_preference.php b/include/ajax/ajax_preference.php similarity index 95% rename from include/ajax_preference.php rename to include/ajax/ajax_preference.php index 0b4c8945b..42a723111 100644 --- a/include/ajax_preference.php +++ b/include/ajax/ajax_preference.php @@ -22,11 +22,11 @@ * it permits to change the user preferences */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; echo HtmlInput::title_box(_('Préférence'), 'preference_div'); echo '
    '; echo '

    '; diff --git a/include/ajax_remove_submenu.php b/include/ajax/ajax_remove_submenu.php similarity index 100% rename from include/ajax_remove_submenu.php rename to include/ajax/ajax_remove_submenu.php diff --git a/include/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php similarity index 100% rename from include/ajax_save_predf_op.php rename to include/ajax/ajax_save_predf_op.php diff --git a/include/ajax_search_action.php b/include/ajax/ajax_search_action.php similarity index 86% rename from include/ajax_search_action.php rename to include/ajax/ajax_search_action.php index aae5edff7..684da335f 100755 --- a/include/ajax_search_action.php +++ b/include/ajax/ajax_search_action.php @@ -21,9 +21,9 @@ * \brief Search module */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $_REQUEST['ac']='FOLLOW'; diff --git a/include/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php similarity index 96% rename from include/ajax_search_add_tag.php rename to include/ajax/ajax_search_add_tag.php index f40c9e177..a9c3e103e 100644 --- a/include/ajax_search_add_tag.php +++ b/include/ajax/ajax_search_add_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); if ($_GET['clear']==1) { /* Add a clear button */ diff --git a/include/ajax_search_clear_tag.php b/include/ajax/ajax_search_clear_tag.php similarity index 95% rename from include/ajax_search_clear_tag.php rename to include/ajax/ajax_search_clear_tag.php index fb8508ad9..697543e34 100644 --- a/include/ajax_search_clear_tag.php +++ b/include/ajax/ajax_search_clear_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); echo Tag::button_search($_GET['pref']); $response= ob_get_clean(); diff --git a/include/ajax_search_display_tag.php b/include/ajax/ajax_search_display_tag.php similarity index 95% rename from include/ajax_search_display_tag.php rename to include/ajax/ajax_search_display_tag.php index 90270becd..592e1d469 100644 --- a/include/ajax_search_display_tag.php +++ b/include/ajax/ajax_search_display_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select_search($_GET['pref']); diff --git a/include/ajax_tag_add_action.php b/include/ajax/ajax_tag_add_action.php similarity index 100% rename from include/ajax_tag_add_action.php rename to include/ajax/ajax_tag_add_action.php diff --git a/include/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php similarity index 91% rename from include/ajax_tag_detail.php rename to include/ajax/ajax_tag_detail.php index 1226260a5..cd451fd72 100644 --- a/include/ajax_tag_detail.php +++ b/include/ajax/ajax_tag_detail.php @@ -6,8 +6,8 @@ //see licence.txt if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->data->t_id=$_GET['tag']; diff --git a/include/ajax_tag_list.php b/include/ajax/ajax_tag_list.php similarity index 96% rename from include/ajax_tag_list.php rename to include/ajax/ajax_tag_list.php index f8dc50641..983e877de 100644 --- a/include/ajax_tag_list.php +++ b/include/ajax/ajax_tag_list.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select(); diff --git a/include/ajax_tag_remove_action.php b/include/ajax/ajax_tag_remove_action.php similarity index 100% rename from include/ajax_tag_remove_action.php rename to include/ajax/ajax_tag_remove_action.php diff --git a/include/ajax_tag_save.php b/include/ajax/ajax_tag_save.php similarity index 77% rename from include/ajax_tag_save.php rename to include/ajax/ajax_tag_save.php index 9194a1840..d2dc0705b 100644 --- a/include/ajax_tag_save.php +++ b/include/ajax/ajax_tag_save.php @@ -4,7 +4,7 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; $tag=new Tag($cn); $tag->save($_GET); diff --git a/include/ajax_tag_select_search.php b/include/ajax/ajax_tag_select_search.php similarity index 95% rename from include/ajax_tag_select_search.php rename to include/ajax/ajax_tag_select_search.php index d364ec0f5..1652c1d4e 100644 --- a/include/ajax_tag_select_search.php +++ b/include/ajax/ajax_tag_select_search.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select_search(); diff --git a/include/ajax_update_payment.php b/include/ajax/ajax_update_payment.php similarity index 94% rename from include/ajax_update_payment.php rename to include/ajax/ajax_update_payment.php index f12a61a0b..970a63930 100644 --- a/include/ajax_update_payment.php +++ b/include/ajax/ajax_update_payment.php @@ -26,7 +26,7 @@ * -l for the ledger */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $ledger=new Acc_Ledger($cn,$l); echo $ledger->input_paid(1); ?> diff --git a/include/ajax_update_predef.php b/include/ajax/ajax_update_predef.php similarity index 91% rename from include/ajax_update_predef.php rename to include/ajax/ajax_update_predef.php index 80eaf2049..6043f8f35 100644 --- a/include/ajax_update_predef.php +++ b/include/ajax/ajax_update_predef.php @@ -29,9 +29,9 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; // Check if the needed field does exist extract ($_GET); diff --git a/include/ajax_view_action.php b/include/ajax/ajax_view_action.php similarity index 95% rename from include/ajax_view_action.php rename to include/ajax/ajax_view_action.php index 38a1f794c..ea5e87d69 100644 --- a/include/ajax_view_action.php +++ b/include/ajax/ajax_view_action.php @@ -27,8 +27,8 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); ob_start(); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; -require_once NOALYSS_INCLUDE.'/class_default_menu.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_default_menu.php'; echo HtmlInput::title_box(_("Détail action"), $div); $act = new Follow_Up($cn); diff --git a/include/ajax_view_mod_stock.php b/include/ajax/ajax_view_mod_stock.php similarity index 97% rename from include/ajax_view_mod_stock.php rename to include/ajax/ajax_view_mod_stock.php index d6426c7d0..c079b9395 100644 --- a/include/ajax_view_mod_stock.php +++ b/include/ajax/ajax_view_mod_stock.php @@ -25,7 +25,7 @@ * @brief show detail of inv. * */ -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $st=new Stock_Goods($cn); diff --git a/include/anc_acc_balance.inc.php b/include/anc_acc_balance.inc.php index efa03f892..e58a90984 100644 --- a/include/anc_acc_balance.inc.php +++ b/include/anc_acc_balance.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_acc_list.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_list.php'; echo '

    '; $tab = new Anc_Acc_List($cn); $tab->get_request(); diff --git a/include/anc_acc_table.inc.php b/include/anc_acc_table.inc.php index 357c2ddc8..d1ce3a905 100644 --- a/include/anc_acc_table.inc.php +++ b/include/anc_acc_table.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_table.php'; $tab = new Anc_Table($cn); $tab->get_request(); echo ''; diff --git a/include/anc_balance_double.inc.php b/include/anc_balance_double.inc.php index b8baab3e4..fd450aadb 100644 --- a/include/anc_balance_double.inc.php +++ b/include/anc_balance_double.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; $bc = new Anc_Balance_Double($cn); $bc->get_request(); echo ''; diff --git a/include/anc_balance_simple.inc.php b/include/anc_balance_simple.inc.php index fdab93c2a..aa28ad81b 100644 --- a/include/anc_balance_simple.inc.php +++ b/include/anc_balance_simple.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; $bs = new Anc_Balance_Simple($cn); $bs->get_request(); echo ''; diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php index fc7c51a75..40bbe3b8a 100644 --- a/include/anc_great_ledger.inc.php +++ b/include/anc_great_ledger.inc.php @@ -5,7 +5,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); echo '
    '; -require_once NOALYSS_INCLUDE.'/class_anc_grandlivre.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_grandlivre.php'; $grandLivre=new Anc_Grandlivre($cn); diff --git a/include/anc_group.inc.php b/include/anc_group.inc.php index fdda9f312..97651f26e 100644 --- a/include/anc_group.inc.php +++ b/include/anc_group.inc.php @@ -24,9 +24,9 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; $r=new Anc_Group($cn); diff --git a/include/anc_group_balance.inc.php b/include/anc_group_balance.inc.php index 532c897b4..91ba047e5 100644 --- a/include/anc_group_balance.inc.php +++ b/include/anc_group_balance.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; $gr = new Anc_Group($cn); $gr->get_request(); diff --git a/include/anc_history.inc.php b/include/anc_history.inc.php index 7efb2a6e5..0bc5312c9 100644 --- a/include/anc_history.inc.php +++ b/include/anc_history.inc.php @@ -5,7 +5,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_listing.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_listing.php'; $list = new Anc_Listing($cn); $list->get_request(); diff --git a/include/anc_key.inc.php b/include/anc_key.inc.php index b9d5a2227..097c083c2 100644 --- a/include/anc_key.inc.php +++ b/include/anc_key.inc.php @@ -29,7 +29,7 @@ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); global $cn, $g_user; -require_once NOALYSS_INCLUDE.'/class_anc_key.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_key.php'; $op=HtmlInput::default_value_request("op", "list"); switch ($op) diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index 54d33398d..17600d7bb 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -26,12 +26,12 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_group_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group_operation.php'; global $g_user; diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php index 23e6798ae..a5477b26e 100644 --- a/include/anc_pa.inc.php +++ b/include/anc_pa.inc.php @@ -25,8 +25,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; $ret=""; $str_dossier=Dossier::get(); //--------------------------------------------------------------------------- diff --git a/include/balance.inc.php b/include/balance.inc.php index 04809874c..202bb8ef7 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -24,15 +24,15 @@ * some variable are already defined ($cn, $g_user ...) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once NOALYSS_INCLUDE.'/ac_common.php'; -include_once NOALYSS_INCLUDE.'/class_acc_balance.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +include_once NOALYSS_INCLUDE.'/class/class_acc_balance.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; global $g_user; $gDossier=dossier::id(); $exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); diff --git a/include/balance_age.inc.php b/include/balance_age.inc.php index ba5a4da91..ca4aa493b 100644 --- a/include/balance_age.inc.php +++ b/include/balance_age.inc.php @@ -65,7 +65,7 @@ $w_lettre->selected=HtmlInput::default_value_get('p_let','unlet'); ?> '; diff --git a/include/balance_card_ageing.inc.php b/include/balance_card_ageing.inc.php index 60fe728a3..25599cb9e 100644 --- a/include/balance_card_ageing.inc.php +++ b/include/balance_card_ageing.inc.php @@ -25,8 +25,8 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); * @brief * @param type $name Descriptionara */ -require_once NOALYSS_INCLUDE.'/class_exercice.php'; -require_once NOALYSS_INCLUDE.'/class_balance_age.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $let=( isset ($_GET['p_let']))?'let':'unlet'; $export_csv = '
    '; diff --git a/include/bank.inc.php b/include/bank.inc.php index 6d7ff1c13..d0b0a1580 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -21,10 +21,10 @@ * the supplier category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_bank.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_bank.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; global $g_user; $low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:'list'; diff --git a/include/calendar.inc.php b/include/calendar.inc.php index 74db9a814..4f665c155 100644 --- a/include/calendar.inc.php +++ b/include/calendar.inc.php @@ -8,7 +8,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_calendar.php'; +require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; $cal=new Calendar(); $cal->default_periode=(isset ($_GET['in']))?$_GET['in']:$g_user->get_periode(); diff --git a/include/card_attr.inc.php b/include/card_attr.inc.php index 151150faa..6c182c12c 100644 --- a/include/card_attr.inc.php +++ b/include/card_attr.inc.php @@ -23,7 +23,7 @@ * \brief Manage the attributs */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; diff --git a/include/cat_document.inc.php b/include/cat_document.inc.php index 43d2cf250..a0b458f59 100644 --- a/include/cat_document.inc.php +++ b/include/cat_document.inc.php @@ -26,7 +26,7 @@ // show list of document if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_document_type.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; if ( isset($_POST['add']) ) { diff --git a/include/category_card.inc.php b/include/category_card.inc.php index 845d3c6af..5e5ad00c1 100644 --- a/include/category_card.inc.php +++ b/include/category_card.inc.php @@ -26,7 +26,7 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_contact.php'; +require_once NOALYSS_INCLUDE.'/class/class_contact.php'; $str_dossier=Dossier::get(); /* $sub_action = sb = detail */ diff --git a/include/category_detail.inc.php b/include/category_detail.inc.php index 95e68b954..bd081226d 100644 --- a/include/category_detail.inc.php +++ b/include/category_detail.inc.php @@ -32,7 +32,7 @@ // Save modification //--------------------------------------------------------------------------- if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_customer.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; if ( isset ($_POST['mod'])) { diff --git a/include/category_followup.inc.php b/include/category_followup.inc.php index d4b0a7fdc..1e011c81a 100644 --- a/include/category_followup.inc.php +++ b/include/category_followup.inc.php @@ -27,7 +27,7 @@ * - $cn = database connection */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /** *\note problem with ShowActionList, this function is local diff --git a/include/category_operation.inc.php b/include/category_operation.inc.php index 1fb5b063a..34b8faceb 100644 --- a/include/category_operation.inc.php +++ b/include/category_operation.inc.php @@ -29,7 +29,7 @@ * - $ss_action */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $f=new Fiche($cn,$_REQUEST['f_id']); $qcode=$f->get_quick_code(); $_GET['qcode']=$qcode; diff --git a/include/cfgfiche.inc.php b/include/cfgfiche.inc.php index 17620fa13..cbca11e74 100644 --- a/include/cfgfiche.inc.php +++ b/include/cfgfiche.inc.php @@ -21,16 +21,16 @@ * \brief module to manage the card (removing, listing, creating, modify attribut) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/user_menu.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; $retour=HtmlInput::button_anchor("Retour à la liste", HtmlInput::get_to_string(array("gDossier","ac"))); $action=HtmlInput::default_value_post('action', ''); diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php index b0b1bea44..90f0d1f1e 100644 --- a/include/cfgledger.inc.php +++ b/include/cfgledger.inc.php @@ -27,12 +27,12 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; require_once NOALYSS_INCLUDE.'/user_menu.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $gDossier=dossier::id(); global $cn; diff --git a/include/cfgplugin.inc.php b/include/cfgplugin.inc.php index b440dd33b..afa0e9943 100644 --- a/include/cfgplugin.inc.php +++ b/include/cfgplugin.inc.php @@ -19,7 +19,7 @@ // Copyright (2014) Author Dany De Bontridder if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_extension.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; /** * @file diff --git a/include/cfgtags.inc.php b/include/cfgtags.inc.php index 2a4743e41..3f4c19271 100644 --- a/include/cfgtags.inc.php +++ b/include/cfgtags.inc.php @@ -24,8 +24,8 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); * @brief Manage the tags * */ -require_once NOALYSS_INCLUDE.'/class_tag.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; $tag=new Tag($cn); $uos=new Tool_Uos('tag'); diff --git a/include/class_acc_account.php b/include/class/class_acc_account.php similarity index 97% rename from include/class_acc_account.php rename to include/class/class_acc_account.php index 960dd26a9..1e69f3706 100644 --- a/include/class_acc_account.php +++ b/include/class/class_acc_account.php @@ -23,9 +23,9 @@ /*! * \brief Manage the account from the table tmp_pcmn */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Acc_Account { diff --git a/include/class_acc_account_ledger.php b/include/class/class_acc_account_ledger.php similarity index 99% rename from include/class_acc_account_ledger.php rename to include/class/class_acc_account_ledger.php index ebf8f2b17..0d5afa633 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class/class_acc_account_ledger.php @@ -23,9 +23,9 @@ /*! * \brief Manage the account from the table jrn, jrnx or tmp_pcmn */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Acc_Account_Ledger { diff --git a/include/class_acc_balance.php b/include/class/class_acc_balance.php similarity index 99% rename from include/class_acc_balance.php rename to include/class/class_acc_balance.php index 654bdd2df..119c9cf14 100644 --- a/include/class_acc_balance.php +++ b/include/class/class_acc_balance.php @@ -23,7 +23,7 @@ /*! * \brief Class for manipulating data to print the balance of account */ -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; class Acc_Balance { @@ -273,7 +273,7 @@ class Acc_Balance } static function test_me () { - require 'class_user.php'; + require 'class/class_user.php'; global $g_user; $cn=new Database(dossier::id()); $g_user=new User($cn); diff --git a/include/class_acc_bilan.php b/include/class/class_acc_bilan.php similarity index 98% rename from include/class_acc_bilan.php rename to include/class/class_acc_bilan.php index 18bff4ce7..049071ed0 100644 --- a/include/class_acc_bilan.php +++ b/include/class/class_acc_bilan.php @@ -23,12 +23,12 @@ * \brief this class handle the different bilan, from the table bilan * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; /*! * \brief this class handle the different bilan, from the table bilan, parse the form and replace diff --git a/include/class_acc_compute.php b/include/class/class_acc_compute.php similarity index 100% rename from include/class_acc_compute.php rename to include/class/class_acc_compute.php diff --git a/include/class_acc_ledger.php b/include/class/class_acc_ledger.php similarity index 98% rename from include/class_acc_ledger.php rename to include/class/class_acc_ledger.php index 5326cf7a4..45300e266 100644 --- a/include/class_acc_ledger.php +++ b/include/class/class_acc_ledger.php @@ -17,32 +17,32 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_advanced.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_gestion_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_gestion_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_inum.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_jrn_def_sql.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_advanced.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_inum.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/database/class_jrn_def_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; /** \file * @brief Class for jrn, class acc_ledger for manipulating the ledger */ diff --git a/include/class_acc_ledger_fin.php b/include/class/class_acc_ledger_fin.php similarity index 98% rename from include/class_acc_ledger_fin.php rename to include/class/class_acc_ledger_fin.php index 61e40c58a..3d441f960 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class/class_acc_ledger_fin.php @@ -24,17 +24,17 @@ * \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this * object permit to manage the financial ledger */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; class Acc_Ledger_Fin extends Acc_Ledger { diff --git a/include/class_acc_ledger_info.php b/include/class/class_acc_ledger_info.php similarity index 97% rename from include/class_acc_ledger_info.php rename to include/class/class_acc_ledger_info.php index 398ff9466..1d44e568b 100644 --- a/include/class_acc_ledger_info.php +++ b/include/class/class_acc_ledger_info.php @@ -18,9 +18,9 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /*!\file * \brief Manage additional info for Accountancy diff --git a/include/class_acc_ledger_purchase.php b/include/class/class_acc_ledger_purchase.php similarity index 98% rename from include/class_acc_ledger_purchase.php rename to include/class/class_acc_ledger_purchase.php index 203636653..7100611fc 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class/class_acc_ledger_purchase.php @@ -22,25 +22,25 @@ /*!\file * \brief class for the purchase, herits from acc_ledger */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_info.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_info.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; /*!\brief Handle the ledger of purchase, * diff --git a/include/class_acc_ledger_sold.php b/include/class/class_acc_ledger_sold.php similarity index 98% rename from include/class_acc_ledger_sold.php rename to include/class/class_acc_ledger_sold.php index 0e8d45e82..3aefc8d15 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class/class_acc_ledger_sold.php @@ -23,24 +23,24 @@ /* !\file * \brief class for the sold, herits from acc_ledger */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /* !\brief Handle the ledger of sold, * diff --git a/include/class_acc_operation.php b/include/class/class_acc_operation.php similarity index 99% rename from include/class_acc_operation.php rename to include/class/class_acc_operation.php index 1de6fc41d..f992d4ff3 100644 --- a/include/class_acc_operation.php +++ b/include/class/class_acc_operation.php @@ -23,8 +23,8 @@ * \brief this file match the tables jrn & jrnx the purpose is to * remove or save accountant writing to these table. */ -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /*! \brief this file match the tables jrn & jrnx the purpose is to * remove or save accountant writing to these table. diff --git a/include/class_acc_parm_code.php b/include/class/class_acc_parm_code.php similarity index 97% rename from include/class_acc_parm_code.php rename to include/class/class_acc_parm_code.php index 21a4459af..e178e0d0e 100644 --- a/include/class_acc_parm_code.php +++ b/include/class/class_acc_parm_code.php @@ -25,8 +25,8 @@ * \brief Manage the table parm_code which contains the custom parameter * for the module accountancy */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; class Acc_Parm_Code { diff --git a/include/class_acc_payment.php b/include/class/class_acc_payment.php similarity index 97% rename from include/class_acc_payment.php rename to include/class/class_acc_payment.php index 1cb9b6015..3bc5543f0 100644 --- a/include/class_acc_payment.php +++ b/include/class/class_acc_payment.php @@ -22,12 +22,12 @@ /*!\file * \brief Handle the table mod_payment */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; require_once NOALYSS_INCLUDE.'/constant.php'; /*!\brief Handle the table mod_payment *\note the private data member are accessed via diff --git a/include/class_acc_reconciliation.php b/include/class/class_acc_reconciliation.php similarity index 98% rename from include/class_acc_reconciliation.php rename to include/class/class_acc_reconciliation.php index 512718103..412bde15a 100644 --- a/include/class_acc_reconciliation.php +++ b/include/class/class_acc_reconciliation.php @@ -24,10 +24,10 @@ * must use it * */ -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; /*! \brief new class for managing the reconciliation it must be used * instead of the function InsertRapt, ... diff --git a/include/class_acc_report.php b/include/class/class_acc_report.php similarity index 98% rename from include/class_acc_report.php rename to include/class/class_acc_report.php index b992d014c..18c6538ea 100644 --- a/include/class_acc_report.php +++ b/include/class/class_acc_report.php @@ -21,10 +21,10 @@ * \brief Create, view, modify and parse report */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report_row.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report_row.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; /*! * \brief Class rapport Create, view, modify and parse report diff --git a/include/class_acc_report_row.php b/include/class/class_acc_report_row.php similarity index 100% rename from include/class_acc_report_row.php rename to include/class/class_acc_report_row.php diff --git a/include/class_acc_tva.php b/include/class/class_acc_tva.php similarity index 98% rename from include/class_acc_tva.php rename to include/class/class_acc_tva.php index 7ce28ea1e..61e00a37b 100644 --- a/include/class_acc_tva.php +++ b/include/class/class_acc_tva.php @@ -22,8 +22,8 @@ /*!\file * \brief this class is used for the table tva_rate */ -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; /*!\brief Acc_Tva is used for to map the table tva_rate * parameter are diff --git a/include/class_admin.php b/include/class/class_admin.php similarity index 84% rename from include/class_admin.php rename to include/class/class_admin.php index 0b0835fac..b0a5a3d21 100644 --- a/include/class_admin.php +++ b/include/class/class_admin.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Administration are a specific kind of card * concerned only by official (or not) administration diff --git a/include/class_anc_acc_link.php b/include/class/class_anc_acc_link.php similarity index 96% rename from include/class_anc_acc_link.php rename to include/class/class_anc_acc_link.php index fa802ff7d..4adbcc80f 100644 --- a/include/class_anc_acc_link.php +++ b/include/class/class_anc_acc_link.php @@ -22,7 +22,7 @@ /*!\file * \brief link between accountancy and analytic, like table but as a listing */ -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; class Anc_Acc_Link extends Anc_Print { diff --git a/include/class_anc_acc_list.php b/include/class/class_anc_acc_list.php similarity index 99% rename from include/class_anc_acc_list.php rename to include/class/class_anc_acc_list.php index 3b7c6a07b..70fe3ac7a 100644 --- a/include/class_anc_acc_list.php +++ b/include/class/class_anc_acc_list.php @@ -23,7 +23,7 @@ * \brief */ -require_once NOALYSS_INCLUDE.'/class_anc_acc_link.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_link.php'; class Anc_Acc_List extends Anc_Acc_Link { diff --git a/include/class_anc_account.php b/include/class/class_anc_account.php similarity index 96% rename from include/class_anc_account.php rename to include/class/class_anc_account.php index 1d9da5f7f..282dde6d4 100644 --- a/include/class_anc_account.php +++ b/include/class/class_anc_account.php @@ -26,12 +26,12 @@ /*!\brief contains the object for the poste_analytique (table poste_analytique) * */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; class Anc_Account { diff --git a/include/class_anc_balance_double.php b/include/class/class_anc_balance_double.php similarity index 97% rename from include/class_anc_balance_double.php rename to include/class/class_anc_balance_double.php index 5574903cb..177a7f888 100644 --- a/include/class_anc_balance_double.php +++ b/include/class/class_anc_balance_double.php @@ -28,13 +28,13 @@ * Print the crossed balance between 2 plan * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Anc_Balance_Double extends Anc_Print { diff --git a/include/class_anc_balance_simple.php b/include/class/class_anc_balance_simple.php similarity index 97% rename from include/class_anc_balance_simple.php rename to include/class/class_anc_balance_simple.php index 9dd563dc7..246e78bf0 100644 --- a/include/class_anc_balance_simple.php +++ b/include/class/class_anc_balance_simple.php @@ -23,11 +23,11 @@ \brief manage the simple balance for CA, inherit from balance_ca */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; /*! \brief manage the simple balance for CA, inherit from balance_ca * diff --git a/include/class_anc_grandlivre.php b/include/class/class_anc_grandlivre.php similarity index 98% rename from include/class_anc_grandlivre.php rename to include/class/class_anc_grandlivre.php index 452da710b..3cf02c466 100644 --- a/include/class_anc_grandlivre.php +++ b/include/class/class_anc_grandlivre.php @@ -22,8 +22,8 @@ /*!\file * \brief show the Grand Livre for analytic */ -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; class Anc_GrandLivre extends Anc_Print { diff --git a/include/class_anc_group.php b/include/class/class_anc_group.php similarity index 97% rename from include/class_anc_group.php rename to include/class/class_anc_group.php index daff410da..f31b8e414 100644 --- a/include/class_anc_group.php +++ b/include/class/class_anc_group.php @@ -23,10 +23,10 @@ * \brief class for the group of the analytic account * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; /*! \brief class for the group of the analytic account * diff --git a/include/class_anc_group_operation.php b/include/class/class_anc_group_operation.php similarity index 94% rename from include/class_anc_group_operation.php rename to include/class/class_anc_group_operation.php index 502a9cc9a..08f9a7c9d 100644 --- a/include/class_anc_group_operation.php +++ b/include/class/class_anc_group_operation.php @@ -26,14 +26,14 @@ /*! \brief group of object operations, used for misc operation * */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Anc_Group_Operation { diff --git a/include/class_anc_key.php b/include/class/class_anc_key.php similarity index 99% rename from include/class_anc_key.php rename to include/class/class_anc_key.php index 587178aab..d79bfbe7a 100644 --- a/include/class_anc_key.php +++ b/include/class/class_anc_key.php @@ -25,7 +25,7 @@ * @brief Class to manage distribution keys for Analytic accountancy * */ -require_once NOALYSS_INCLUDE.'/class_anc_key_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_anc_key_sql.php'; class Anc_Key { diff --git a/include/class_anc_listing.php b/include/class/class_anc_listing.php similarity index 96% rename from include/class_anc_listing.php rename to include/class/class_anc_listing.php index 93c1a3f75..9804ad96c 100644 --- a/include/class_anc_listing.php +++ b/include/class/class_anc_listing.php @@ -23,10 +23,10 @@ * \brief definition of Anc_Listing */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; /*! * \brief manage the CA listing * diff --git a/include/class_anc_operation.php b/include/class/class_anc_operation.php similarity index 98% rename from include/class_anc_operation.php rename to include/class/class_anc_operation.php index 20c90cc28..1c029b7fb 100644 --- a/include/class_anc_operation.php +++ b/include/class/class_anc_operation.php @@ -22,12 +22,12 @@ /*!\file *\brief definition of Anc_Operation */ -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \brief this class is used to show the form for entering an * operation only FOR analytic operation diff --git a/include/class_anc_plan.php b/include/class/class_anc_plan.php similarity index 96% rename from include/class_anc_plan.php rename to include/class/class_anc_plan.php index ab6646ba3..2597c1fb7 100644 --- a/include/class_anc_plan.php +++ b/include/class/class_anc_plan.php @@ -26,12 +26,12 @@ /*! \brief * Concerns the Analytic plan (table plan_analytique) */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Anc_Plan { diff --git a/include/class_anc_print.php b/include/class/class_anc_print.php similarity index 91% rename from include/class_anc_print.php rename to include/class/class_anc_print.php index f9fc3e5ff..24d79df75 100644 --- a/include/class_anc_print.php +++ b/include/class/class_anc_print.php @@ -27,16 +27,16 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_ianccard.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ianccard.php'; class Anc_Print { var $db; /*!< $db database connection */ diff --git a/include/class_anc_table.php b/include/class/class_anc_table.php similarity index 99% rename from include/class_anc_table.php rename to include/class/class_anc_table.php index 877c83684..01ef0fac9 100644 --- a/include/class_anc_table.php +++ b/include/class/class_anc_table.php @@ -22,7 +22,7 @@ /*!\file * \brief object to show a table: link between accountancy and analytic */ -require_once NOALYSS_INCLUDE.'/class_anc_acc_link.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_link.php'; class Anc_Table extends Anc_Acc_Link { diff --git a/include/class_anticipation.php b/include/class/class_anticipation.php similarity index 97% rename from include/class_anticipation.php rename to include/class/class_anticipation.php index e5ba8ce10..2adf7dfe5 100644 --- a/include/class_anticipation.php +++ b/include/class/class_anticipation.php @@ -29,13 +29,13 @@ *@see Forecast Forecast_Cat Forecast_Item * */ -require_once NOALYSS_INCLUDE.'/class_forecast.php'; -require_once NOALYSS_INCLUDE.'/class_forecast_cat.php'; -require_once NOALYSS_INCLUDE.'/class_forecast_item.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast_cat.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast_item.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; class Anticipation { diff --git a/include/class_balance_age.php b/include/class/class_balance_age.php similarity index 99% rename from include/class_balance_age.php rename to include/class/class_balance_age.php index 364448bc3..563bfd02b 100644 --- a/include/class_balance_age.php +++ b/include/class/class_balance_age.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; /* * * * @file diff --git a/include/class_bank.php b/include/class/class_bank.php similarity index 84% rename from include/class_bank.php rename to include/class/class_bank.php index 886c2090d..8e90ab011 100644 --- a/include/class_bank.php +++ b/include/class/class_bank.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Administration are a specific kind of card * concerned only by official (or not) administration diff --git a/include/class_calendar.php b/include/class/class_calendar.php similarity index 100% rename from include/class_calendar.php rename to include/class/class_calendar.php diff --git a/include/class_contact.php b/include/class/class_contact.php similarity index 97% rename from include/class_contact.php rename to include/class/class_contact.php index 31bde74c4..9c7016146 100644 --- a/include/class_contact.php +++ b/include/class/class_contact.php @@ -18,9 +18,9 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu //!\brief class for the contact, contact are derived from fiche -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Contact are a card which are own by a another card (customer, supplier...) */ diff --git a/include/class_customer.php b/include/class/class_customer.php similarity index 94% rename from include/class_customer.php rename to include/class/class_customer.php index 754557435..1c9a49e0e 100644 --- a/include/class_customer.php +++ b/include/class/class_customer.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Customer are a specific kind of card */ diff --git a/include/class_default_menu.php b/include/class/class_default_menu.php similarity index 97% rename from include/class_default_menu.php rename to include/class/class_default_menu.php index 4c6d32f40..7aa595d9d 100644 --- a/include/class_default_menu.php +++ b/include/class/class_default_menu.php @@ -23,8 +23,8 @@ * * @author dany */ -require_once NOALYSS_INCLUDE.'/class_default_menu_sql.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; +require_once NOALYSS_INCLUDE.'/database/class_default_menu_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; class Default_Menu { diff --git a/include/class_document.php b/include/class/class_document.php similarity index 99% rename from include/class_document.php rename to include/class/class_document.php index 7acaf9109..f0153d4e5 100644 --- a/include/class_document.php +++ b/include/class/class_document.php @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; -require_once NOALYSS_INCLUDE.'/class_acc_tva.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_zip_extended.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_tva.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_zip_extended.php'; /*! \file * \brief Class Document corresponds to the table document diff --git a/include/class_document_export.php b/include/class/class_document_export.php similarity index 100% rename from include/class_document_export.php rename to include/class/class_document_export.php diff --git a/include/class_document_modele.php b/include/class/class_document_modele.php similarity index 97% rename from include/class_document_modele.php rename to include/class/class_document_modele.php index e993af3b3..85c6ae5bb 100644 --- a/include/class_document_modele.php +++ b/include/class/class_document_modele.php @@ -23,9 +23,9 @@ /*! * \brief Class for the document template */ -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; class Document_modele { var $cn; /*!< $cn database connection */ @@ -162,7 +162,7 @@ class Document_modele $oid= $this->cn->lo_import($new_name); if ( $oid == false ) { - echo_error('class_document_modele.php',__LINE__,"cannot upload document"); + echo_error('class/class_document_modele.php',__LINE__,"cannot upload document"); $this->cn->rollback(); return; } @@ -327,7 +327,7 @@ class Document_modele $oid= $this->cn->lo_import($new_name); if ( $oid == false ) { - echo_error('class_document_modele.php',__LINE__,"cannot upload document"); + echo_error('class/class_document_modele.php',__LINE__,"cannot upload document"); $this->cn->rollback(); return; } diff --git a/include/class_document_type.php b/include/class/class_document_type.php similarity index 100% rename from include/class_document_type.php rename to include/class/class_document_type.php diff --git a/include/class_dossier.php b/include/class/class_dossier.php similarity index 98% rename from include/class_dossier.php rename to include/class/class_dossier.php index 292558775..3531657e9 100644 --- a/include/class_dossier.php +++ b/include/class/class_dossier.php @@ -33,8 +33,8 @@ "desc"=>"dos_description"); * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class Dossier { diff --git a/include/class_exercice.php b/include/class/class_exercice.php similarity index 95% rename from include/class_exercice.php rename to include/class/class_exercice.php index 490157b5a..702aef931 100644 --- a/include/class_exercice.php +++ b/include/class/class_exercice.php @@ -22,8 +22,8 @@ /*!\file * \brief about the accountant exercice */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; class Exercice { function __construct(&$cn) diff --git a/include/class_extension.php b/include/class/class_extension.php similarity index 97% rename from include/class_extension.php rename to include/class/class_extension.php index 7ca07c3b2..00a82dffb 100644 --- a/include/class_extension.php +++ b/include/class/class_extension.php @@ -35,10 +35,10 @@ * - enable (extension.ex_enable) * - filepath (extension.ex_file) */ -require_once NOALYSS_INCLUDE.'/class_menu_ref_sql.php'; -require_once NOALYSS_INCLUDE.'/class_profile_sql.php'; -require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/database/class_menu_ref_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; class Extension extends Menu_Ref_sql { diff --git a/include/class_fiche.php b/include/class/class_fiche.php similarity index 99% rename from include/class_fiche.php rename to include/class/class_fiche.php index 065c24a08..cb06d4877 100644 --- a/include/class_fiche.php +++ b/include/class/class_fiche.php @@ -20,13 +20,13 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -include_once("class_fiche_attr.php"); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_iposte.php'; +include_once("class/class_fiche_attr.php"); +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iposte.php'; /*! \file * \brief define Class fiche, this class are using diff --git a/include/class_fiche_attr.php b/include/class/class_fiche_attr.php similarity index 98% rename from include/class_fiche_attr.php rename to include/class/class_fiche_attr.php index ff7a4fbd5..eaf1d22e4 100644 --- a/include/class_fiche_attr.php +++ b/include/class/class_fiche_attr.php @@ -6,8 +6,8 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class Fiche_Attr { diff --git a/include/class_fiche_def.php b/include/class/class_fiche_def.php similarity index 98% rename from include/class_fiche_def.php rename to include/class/class_fiche_def.php index 9962fb7ba..c3f731bc0 100644 --- a/include/class_fiche_def.php +++ b/include/class/class_fiche_def.php @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def_ref.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; /*! \file * \brief define Class fiche and fiche def, those class are using diff --git a/include/class_fiche_def_ref.php b/include/class/class_fiche_def_ref.php similarity index 100% rename from include/class_fiche_def_ref.php rename to include/class/class_fiche_def_ref.php diff --git a/include/class_follow_up.php b/include/class/class_follow_up.php similarity index 98% rename from include/class_follow_up.php rename to include/class/class_follow_up.php index ed5c662cf..86c6cca45 100644 --- a/include/class_follow_up.php +++ b/include/class/class_follow_up.php @@ -18,26 +18,26 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_itextarea.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_document_type.php'; -require_once NOALYSS_INCLUDE.'/class_document_modele.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up_detail.php'; -require_once NOALYSS_INCLUDE.'/class_inum.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_irelated_action.php'; -require_once NOALYSS_INCLUDE.'/class_tag.php'; -require_once NOALYSS_INCLUDE.'/class_default_menu.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up_detail.php'; +require_once NOALYSS_INCLUDE.'/lib/class_inum.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/lib/class_irelated_action.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_default_menu.php'; /** * \file * \brief class_action for manipulating actions diff --git a/include/class_follow_up_detail.php b/include/class/class_follow_up_detail.php similarity index 98% rename from include/class_follow_up_detail.php rename to include/class/class_follow_up_detail.php index 35365b90b..89f7e1da7 100644 --- a/include/class_follow_up_detail.php +++ b/include/class/class_follow_up_detail.php @@ -16,8 +16,8 @@ * along with NOALYSS; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; // Copyright Author Dany De Bontridder danydb@aevalys.eu /*!\file diff --git a/include/class_forecast.php b/include/class/class_forecast.php similarity index 100% rename from include/class_forecast.php rename to include/class/class_forecast.php diff --git a/include/class_forecast_cat.php b/include/class/class_forecast_cat.php similarity index 100% rename from include/class_forecast_cat.php rename to include/class/class_forecast_cat.php diff --git a/include/class_forecast_item.php b/include/class/class_forecast_item.php similarity index 100% rename from include/class_forecast_item.php rename to include/class/class_forecast_item.php diff --git a/include/class_gestion_purchase.php b/include/class/class_gestion_purchase.php similarity index 98% rename from include/class_gestion_purchase.php rename to include/class/class_gestion_purchase.php index 8a1d59204..b738bb325 100644 --- a/include/class_gestion_purchase.php +++ b/include/class/class_gestion_purchase.php @@ -26,7 +26,7 @@ /*! \brief this object handles the table quant_purchase * */ -require_once NOALYSS_INCLUDE.'/class_gestion_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_table.php'; class gestion_purchase extends gestion_table diff --git a/include/class_gestion_sold.php b/include/class/class_gestion_sold.php similarity index 98% rename from include/class_gestion_sold.php rename to include/class/class_gestion_sold.php index 1b0036f63..a047ab6cd 100644 --- a/include/class_gestion_sold.php +++ b/include/class/class_gestion_sold.php @@ -27,7 +27,7 @@ * */ -require_once NOALYSS_INCLUDE.'/class_gestion_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_table.php'; class gestion_sold extends gestion_table diff --git a/include/class_gestion_table.php b/include/class/class_gestion_table.php similarity index 100% rename from include/class_gestion_table.php rename to include/class/class_gestion_table.php diff --git a/include/class_lettering.php b/include/class/class_lettering.php similarity index 99% rename from include/class_lettering.php rename to include/class/class_lettering.php index 9b5d769c8..ccfd202e8 100644 --- a/include/class_lettering.php +++ b/include/class/class_lettering.php @@ -22,7 +22,7 @@ /*!\file * \brief letter the accounting entry (row level) */ -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; /** *@brief mother class for the lettering by account and by card diff --git a/include/class_manager.php b/include/class/class_manager.php similarity index 82% rename from include/class_manager.php rename to include/class/class_manager.php index 55b323f70..76a06864c 100644 --- a/include/class_manager.php +++ b/include/class/class_manager.php @@ -19,12 +19,12 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Supplier are a specific kind of card */ diff --git a/include/class_menu_ref.php b/include/class/class_menu_ref.php similarity index 96% rename from include/class_menu_ref.php rename to include/class/class_menu_ref.php index 264695980..d18a23216 100644 --- a/include/class_menu_ref.php +++ b/include/class/class_menu_ref.php @@ -21,7 +21,7 @@ *@file *@brief Menu_Ref let you manage the available menu */ -require_once NOALYSS_INCLUDE.'/class_menu_ref_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_menu_ref_sql.php'; class Menu_Ref extends Menu_Ref_sql { function format_code() diff --git a/include/class_own.php b/include/class/class_own.php similarity index 100% rename from include/class_own.php rename to include/class/class_own.php diff --git a/include/class_periode.php b/include/class/class_periode.php similarity index 99% rename from include/class_periode.php rename to include/class/class_periode.php index 2f650c33e..1df3079f7 100644 --- a/include/class_periode.php +++ b/include/class/class_periode.php @@ -25,8 +25,8 @@ /*! * \brief For the periode tables parm_periode and jrn_periode */ -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; class Periode { var $cn; /*!< database connection */ diff --git a/include/class_pre_op_ach.php b/include/class/class_pre_op_ach.php similarity index 99% rename from include/class_pre_op_ach.php rename to include/class/class_pre_op_ach.php index 74d6a887e..2f92bf26b 100644 --- a/include/class_pre_op_ach.php +++ b/include/class/class_pre_op_ach.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class pre_op_ach */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for ACH ledger @@ -147,7 +147,7 @@ class Pre_op_ach extends Pre_operation_detail } function display($p_array) { - require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; global $g_parameter,$g_user; extract($p_array); $ledger=new Acc_Ledger_Purchase($this->db,$this->jrn_def_id); diff --git a/include/class_pre_op_advanced.php b/include/class/class_pre_op_advanced.php similarity index 98% rename from include/class_pre_op_advanced.php rename to include/class/class_pre_op_advanced.php index fd9ffbece..e0ba2538f 100644 --- a/include/class_pre_op_advanced.php +++ b/include/class/class_pre_op_advanced.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_Op_Advanced */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for the operation from 'Ecriture direct' @@ -157,7 +157,7 @@ class Pre_Op_Advanced extends Pre_operation_detail function display($p_array) { global $g_parameter, $g_user; - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $legder=new Acc_Ledger($this->db,$this->jrn_def_id); $legder->nb=$legder->get_min_row(); diff --git a/include/class_pre_op_fin.php b/include/class/class_pre_op_fin.php similarity index 98% rename from include/class_pre_op_fin.php rename to include/class/class_pre_op_fin.php index ca2893314..25e475207 100644 --- a/include/class_pre_op_fin.php +++ b/include/class/class_pre_op_fin.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_fin */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for FIN ledger diff --git a/include/class_pre_op_ods.php b/include/class/class_pre_op_ods.php similarity index 98% rename from include/class_pre_op_ods.php rename to include/class/class_pre_op_ods.php index c47b00221..db576ba6b 100644 --- a/include/class_pre_op_ods.php +++ b/include/class/class_pre_op_ods.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_ods */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for ODS ledger diff --git a/include/class_pre_op_ven.php b/include/class/class_pre_op_ven.php similarity index 99% rename from include/class_pre_op_ven.php rename to include/class/class_pre_op_ven.php index 9894aecc6..6a8e4d83d 100644 --- a/include/class_pre_op_ven.php +++ b/include/class/class_pre_op_ven.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_ven */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for VEN ledger @@ -143,7 +143,7 @@ class Pre_op_ven extends Pre_operation_detail { global $g_parameter,$g_user; if ( $p_array != null ) extract($p_array); - require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; $ledger=new Acc_Ledger_Sold($this->db,$this->jrn_def_id); $flag_tva=$g_parameter->MY_TVA_USE; diff --git a/include/class_pre_operation.php b/include/class/class_pre_operation.php similarity index 97% rename from include/class_pre_operation.php rename to include/class/class_pre_operation.php index a0c13b9d3..60b031a23 100644 --- a/include/class_pre_operation.php +++ b/include/class/class_pre_operation.php @@ -27,11 +27,11 @@ * and op_def_detail * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ach.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ven.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_advanced.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ach.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ven.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_advanced.php'; class Pre_operation { var $db; /*!< $db database connection */ diff --git a/include/class_print_ledger.php b/include/class/class_print_ledger.php similarity index 91% rename from include/class_print_ledger.php rename to include/class/class_print_ledger.php index d1435034e..90403eda1 100644 --- a/include/class_print_ledger.php +++ b/include/class/class_print_ledger.php @@ -23,13 +23,13 @@ * * @author danydb */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_detail.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_simple.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_simple_without_vat.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_misc.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_detail_item.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple_without_vat.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_misc.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail_item.php'; /** * @brief Strategie class for the print_ledger class diff --git a/include/class_print_ledger_detail.php b/include/class/class_print_ledger_detail.php similarity index 98% rename from include/class_print_ledger_detail.php rename to include/class/class_print_ledger_detail.php index 7806143b3..c02608f41 100644 --- a/include/class_print_ledger_detail.php +++ b/include/class/class_print_ledger_detail.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Print_Ledger_Detail extends PDF { diff --git a/include/class_print_ledger_detail_item.php b/include/class/class_print_ledger_detail_item.php similarity index 98% rename from include/class_print_ledger_detail_item.php rename to include/class/class_print_ledger_detail_item.php index 9bdcf8333..64c762009 100644 --- a/include/class_print_ledger_detail_item.php +++ b/include/class/class_print_ledger_detail_item.php @@ -23,8 +23,8 @@ * * @author danydb */ -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; class Print_Ledger_Detail_Item extends PDFLand { public function __construct (Database $p_cn,Acc_Ledger $p_jrn) diff --git a/include/class_print_ledger_fin.php b/include/class/class_print_ledger_fin.php similarity index 98% rename from include/class_print_ledger_fin.php rename to include/class/class_print_ledger_fin.php index 99fe33672..835532752 100644 --- a/include/class_print_ledger_fin.php +++ b/include/class/class_print_ledger_fin.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Print_Ledger_Financial extends PDF { private $rap_amount; /* amount from begining exercice */ diff --git a/include/class_print_ledger_misc.php b/include/class/class_print_ledger_misc.php similarity index 98% rename from include/class_print_ledger_misc.php rename to include/class/class_print_ledger_misc.php index dcf34dbf0..95515ee5d 100644 --- a/include/class_print_ledger_misc.php +++ b/include/class/class_print_ledger_misc.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Print_Ledger_Misc extends PDF { function __construct($p_cn,$p_jrn) diff --git a/include/class_print_ledger_simple.php b/include/class/class_print_ledger_simple.php similarity index 99% rename from include/class_print_ledger_simple.php rename to include/class/class_print_ledger_simple.php index 21a3ae3ce..5a560f80e 100644 --- a/include/class_print_ledger_simple.php +++ b/include/class/class_print_ledger_simple.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Print_Ledger_Simple extends PDF { diff --git a/include/class_print_ledger_simple_without_vat.php b/include/class/class_print_ledger_simple_without_vat.php similarity index 99% rename from include/class_print_ledger_simple_without_vat.php rename to include/class/class_print_ledger_simple_without_vat.php index c56c0fdca..b7c3ae162 100644 --- a/include/class_print_ledger_simple_without_vat.php +++ b/include/class/class_print_ledger_simple_without_vat.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; class Print_Ledger_Simple_Without_Vat extends PDF { diff --git a/include/class_profile_menu.php b/include/class/class_profile_menu.php similarity index 99% rename from include/class_profile_menu.php rename to include/class/class_profile_menu.php index 58de6dd88..e53f469a4 100644 --- a/include/class_profile_menu.php +++ b/include/class/class_profile_menu.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_profile_menu_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_menu_sql.php'; /** * Manage the menu of a profile diff --git a/include/class_stock.php b/include/class/class_stock.php similarity index 99% rename from include/class_stock.php rename to include/class/class_stock.php index 611e625ca..76fcb430d 100644 --- a/include/class_stock.php +++ b/include/class/class_stock.php @@ -26,7 +26,7 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_stock_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_sql.php'; class Stock extends Stock_Sql { @@ -39,7 +39,7 @@ class Stock extends Stock_Sql { $sql = $this->create_query_histo($p_array); - require_once NOALYSS_INCLUDE.'/class_sort_table.php'; + require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; $p_url = HtmlInput::get_to_string(array("gDossier", "ac", "wcard", "wdate_start", "wdate_end", "wrepo", "wamount_start", "wamount_end", "wcode_stock", "wdirection")); diff --git a/include/class_stock_goods.php b/include/class/class_stock_goods.php similarity index 99% rename from include/class_stock_goods.php rename to include/class/class_stock_goods.php index e1a0887c5..cfbd681fe 100644 --- a/include/class_stock_goods.php +++ b/include/class/class_stock_goods.php @@ -25,7 +25,7 @@ * @brief Manage the goods * */ -require_once NOALYSS_INCLUDE.'/class_stock_goods_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_goods_sql.php'; class Stock_Goods extends Stock_Goods_Sql { diff --git a/include/class_supplier.php b/include/class/class_supplier.php similarity index 86% rename from include/class_supplier.php rename to include/class/class_supplier.php index 1afca1395..4f008ee67 100644 --- a/include/class_supplier.php +++ b/include/class/class_supplier.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Supplier are a specific kind of card */ diff --git a/include/class_tag.php b/include/class/class_tag.php similarity index 98% rename from include/class_tag.php rename to include/class/class_tag.php index ee49c6a85..81ce9c69a 100644 --- a/include/class_tag.php +++ b/include/class/class_tag.php @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_tag_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_tag_sql.php'; class Tag { diff --git a/include/class_todo_list.php b/include/class/class_todo_list.php similarity index 99% rename from include/class_todo_list.php rename to include/class/class_todo_list.php index 24ac21678..222531a86 100644 --- a/include/class_todo_list.php +++ b/include/class/class_todo_list.php @@ -23,7 +23,7 @@ * \brief the todo list is managed by this class */ -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; /*!\brief * This class manages the table todo_list diff --git a/include/class_user.php b/include/class/class_user.php similarity index 99% rename from include/class_user.php rename to include/class/class_user.php index c16630372..5a1f7051c 100644 --- a/include/class_user.php +++ b/include/class/class_user.php @@ -29,9 +29,9 @@ */ require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class User { @@ -1055,7 +1055,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.'/class_database.php'; + require_once NOALYSS_INCLUDE.'/lib/class_database.php'; $max = Database::num_row($Res); if ($max == 0) diff --git a/include/company.inc.php b/include/company.inc.php index ff1152bdb..ce82c3b94 100644 --- a/include/company.inc.php +++ b/include/company.inc.php @@ -21,7 +21,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); global $g_user; echo '
    '; -require_once NOALYSS_INCLUDE.'/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; if (isset($_POST['record_company'])) { $m = new Own($cn); diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index f4f310487..887c21702 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -25,10 +25,10 @@ * \brief file included to manage all the sold operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ach.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ach.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; $gDossier = dossier::id(); global $g_parameter; $cn = new Database(dossier::id()); diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php index f818bf5b2..282d76225 100644 --- a/include/compta_fin.inc.php +++ b/include/compta_fin.inc.php @@ -23,8 +23,8 @@ * \brief this file is to be included to handle the financial ledger */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user,$g_parameter; $gDossier=dossier::id(); diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php index 080f6f5c7..687f72297 100644 --- a/include/compta_fin_rec.inc.php +++ b/include/compta_fin_rec.inc.php @@ -28,7 +28,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); global $g_failed,$g_succeed; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; bcscale(2); echo '
    '; $Ledger = new Acc_Ledger_Fin($cn, 0); diff --git a/include/compta_fin_saldo.inc.php b/include/compta_fin_saldo.inc.php index 48e285ee3..89a2bc4af 100644 --- a/include/compta_fin_saldo.inc.php +++ b/include/compta_fin_saldo.inc.php @@ -27,7 +27,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; echo '
    '; $fiche=new Fiche($cn); diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php index a760c3f9c..2e4d18c33 100644 --- a/include/compta_ods.inc.php +++ b/include/compta_ods.inc.php @@ -27,13 +27,13 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user; diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 13029b4fb..fbecc45b5 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -23,12 +23,12 @@ * \brief file included to manage all the sold operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ven.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_info.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ven.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_info.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; $gDossier=dossier::id(); $cn=new Database(dossier::id()); diff --git a/include/config_file.php b/include/config_file.php index 11a82f782..432ff9c05 100644 --- a/include/config_file.php +++ b/include/config_file.php @@ -23,9 +23,9 @@ * \brief functions concerning the config file config.inc.php. The domain is not set into the form for security issues */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; function is_unix() { diff --git a/include/contact.inc.php b/include/contact.inc.php index 832fe003b..ab60a0539 100644 --- a/include/contact.inc.php +++ b/include/contact.inc.php @@ -21,11 +21,11 @@ * the contact category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_contact.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_contact.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; diff --git a/include/customer.inc.php b/include/customer.inc.php index 66beaed74..f08255646 100644 --- a/include/customer.inc.php +++ b/include/customer.inc.php @@ -22,11 +22,11 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_customer.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php index f9d5f441b..bd56d91f5 100644 --- a/include/dashboard.inc.php +++ b/include/dashboard.inc.php @@ -1,19 +1,19 @@ '; global $g_user; diff --git a/include/class_anc_key_sql.php b/include/database/class_anc_key_sql.php similarity index 98% rename from include/class_anc_key_sql.php rename to include/database/class_anc_key_sql.php index 07be1ed31..121284c93 100644 --- a/include/class_anc_key_sql.php +++ b/include/database/class_anc_key_sql.php @@ -23,7 +23,7 @@ * @brief Class to manage distribution keys for SQL. * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** diff --git a/include/class_default_menu_sql.php b/include/database/class_default_menu_sql.php similarity index 96% rename from include/class_default_menu_sql.php rename to include/database/class_default_menu_sql.php index 38292e161..3e96bac60 100644 --- a/include/class_default_menu_sql.php +++ b/include/database/class_default_menu_sql.php @@ -23,7 +23,7 @@ * * @author dany */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Default_Menu_SQL extends Noalyss_SQL { diff --git a/include/class_jrn_def_sql.php b/include/database/class_jrn_def_sql.php similarity index 98% rename from include/class_jrn_def_sql.php rename to include/database/class_jrn_def_sql.php index 3008f3c0b..2ddb98bd0 100644 --- a/include/class_jrn_def_sql.php +++ b/include/database/class_jrn_def_sql.php @@ -28,8 +28,8 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /** * @brief Manage the table public.jrn_def diff --git a/include/class_menu_ref_sql.php b/include/database/class_menu_ref_sql.php similarity index 92% rename from include/class_menu_ref_sql.php rename to include/database/class_menu_ref_sql.php index 0659e3454..9bd6b19d2 100644 --- a/include/class_menu_ref_sql.php +++ b/include/database/class_menu_ref_sql.php @@ -24,9 +24,9 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.menu_ref diff --git a/include/class_noalyss_sql.php b/include/database/class_noalyss_sql.php similarity index 100% rename from include/class_noalyss_sql.php rename to include/database/class_noalyss_sql.php diff --git a/include/class_profile_menu_sql.php b/include/database/class_profile_menu_sql.php similarity index 91% rename from include/class_profile_menu_sql.php rename to include/database/class_profile_menu_sql.php index 846ff1396..7b8006bd5 100644 --- a/include/class_profile_menu_sql.php +++ b/include/database/class_profile_menu_sql.php @@ -28,9 +28,9 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.profile_menu diff --git a/include/class_profile_sql.php b/include/database/class_profile_sql.php similarity index 90% rename from include/class_profile_sql.php rename to include/database/class_profile_sql.php index dba506d7f..82d14fc38 100644 --- a/include/class_profile_sql.php +++ b/include/database/class_profile_sql.php @@ -28,9 +28,9 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.profile diff --git a/include/class_stock_goods_sql.php b/include/database/class_stock_goods_sql.php similarity index 97% rename from include/class_stock_goods_sql.php rename to include/database/class_stock_goods_sql.php index 4ec94240d..6c5925bbb 100644 --- a/include/class_stock_goods_sql.php +++ b/include/database/class_stock_goods_sql.php @@ -25,7 +25,7 @@ * @brief * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Stock_Goods_Sql extends Noalyss_SQL { diff --git a/include/class_stock_sql.php b/include/database/class_stock_sql.php similarity index 95% rename from include/class_stock_sql.php rename to include/database/class_stock_sql.php index 2d36dbe6c..c227b7870 100644 --- a/include/class_stock_sql.php +++ b/include/database/class_stock_sql.php @@ -25,7 +25,7 @@ * @brief * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Stock_Sql extends Noalyss_SQL { function __construct($cn,$p_id=-1) diff --git a/include/class_tag_sql.php b/include/database/class_tag_sql.php similarity index 89% rename from include/class_tag_sql.php rename to include/database/class_tag_sql.php index 149248c55..191ead8c7 100644 --- a/include/class_tag_sql.php +++ b/include/database/class_tag_sql.php @@ -1,7 +1,7 @@ '; @@ -35,7 +35,7 @@ $doc=new Document_modele($cn); //----------------------------------------------------- if ( $sub_action=='add_document') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; $doc=new Document_modele($cn); $doc->md_name=$_POST['md_name']; $doc->md_id=-1; // because it is a new model @@ -49,7 +49,7 @@ if ( $sub_action=='add_document') //----------------------------------------------------- if ( $sub_action=='rm_template') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; // Get all the document to remove foreach ( $_POST as $name=>$value ) @@ -68,7 +68,7 @@ if ( $sub_action=='rm_template') //---------------------------------------------------------------------- if ( $sub_action == 'mod_template') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; $doc=new Document_modele($cn,$_POST['id']); $doc->update($_POST); } diff --git a/include/dossier.inc.php b/include/dossier.inc.php index f1d9bd7c8..569bacb6d 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -23,10 +23,10 @@ if ( !defined ('ALLOWED')) die('Forbidden'); * \brief Management of the folder * */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_itextarea.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:'list'; //--------------------------------------------------------------------------- @@ -208,7 +208,7 @@ if ( isset ($_POST["DATABASE"]) ) // List of folder if ( $sa == 'list' ) { - require_once NOALYSS_INCLUDE.'/class_sort_table.php'; + require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; echo '

    '; echo HtmlInput::button(_('Ajouter'),_('Ajouter un dossier')," onclick=\$('folder_add_id').show()"); echo '

    '; diff --git a/include/export_anc_acc_list_csv.php b/include/export/export_anc_acc_list_csv.php similarity index 94% rename from include/export_anc_acc_list_csv.php rename to include/export/export_anc_acc_list_csv.php index e58d0c238..3269007b9 100644 --- a/include/export_anc_acc_list_csv.php +++ b/include/export/export_anc_acc_list_csv.php @@ -28,7 +28,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="export-anc-list.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_acc_list.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_list.php'; $bal=new Anc_Acc_List($cn); diff --git a/include/export_anc_balance_double_csv.php b/include/export/export_anc_balance_double_csv.php similarity index 94% rename from include/export_anc_balance_double_csv.php rename to include/export/export_anc_balance_double_csv.php index 635a1572a..4364c45b8 100644 --- a/include/export_anc_balance_double_csv.php +++ b/include/export/export_anc_balance_double_csv.php @@ -31,7 +31,7 @@ header('Content-type: application/csv'); header('Pragma: public'); header('Content-Disposition: attachment;filename="ca_bal_croise.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; $cn=new Database(dossier::id()); diff --git a/include/export_anc_balance_double_pdf.php b/include/export/export_anc_balance_double_pdf.php similarity index 94% rename from include/export_anc_balance_double_pdf.php rename to include/export/export_anc_balance_double_pdf.php index 012c68f37..6c3e16665 100644 --- a/include/export_anc_balance_double_pdf.php +++ b/include/export/export_anc_balance_double_pdf.php @@ -23,7 +23,7 @@ * \brief export the operation in pdf */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; $cn=new Database(dossier::id()); diff --git a/include/export_anc_balance_group_csv.php b/include/export/export_anc_balance_group_csv.php similarity index 95% rename from include/export_anc_balance_group_csv.php rename to include/export/export_anc_balance_group_csv.php index fed3c0015..611df20a7 100644 --- a/include/export_anc_balance_group_csv.php +++ b/include/export/export_anc_balance_group_csv.php @@ -23,7 +23,7 @@ * \brief export balance by group */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; header('Pragma: public'); header('Content-type: application/csv'); diff --git a/include/export_anc_balance_simple_csv.php b/include/export/export_anc_balance_simple_csv.php similarity index 94% rename from include/export_anc_balance_simple_csv.php rename to include/export/export_anc_balance_simple_csv.php index d97c87cb5..6a096024c 100644 --- a/include/export_anc_balance_simple_csv.php +++ b/include/export/export_anc_balance_simple_csv.php @@ -27,7 +27,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="ca_bal_simple.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; $cn=new Database(dossier::id()); diff --git a/include/export_anc_balance_simple_pdf.php b/include/export/export_anc_balance_simple_pdf.php similarity index 93% rename from include/export_anc_balance_simple_pdf.php rename to include/export/export_anc_balance_simple_pdf.php index edaa0c71d..66fde7eee 100644 --- a/include/export_anc_balance_simple_pdf.php +++ b/include/export/export_anc_balance_simple_pdf.php @@ -24,7 +24,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; $cn=new Database(dossier::id()); diff --git a/include/export_anc_grandlivre_csv.php b/include/export/export_anc_grandlivre_csv.php similarity index 94% rename from include/export_anc_grandlivre_csv.php rename to include/export/export_anc_grandlivre_csv.php index 403f69063..c5564b17f 100644 --- a/include/export_anc_grandlivre_csv.php +++ b/include/export/export_anc_grandlivre_csv.php @@ -23,7 +23,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="anc-grand-livre.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_grandlivre.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_grandlivre.php'; $cn=Dossier::connect(); diff --git a/include/export_anc_list_csv.php b/include/export/export_anc_list_csv.php similarity index 95% rename from include/export_anc_list_csv.php rename to include/export/export_anc_list_csv.php index 569bb0de9..f88d6c8d7 100644 --- a/include/export_anc_list_csv.php +++ b/include/export/export_anc_list_csv.php @@ -28,7 +28,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="jrn.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_listing.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_listing.php'; $cn=new Database(dossier::id()); diff --git a/include/export_anc_receipt_pdf.php b/include/export/export_anc_receipt_pdf.php similarity index 94% rename from include/export_anc_receipt_pdf.php rename to include/export/export_anc_receipt_pdf.php index 7025f40d2..88b642fee 100644 --- a/include/export_anc_receipt_pdf.php +++ b/include/export/export_anc_receipt_pdf.php @@ -27,7 +27,7 @@ if (!defined('ALLOWED')) /** * export all the selected documents for Ana Accountancy in PDF */ -require_once NOALYSS_INCLUDE.'/class_document_export.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_export.php'; $ck = HtmlInput::default_value_get('ck', 0); if ($ck == 0) diff --git a/include/export_anc_table_csv.php b/include/export/export_anc_table_csv.php similarity index 95% rename from include/export_anc_table_csv.php rename to include/export/export_anc_table_csv.php index 9a3fd8dca..cbf064b42 100644 --- a/include/export_anc_table_csv.php +++ b/include/export/export_anc_table_csv.php @@ -27,7 +27,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="anc-table-export.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_table.php'; $atable=new Anc_Table($cn); $atable->get_request(); $atable->export_csv(); diff --git a/include/export_balance_age_csv.php b/include/export/export_balance_age_csv.php similarity index 98% rename from include/export_balance_age_csv.php rename to include/export/export_balance_age_csv.php index cac21b304..023dd4731 100644 --- a/include/export_balance_age_csv.php +++ b/include/export/export_balance_age_csv.php @@ -21,7 +21,7 @@ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); -require 'class_balance_age.php'; +require 'class/class_balance_age.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="balance_age.csv"',FALSE); diff --git a/include/export_balance_csv.php b/include/export/export_balance_csv.php similarity index 90% rename from include/export_balance_csv.php rename to include/export/export_balance_csv.php index cb3303d31..9ae545e8d 100644 --- a/include/export_balance_csv.php +++ b/include/export/export_balance_csv.php @@ -24,17 +24,17 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="balance.csv"',FALSE); -include_once ("ac_common.php"); -include_once("class_acc_balance.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +include_once("class/class_acc_balance.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $cn=new Database($gDossier); bcscale(2); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $bal=new Acc_Balance($cn); $bal->jrn=null; diff --git a/include/export_balance_pdf.php b/include/export/export_balance_pdf.php similarity index 96% rename from include/export_balance_pdf.php rename to include/export/export_balance_pdf.php index 1620aa024..b1c84c6d4 100644 --- a/include/export_balance_pdf.php +++ b/include/export/export_balance_pdf.php @@ -30,17 +30,17 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_acc_balance.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("class/class_acc_balance.php"); require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; $gDossier=dossier::id(); bcscale(4); $cn=new Database($gDossier); $rep=new Database(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $g_user->Check(); $bal=new Acc_Balance($cn); diff --git a/include/export_bilan_oth.php b/include/export/export_bilan_oth.php similarity index 85% rename from include/export_bilan_oth.php rename to include/export/export_bilan_oth.php index a4c2ebee1..b031bb559 100644 --- a/include/export_bilan_oth.php +++ b/include/export/export_bilan_oth.php @@ -21,14 +21,14 @@ * \brief send a Bilan in RTF format */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; +include_once("lib/ac_common.php"); +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_acc_bilan.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_bilan.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ diff --git a/include/export_fiche_balance_csv.php b/include/export/export_fiche_balance_csv.php similarity index 96% rename from include/export_fiche_balance_csv.php rename to include/export/export_fiche_balance_csv.php index 45886783a..3b9b47fca 100644 --- a/include/export_fiche_balance_csv.php +++ b/include/export/export_fiche_balance_csv.php @@ -29,10 +29,10 @@ header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="bal-fiche.csv"',FALSE); // Security we check if user does exist and his privilege -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; $allcard=(isset($_GET['allcard']))?1:0; /* balance */ diff --git a/include/export_fiche_balance_pdf.php b/include/export/export_fiche_balance_pdf.php similarity index 96% rename from include/export_fiche_balance_pdf.php rename to include/export/export_fiche_balance_pdf.php index c60f58ae5..3e429bfb1 100644 --- a/include/export_fiche_balance_pdf.php +++ b/include/export/export_fiche_balance_pdf.php @@ -25,12 +25,12 @@ */ 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.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /* Security */ $gDossier=dossier::id(); diff --git a/include/export_fiche_csv.php b/include/export/export_fiche_csv.php similarity index 89% rename from include/export_fiche_csv.php rename to include/export/export_fiche_csv.php index aff85a612..4106eb1ba 100644 --- a/include/export_fiche_csv.php +++ b/include/export/export_fiche_csv.php @@ -24,15 +24,15 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="fiche.csv"',FALSE); -include_once ("ac_common.php"); -include_once('class_fiche.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +include_once('class/class_fiche.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); $cn=new Database($gDossier); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; diff --git a/include/export_fiche_detail_csv.php b/include/export/export_fiche_detail_csv.php similarity index 95% rename from include/export_fiche_detail_csv.php rename to include/export/export_fiche_detail_csv.php index ad6c00e5c..b12dd493b 100644 --- a/include/export_fiche_detail_csv.php +++ b/include/export/export_fiche_detail_csv.php @@ -21,14 +21,14 @@ * \brief Send the poste list in csv */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; $f_id=HtmlInput::default_value_request("f_id", "-"); if ( $f_id == "-") { throw new Exception ('Invalid parameter'); } -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ diff --git a/include/export_fiche_detail_pdf.php b/include/export/export_fiche_detail_pdf.php similarity index 95% rename from include/export_fiche_detail_pdf.php rename to include/export/export_fiche_detail_pdf.php index 73d5d1504..846fc64eb 100644 --- a/include/export_fiche_detail_pdf.php +++ b/include/export/export_fiche_detail_pdf.php @@ -23,14 +23,14 @@ * \brief send the account list in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("class_acc_account_ledger.php"); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +include_once("class/class_acc_account_ledger.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; $gDossier=dossier::id(); $cn=new Database($gDossier); diff --git a/include/export_fiche_pdf.php b/include/export/export_fiche_pdf.php similarity index 96% rename from include/export_fiche_pdf.php rename to include/export/export_fiche_pdf.php index 73c4925ce..2e31622fa 100644 --- a/include/export_fiche_pdf.php +++ b/include/export/export_fiche_pdf.php @@ -25,12 +25,12 @@ */ 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.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /* Security */ $gDossier=dossier::id(); diff --git a/include/export_follow_up_csv.php b/include/export/export_follow_up_csv.php similarity index 95% rename from include/export_follow_up_csv.php rename to include/export/export_follow_up_csv.php index 0fa1323f1..3f40aceb3 100644 --- a/include/export_follow_up_csv.php +++ b/include/export/export_follow_up_csv.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="action-gestion.csv"',FALSE); diff --git a/include/export_form_csv.php b/include/export/export_form_csv.php similarity index 88% rename from include/export_form_csv.php rename to include/export/export_form_csv.php index 6fb205cab..64956d2c8 100644 --- a/include/export_form_csv.php +++ b/include/export/export_form_csv.php @@ -21,16 +21,16 @@ * \brief Send a report in CSV format */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="rapport.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ diff --git a/include/export_form_pdf.php b/include/export/export_form_pdf.php similarity index 88% rename from include/export_form_pdf.php rename to include/export/export_form_pdf.php index 5bb8e12cf..7ebbf9597 100644 --- a/include/export_form_pdf.php +++ b/include/export/export_form_pdf.php @@ -23,15 +23,15 @@ * \brief Send a report in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("class_acc_report.php"); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_user.php'; +include_once("class/class_acc_report.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/class/class_user.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; $gDossier=dossier::id(); diff --git a/include/export_gl_csv.php b/include/export/export_gl_csv.php similarity index 94% rename from include/export_gl_csv.php rename to include/export/export_gl_csv.php index 2e40e610a..b1e5aa6e7 100644 --- a/include/export_gl_csv.php +++ b/include/export/export_gl_csv.php @@ -23,13 +23,13 @@ * \brief create GL comptes as PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once('class_acc_account_ledger.php'); -include_once('ac_common.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once('class_impress.php'); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +include_once('class/class_acc_account_ledger.php'); +include_once('lib/ac_common.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once('lib/class_impress.php'); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="gl_comptes.csv"',FALSE); diff --git a/include/export_gl_pdf.php b/include/export/export_gl_pdf.php similarity index 94% rename from include/export_gl_pdf.php rename to include/export/export_gl_pdf.php index eed2fe5bd..3aafae240 100644 --- a/include/export_gl_pdf.php +++ b/include/export/export_gl_pdf.php @@ -23,14 +23,14 @@ * \brief create GL comptes as PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once('class_acc_account_ledger.php'); -include_once('ac_common.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once('class_impress.php'); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +include_once('class/class_acc_account_ledger.php'); +include_once('lib/ac_common.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once('lib/class_impress.php'); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; bcscale(2); $gDossier=dossier::id(); diff --git a/include/export_histo_csv.php b/include/export/export_histo_csv.php similarity index 100% rename from include/export_histo_csv.php rename to include/export/export_histo_csv.php diff --git a/include/export_ledger_csv.php b/include/export/export_ledger_csv.php similarity index 95% rename from include/export_ledger_csv.php rename to include/export/export_ledger_csv.php index a7f94ab1f..240f9c47f 100644 --- a/include/export_ledger_csv.php +++ b/include/export/export_ledger_csv.php @@ -25,15 +25,15 @@ $fDate = date('dmy-Hi'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="jrn-'.$fDate.'.csv"',FALSE); -include_once ("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /* * Variable from $_GET @@ -50,7 +50,7 @@ if ( $get_jrn ==-1 || $get_option == -1 || $get_from_periode == null || $get_to } -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $g_user->Check(); $g_user->check_dossier($gDossier); diff --git a/include/export_ledger_pdf.php b/include/export/export_ledger_pdf.php similarity index 75% rename from include/export_ledger_pdf.php rename to include/export/export_ledger_pdf.php index 52f5ea92a..5722d7a9d 100644 --- a/include/export_ledger_pdf.php +++ b/include/export/export_ledger_pdf.php @@ -26,17 +26,17 @@ */ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier = dossier::id(); -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger.php'; $cn = new Database($gDossier); diff --git a/include/export_poste_detail_csv.php b/include/export/export_poste_detail_csv.php similarity index 95% rename from include/export_poste_detail_csv.php rename to include/export/export_poste_detail_csv.php index c781a28e3..27277c969 100644 --- a/include/export_poste_detail_csv.php +++ b/include/export/export_poste_detail_csv.php @@ -21,15 +21,15 @@ * \brief Send the poste list in csv */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; $fDate=date('dmy-Hi'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="poste-'.$fDate.'-'.$_REQUEST['poste_id'].'.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ diff --git a/include/export_poste_detail_pdf.php b/include/export/export_poste_detail_pdf.php similarity index 95% rename from include/export_poste_detail_pdf.php rename to include/export/export_poste_detail_pdf.php index 3d055cbfc..c9bebc2ae 100644 --- a/include/export_poste_detail_pdf.php +++ b/include/export/export_poste_detail_pdf.php @@ -23,14 +23,14 @@ * \brief send the account list in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; $gDossier=dossier::id(); diff --git a/include/export_rec_csv.php b/include/export/export_rec_csv.php similarity index 81% rename from include/export_rec_csv.php rename to include/export/export_rec_csv.php index da719f587..00e3198eb 100644 --- a/include/export_rec_csv.php +++ b/include/export/export_rec_csv.php @@ -15,10 +15,10 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="'.$filename.'.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; // -------------------------- // Check if all mandatory arg are passed foreach (array('choice','p_end','p_start') as $arg) diff --git a/include/export_reportinit_csv.php b/include/export/export_reportinit_csv.php similarity index 84% rename from include/export_reportinit_csv.php rename to include/export/export_reportinit_csv.php index a078693d7..5b7ef431e 100644 --- a/include/export_reportinit_csv.php +++ b/include/export/export_reportinit_csv.php @@ -25,11 +25,11 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; if ( ! isset($_GET['gDossier']) || ! isset($_GET['f']) ) { diff --git a/include/export_security_pdf.php b/include/export/export_security_pdf.php similarity index 93% rename from include/export_security_pdf.php rename to include/export/export_security_pdf.php index 667b6e015..11f0def5f 100755 --- a/include/export_security_pdf.php +++ b/include/export/export_security_pdf.php @@ -22,18 +22,18 @@ * \brief Print the user security in pdf */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php'; $cn=new Database($gDossier); //----------------------------------------------------- // Security // Check User $rep=new Database(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $User=new User($rep); //----------------------------------------------------- diff --git a/include/export_stock_histo_csv.php b/include/export/export_stock_histo_csv.php similarity index 97% rename from include/export_stock_histo_csv.php rename to include/export/export_stock_histo_csv.php index e47b9a10d..33a629b2d 100644 --- a/include/export_stock_histo_csv.php +++ b/include/export/export_stock_histo_csv.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock.php'; $stock=new Stock($cn); $sql = $stock->create_query_histo($_GET); diff --git a/include/export_stock_resume_list.php b/include/export/export_stock_resume_list.php similarity index 98% rename from include/export_stock_resume_list.php rename to include/export/export_stock_resume_list.php index eccd5e781..51ca30ace 100644 --- a/include/export_stock_resume_list.php +++ b/include/export/export_stock_resume_list.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock.php'; global $cn; // var_dump($_GET); $stock=new Stock($cn); diff --git a/include/ext/dummy/dummy.php b/include/ext/dummy/dummy.php index 5def22b63..8e4308cc7 100755 --- a/include/ext/dummy/dummy.php +++ b/include/ext/dummy/dummy.php @@ -1,10 +1,10 @@ '; @html_page_start($_SESSION['g_theme']); diff --git a/include/extension_get.inc.php b/include/extension_get.inc.php index 8ae3d4f34..f98d406fc 100644 --- a/include/extension_get.inc.php +++ b/include/extension_get.inc.php @@ -3,16 +3,16 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; require_once NOALYSS_INCLUDE.'/constant.security.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; /** * included from do.php + extension_choice.inc.php diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 36b97cbd3..199e405bc 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -22,9 +22,9 @@ * \brief printing of category of card : balance, historic */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; $gDossier = dossier::id(); $cn = new Database($gDossier); @@ -282,7 +282,7 @@ if (isDate($_REQUEST['start']) == null || isDate($_REQUEST['end']) == null) /*************************************************************************************************************************/ if ( $_GET['histo'] == 6) { - require_once NOALYSS_INCLUDE.'/class_balance_age.php'; + require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $bal=new Balance_Age($cn); $export_csv = ''; $export_csv .=HtmlInput::request_to_hidden(array('gDossier','ac','p_let','p_date_start')); @@ -318,7 +318,7 @@ if ( $_GET['histo'] == 6) /*************************************************************************************************************************/ if ( $_GET['histo'] == 7) { - require_once NOALYSS_INCLUDE.'/class_balance_age.php'; + require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $bal=new Balance_Age($cn); $export_csv = ''; $export_csv .=HtmlInput::request_to_hidden(array('gDossier','ac','p_let','p_date_start')); diff --git a/include/fiche_def.inc.php b/include/fiche_def.inc.php index 789b83ece..6200eb2e9 100644 --- a/include/fiche_def.inc.php +++ b/include/fiche_def.inc.php @@ -18,8 +18,8 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; /*! \file * \brief Let customise the fiche_def_ref for the user diff --git a/include/forecast.inc.php b/include/forecast.inc.php index 18836ccab..db7cfcf72 100644 --- a/include/forecast.inc.php +++ b/include/forecast.inc.php @@ -25,7 +25,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anticipation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anticipation.php'; $action=HtmlInput::default_value_get('action',''); echo '
    '; diff --git a/include/header_print.php b/include/header_print.php index d940f2bd3..382407f85 100644 --- a/include/header_print.php +++ b/include/header_print.php @@ -24,9 +24,9 @@ * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; date_default_timezone_set ('Europe/Brussels'); diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index e08fca24b..8e615ae0e 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -28,10 +28,10 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; global $g_user,$cn; $p_array = $_GET; $ledger_type=HtmlInput::default_value_get("ledger_type", 'ALL'); diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index 5eb256038..0a946eecb 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_bilan.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_bilan.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; //ini_set("memory_limit","150M"); /*! \file @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class_exercice.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; global $g_user; //----------------------------------------------------- // Form diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index 015d62ada..4fdc77c84 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -18,11 +18,11 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; /*! \file * \brief Print account (html or pdf) * file included from user_impress @@ -33,7 +33,7 @@ require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; global $g_user; //----------------------------------------------------- // Form @@ -110,7 +110,7 @@ echo '
    '; //----------------------------------------------------- if ( isset( $_REQUEST['bt_html'] ) ) { - require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; echo '
    '; echo Acc_Account_Ledger::HtmlTableHeader("gl_comptes"); echo '
    '; diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index aefb0e5ba..fbfcc5120 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -22,18 +22,18 @@ * \brief ask for Printing the ledger (pdf,html) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; load_all_script(); $gDossier = dossier::id(); global $g_user; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; if ($g_user->Admin() == 0 && $g_user->is_local_admin() == 0) { @@ -145,7 +145,7 @@ echo '
    '; //----------------------------------------------------- if (isset($_REQUEST['bt_html'])) { - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $d = var_export($_GET, true); $Jrn = new Acc_Ledger($cn, $_GET['jrn_id']); diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index 9301503b4..8edf1fe28 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -18,11 +18,11 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; /*! \file * \brief Print account (html or pdf) * file included from user_impress @@ -33,8 +33,8 @@ require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user; //----------------------------------------------------- @@ -129,7 +129,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) echo alert(_('Date malformée, désolée')); return; } - require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; $go=0; // we ask a poste_id if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) != 0 ) @@ -149,7 +149,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) } if ( strlen(trim($_GET['f_id'])) != 0 ) { - require_once NOALYSS_INCLUDE.'/class_fiche.php'; + require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; // thanks the qcode we found the poste account $fiche=new Fiche($cn); $qcode=$fiche->get_by_qcode($_GET['f_id']); diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index d7dae649a..39a5245c6 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -23,11 +23,11 @@ * some variable are already defined ($cn, $g_user ...) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; global $g_user; //----------------------------------------------------- // If print is asked @@ -161,7 +161,7 @@ if ( isset( $_GET['bt_html'] ) ) //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; $ret=$cn->make_array("select fr_id,fr_label from formdef order by fr_label"); diff --git a/include/impress_rec.inc.php b/include/impress_rec.inc.php index 608f09da1..f24467313 100644 --- a/include/impress_rec.inc.php +++ b/include/impress_rec.inc.php @@ -23,8 +23,8 @@ * \brief print the all the operation reconciled or not, with or without the same amount */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; global $g_user; /** diff --git a/include/lettering.account.inc.php b/include/lettering.account.inc.php index 6755924b9..80722594b 100644 --- a/include/lettering.account.inc.php +++ b/include/lettering.account.inc.php @@ -24,7 +24,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; echo '
    '; echo '