diff --git a/html/admin/setup.php b/html/admin/setup.php index 694662561..5bcce2d3f 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -14,7 +14,7 @@ color:darkblue; margin-left : 50px; margin-right: 50px; - background-color: #e1edf7; + background-color: #F8F8FF; } h1 { font-size: 120%; @@ -59,7 +59,7 @@ border-style: solid; border-width: 0px; font-color:blue; - margin:1px 2px 1px 2px; + margin:2px 2px 1px 2px; } .warning,.error { color:red; @@ -68,7 +68,7 @@

- NOALYSS + NOALYSS

✖"; $succeed="✓"; @@ -211,9 +212,9 @@ if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.D // magic_quotes_runtime = Off // magic_quotes_sybase = Off // include_path -require_once '../../include/constant.php'; -require_once('config_file.php'); -require_once('class_database.php'); +require_once NOALYSS_INCLUDE.'/config_file.php'; +require_once NOALYSS_INCLUDE.'/class_database.php'; + if ( defined ("MULTI") && MULTI==1) { create_htaccess();} echo '

Configuration

'; diff --git a/html/ajax.php b/html/ajax.php index 95ed15da2..cab34f086 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -18,7 +18,7 @@ require_once NOALYSS_INCLUDE.'/class_user.php'; require_once NOALYSS_INCLUDE.'/class_extension.php'; if ( !isset ($_REQUEST['gDossier'])) exit(); -require_once 'class_own.php'; +require_once NOALYSS_INCLUDE.'/class_own.php'; mb_internal_encoding("UTF-8"); global $g_user,$cn,$g_parameter; @@ -59,7 +59,7 @@ if (isset($_REQUEST['plugin_code']) ) exit(); } /* call the ajax script */ - require_once('ext'.DIRECTORY_SEPARATOR.dirname(trim($ext->getp('me_file'))).DIRECTORY_SEPARATOR.'ajax.php'); + require_once(NOALYSS_PLUGIN.DIRECTORY_SEPARATOR.dirname(trim($ext->getp('me_file'))).DIRECTORY_SEPARATOR.'ajax.php'); } else { diff --git a/html/ajax_card.php b/html/ajax_card.php index d40552f8f..f3880ee42 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -356,7 +356,7 @@ case 'sc': * *----------------------------------------------------------------------*/ case 'fs': - require_once('class_acc_ledger.php'); + require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; $r=HtmlInput::title_box(_("Détail fiche"), 'search_card'); $r.='
'; $q=new IText('query'); @@ -427,14 +427,14 @@ case 'fs': }//foreach ob_start(); - require_once('template/card_result.php'); + require_once NOALYSS_INCLUDE.'/template/card_result.php'; $r.=ob_get_contents(); ob_end_clean(); $ctl=$ctl.'_content'; $html=$r; break; case 'action_add_concerned_card': - require_once 'ajax_add_concerned_card.php'; + require_once NOALYSS_INCLUDE.'/ajax_add_concerned_card.php'; return; break; case 'action_save_concerned': diff --git a/html/ajax_history.php b/html/ajax_history.php index 03cc669df..0e7792090 100644 --- a/html/ajax_history.php +++ b/html/ajax_history.php @@ -123,7 +123,7 @@ if ( isset($_GET['f_id'])) } ob_start(); - require_once('template/history_top.php'); + require_once NOALYSS_INCLUDE.'/template/history_top.php'; $detail_card=HtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUICKCODE),$fiche->getName()); echo h2( $fiche->getName().'['.$fiche->strAttribut(ATTR_DEF_QUICKCODE).']',' class="title" '); echo '

'.$detail_card.'

'; @@ -195,7 +195,7 @@ if ( isset($_REQUEST['pcm_val'])) } ob_start(); - require_once('template/history_top.php'); + require_once NOALYSS_INCLUDE.'/template/history_top.php'; if ( $poste->HtmlTable($array) == -1) { diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 69b01862a..c1974ca12 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -90,7 +90,7 @@ $g_user->check(); if ( $g_user->check_dossier(dossier::id(),true)=='X' ) { ob_start(); - require_once ('template/ledger_detail_forbidden.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -117,7 +117,7 @@ if ($ledger=="") ob_start(); echo HtmlInput::title_box(_("Information"), $div); - require_once ('template/ledger_detail_forbidden.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -139,7 +139,7 @@ if ( $access == 'X' ) { ob_start(); echo HtmlInput::title_box(_("Information"), $div); - require_once ('template/ledger_detail_forbidden.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -202,19 +202,19 @@ case 'de': if ( $obj==null || $obj->signature == 'ODS' ) { /* only the details */ - require_once('template/ledger_detail_misc.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_misc.php'; } elseif ( $obj->signature=='ACH') { - require_once('template/ledger_detail_ach.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_ach.php'; } elseif ($obj->signature=='FIN') { - require_once('template/ledger_detail_fin.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_fin.php'; } elseif ( $obj->signature=='VEN') { - require_once('template/ledger_detail_ven.php'); + require_once NOALYSS_INCLUDE.'/template/ledger_detail_ven.php'; } } catch (Exception $e) diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 33ffc4599..30485043b 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -112,7 +112,7 @@ switch ($op) case "rm_stock": if ($g_user->check_module('STOCK') == 0) exit(); - require_once('constant.security.php'); + require_once NOALYSS_INCLUDE.'/constant.security.php'; $cn->exec_sql('delete from stock_goods where sg_id=$1', array($s_id)); $html = escape_xml($s_id); header('Content-type: text/xml; charset=UTF-8'); @@ -122,7 +122,7 @@ switch ($op) //-------------------------------------------------- // get the last date of a ledger case 'lastdate': - require_once('class_acc_ledger_fin.php'); + require_once NOALYSS_INCLUDE.'/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('class_acc_ledger_fin.php'); + require_once NOALYSS_INCLUDE.'/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('class_calendar.php'); + require_once NOALYSS_INCLUDE.'/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('class_document_type.php'); + require_once NOALYSS_INCLUDE.'/class_document_type.php'; // if user can not return error message if ($g_user->check_action(PARCATDOC) == 0) { @@ -212,7 +212,7 @@ EOF; return; break; case 'mod_cat_doc': - require_once 'template/document_mod_change.php'; + require_once NOALYSS_INCLUDE.'/template/document_mod_change.php'; break; case 'dsp_tva': $cn = new Database($gDossier); @@ -303,7 +303,7 @@ EOF; * display the lettering */ case 'dl': - require_once('class_lettering.php'); + require_once NOALYSS_INCLUDE.'/class_lettering.php'; $exercice = $g_user->get_exercice(); if ($g_user->check_module("LETCARD") == 0 && $g_user->check_module("LETACC") == 0) exit(); @@ -510,37 +510,37 @@ EOF; EOF; break; case 'mod_doc': - require_once('ajax_mod_document.php'); + require_once NOALYSS_INCLUDE.'/ajax_mod_document.php'; break; case 'input_per': - require_once('ajax_mod_periode.php'); + require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; break; case 'save_per': - require_once('ajax_mod_periode.php'); + require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; break; case 'mod_predf': - require_once('ajax_mod_predf_op.php'); + require_once NOALYSS_INCLUDE.'/ajax_mod_predf_op.php'; break; case 'save_predf': - require_once('ajax_save_predf_op.php'); + require_once NOALYSS_INCLUDE.'/ajax_save_predf_op.php'; break; case 'search_op': - require_once 'search.inc.php'; + require_once NOALYSS_INCLUDE.'/search.inc.php'; break; case 'search_action': - require_once 'ajax_search_action.php'; + require_once NOALYSS_INCLUDE.'/ajax_search_action.php'; break; case 'display_profile': - require_once("ajax_get_profile.php"); + require_once NOALYSS_INCLUDE.'/ajax_get_profile.php'; break; case 'det_menu': - require_once("ajax_get_menu_detail.php"); + require_once NOALYSS_INCLUDE.'/ajax_get_menu_detail.php'; break; case 'add_menu': - require_once 'ajax_add_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax_add_menu.php'; break; case 'cardsearch': - require_once 'ajax_boxcard_search.php'; + require_once NOALYSS_INCLUDE.'/ajax_boxcard_search.php'; break; case 'add_plugin': $me_code = new IText('me_code'); @@ -549,7 +549,7 @@ EOF; $me_description = new IText("me_description"); $me_parameter = new IText("me_parameter"); $new = true; - require_once 'ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; break; case 'mod_plugin': $m = $cn->get_array("select me_code,me_file,me_menu,me_description,me_parameter @@ -566,92 +566,92 @@ 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 'ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; break; case 'saldo': - require_once 'ajax_bank_saldo.php'; + require_once NOALYSS_INCLUDE.'/ajax_bank_saldo.php'; break; case 'up_predef': - require_once 'ajax_update_predef.php'; + require_once NOALYSS_INCLUDE.'/ajax_update_predef.php'; break; case 'upd_receipt': - require_once 'ajax_get_receipt.php'; + require_once NOALYSS_INCLUDE.'/ajax_get_receipt.php'; break; case 'up_pay_method': - require_once 'ajax_update_payment.php'; + require_once NOALYSS_INCLUDE.'/ajax_update_payment.php'; break; case 'openancsearch': case 'resultancsearch': - require_once('ajax_anc_search.php'); + require_once NOALYSS_INCLUDE.'/ajax_anc_search.php'; break; case 'autoanc': - require_once 'ajax_auto_anc_card.php'; + require_once NOALYSS_INCLUDE.'/ajax_auto_anc_card.php'; break; case 'create_menu'; - require_once 'ajax_create_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax_create_menu.php'; break; case 'modify_menu'; - require_once 'ajax_mod_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax_mod_menu.php'; break; case 'mod_stock_repo': - require_once 'ajax_mod_stock_repo.php'; + require_once NOALYSS_INCLUDE.'/ajax_mod_stock_repo.php'; break; case 'view_mod_stock': - require_once 'ajax_view_mod_stock.php'; + require_once NOALYSS_INCLUDE.'/ajax_view_mod_stock.php'; break; case 'fddetail': - require_once 'ajax_fiche_def_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax_fiche_def_detail.php'; break; case 'vw_action': - require_once 'ajax_view_action.php'; + require_once NOALYSS_INCLUDE.'/ajax_view_action.php'; break; case 'minrow': - require_once 'ajax_min_row.php'; + require_once NOALYSS_INCLUDE.'/ajax_min_row.php'; break; case 'navigator': - require_once 'ajax_navigator.php'; + require_once NOALYSS_INCLUDE.'/ajax_navigator.php'; break; case 'preference': - require_once 'ajax_preference.php'; + require_once NOALYSS_INCLUDE.'/ajax_preference.php'; break; case 'bookmark': - require_once 'ajax_bookmark.php'; + require_once NOALYSS_INCLUDE.'/ajax_bookmark.php'; break; case 'tag_detail': - require_once 'ajax_tag_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_detail.php'; break; case 'tag_save': - require_once 'ajax_tag_save.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_save.php'; break; case 'tag_list': - require_once 'ajax_tag_list.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_list.php'; break; case 'tag_add': - require_once 'ajax_tag_add_action.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_add_action.php'; break; case 'tag_remove': - require_once 'ajax_tag_remove_action.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_remove_action.php'; break; case 'tag_choose': - require_once 'ajax_tag_choose.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; break; case 'tag_choose': - require_once 'ajax_tag_choose.php'; + require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; break; case 'search_display_tag': - require_once 'ajax_search_display_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax_search_display_tag.php'; break; case 'search_add_tag': - require_once 'ajax_search_add_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax_search_add_tag.php'; break; case 'search_clear_tag': - require_once 'ajax_search_clear_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax_search_clear_tag.php'; break; case 'calendar_zoom': - require_once 'ajax_calendar_zoom.php'; + require_once NOALYSS_INCLUDE.'/ajax_calendar_zoom.php'; break; case 'ledger_show': - require_once 'ajax_ledger_show.php'; + require_once NOALYSS_INCLUDE.'/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) @@ -670,55 +670,55 @@ EOF; /* * Show the available distribution keys for analytic */ - require_once 'ajax_anc_key_choice.php'; + require_once NOALYSS_INCLUDE.'/ajax_anc_key_choice.php'; break; case 'anc_key_compute': /* * Show the activities computed with the selected distribution key */ - require_once 'ajax_anc_key_compute.php'; + require_once NOALYSS_INCLUDE.'/ajax_anc_key_compute.php'; break; case 'account_update': /** * update an accounting (from CFGPCMN) */ - require_once 'ajax_account_update.php'; + require_once NOALYSS_INCLUDE.'/ajax_account_update.php'; break; // From admin, revoke the access to a folder from an // user case 'folder_remove': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, display a list of folder to which the user has // no access case 'folder_display': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, grant the access to a folder to an // user case 'folder_add': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, display info and propose to drop the folder case 'folder_drop': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, display the information of a folder you can // modify case 'folder_modify': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, display info and propose to drop the template case 'modele_drop': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; // From admin, display the information of a template you can // modify case 'modele_modify': - require_once 'ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; default: diff --git a/html/ajax_poste.php b/html/ajax_poste.php index b76494eed..3204dd1ec 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -60,7 +60,7 @@ set_language(); if ( $cont != 0 ) exit(); $cn=new Database(dossier::id()); -include_once ("class_user.php"); +require_once NOALYSS_INCLUDE.'/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); @@ -105,7 +105,7 @@ case "sf": $r.=''; ob_start(); - require_once('template/account_search.php'); + require_once NOALYSS_INCLUDE.'/template/account_search.php'; $r.=ob_get_contents(); ob_end_clean(); $r.=dossier::hidden(); @@ -181,7 +181,7 @@ case "sf": } ob_start(); - require_once('template/account_result.php'); + require_once NOALYSS_INCLUDE.'/template/account_result.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/html/image/logo6820.png b/html/image/logo6820.png index f3749693d..914fd2ede 100644 Binary files a/html/image/logo6820.png and b/html/image/logo6820.png differ diff --git a/html/index.php b/html/index.php index 23ef6e86c..ee1ed04f3 100644 --- a/html/index.php +++ b/html/index.php @@ -227,7 +227,7 @@ version 6.8.1.5 - '.$my_domain.'
-NOALYSS +NOALYSS


diff --git a/include/config_file.php b/include/config_file.php index f55ae89cf..7bb9f70a1 100644 --- a/include/config_file.php +++ b/include/config_file.php @@ -24,8 +24,8 @@ */ require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/../../include/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/../../include/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; function is_unix() { diff --git a/include/constant.php b/include/constant.php index 7727a8685..114737229 100644 --- a/include/constant.php +++ b/include/constant.php @@ -65,7 +65,6 @@ ini_set ('default_charset',"UTF-8"); */ - global $g_captcha,$g_failed,$g_succeed; $g_captcha=false; $g_failed="✖"; diff --git a/include/template/document_mod_change.php b/include/template/document_mod_change.php index e5fc6ee73..c5a84230f 100644 --- a/include/template/document_mod_change.php +++ b/include/template/document_mod_change.php @@ -21,7 +21,7 @@ /**\file * \brief this file respond to an ajax request to modify a type of document */ -require_once 'class_document_type.php'; +require_once NOALYSS_INCLUDE.'/class_document_type.php'; echo HtmlInput::title_box(_('Type de document'),'change_doc_div'); $doc_type=new Document_type($cn,$dt_id); diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index 9741a7be9..9ead4ece6 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -2,10 +2,10 @@ //This file is part of NOALYSS and is under GPL //see licence.txt $str_anc=""; -?> +?>
@@ -250,6 +250,6 @@ $str_anc="";
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index 30729da2d..aca4c5c61 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -230,7 +230,7 @@ echo ''; diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index 2e938abe3..e3b5fcdf4 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -2,13 +2,13 @@ //This file is part of NOALYSS and is under GPL //see licence.txt $str_anc=""; -?> +?>
@@ -141,6 +141,6 @@ echo td(_('Pièce')).td($itext->input()); ?>
\ No newline at end of file diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index 5bc33ed1a..8e2bcbcf0 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -2,14 +2,14 @@ //This file is part of NOALYSS and is under GPL //see licence.txt ?>
@@ -86,7 +86,7 @@ require_once ('class_anc_plan.php');
@@ -187,6 +187,6 @@ $amount_idx=0;
diff --git a/include/template/ledger_detail_top.php b/include/template/ledger_detail_top.php index ce6e4af27..4118d811f 100644 --- a/include/template/ledger_detail_top.php +++ b/include/template/ledger_detail_top.php @@ -20,5 +20,5 @@ det->jr_internal); ?>
- \ No newline at end of file diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index f7e4d5788..4ba39d4dc 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -1,7 +1,7 @@ +?>
@@ -252,5 +252,5 @@ echo $ipaid->input();
diff --git a/include/template/letter_all.php b/include/template/letter_all.php index 10fe63c9a..836809f08 100644 --- a/include/template/letter_all.php +++ b/include/template/letter_all.php @@ -2,8 +2,8 @@ //This file is part of NOALYSS and is under GPL //see licence.txt ?>content) == 0 ) : diff --git a/include/template/menu_detail.php b/include/template/menu_detail.php index eeb243e22..4fa68747a 100644 --- a/include/template/menu_detail.php +++ b/include/template/menu_detail.php @@ -2,8 +2,8 @@ //This file is part of NOALYSS and is under GPL //see licence.txt ?>me_code); if ( $m->me_code != -1) $str_code->setReadOnly (true);