';
@@ -46,7 +46,7 @@ if ( $g_UserProperty['use_admin'] == 0 ) {
}
}
include_once("fiche_inc.php");
-$cn=DbConnect($g_dossier);
+$cn=DbConnect($_SESSION['g_dossier']);
foreach ($HTTP_GET_VARS as $key=>$element) {
// The value are e_name e_type e_PHPSESSID
${"e_$key"}=$element;
@@ -134,11 +134,11 @@ if ( isset($_POST['add_fiche'])) {
} else { // We have to find it from the database
if ( $e_type == 'deb' ) {
$get='jrn_def_fiche_deb';
- $sql="select $get as fiche from jrn_def where jrn_def_id=$g_jrn";
+ $sql="select $get as fiche from jrn_def where jrn_def_id=".$_SESSION['g_jrn'];
}
if ( $e_type == 'cred' ) {
$get='jrn_def_fiche_cred';
- $sql="select $get as fiche from jrn_def where jrn_def_id=$g_jrn";
+ $sql="select $get as fiche from jrn_def where jrn_def_id=".$_SESSION['g_jrn'];
}
diff --git a/html/fiche_search.php b/html/fiche_search.php
index ce7b84c39..a47d16902 100644
--- a/html/fiche_search.php
+++ b/html/fiche_search.php
@@ -20,13 +20,6 @@
/* $Revision$ */
include_once ("ac_common.php");
include_once ("poste.php");
-html_page_start($g_UserProperty['use_theme']);
-
-if ( ! isset ( $g_dossier ) ) {
- echo "You must choose a Dossier ";
- phpinfo();
- exit -2;
-}
include_once ("postgres.php");
include_once("jrn.php");
/* Admin. Dossier */
@@ -35,10 +28,18 @@ include_once ("class_user.php");
$User=new cl_user($rep);
$User->Check();
+html_page_start($User->theme);
+
+if ( ! isset ( $_SESSION['g_dossier'] ) ) {
+ echo "You must choose a Dossier ";
+ phpinfo();
+ exit -2;
+}
+
include_once ("check_priv.php");
// Get The priv on the selected folder
-if ( $g_UserProperty['use_admin'] == 0 ) {
- $r=CheckAction($g_dossier,$g_user,FICHE_READ);
+if ( $User->admin == 0 ) {
+ $r=CheckAction($_SESSION['g_dossier'],$_SESSION['g_user'],FICHE_READ);
if ($r == 0 ){
/* Cannot Access */
echo '
Vous n\' avez pas accès
';
@@ -74,7 +75,7 @@ function SetData (name_ctl,value,value_2,value_3,value_4,value_5,value_6) {
}
$element) {
@@ -99,12 +100,12 @@ if ( isset ( $_POST['search']) ) {
// Get the field from database
if ( $e_type == 'deb' ) {
$get='jrn_def_fiche_deb';
- $list_fiche=get_list_fiche($cn,$get,$g_jrn);
+ $list_fiche=get_list_fiche($cn,$get,$_SESSION['g_jrn']);
$sql="select * from vw_fiche_attr where fd_id in ( $list_fiche )";
}
if ( $e_type == 'cred' ) {
$get='jrn_def_fiche_cred';
- $list_fiche=get_list_fiche($cn,$get,$g_jrn);
+ $list_fiche=get_list_fiche($cn,$get,$_SESSION['g_jrn']);
$sql="select * from vw_fiche_attr where fd_id in ( $list_fiche )";
}
diff --git a/html/impress.php b/html/impress.php
deleted file mode 100644
index 778cdeea4..000000000
--- a/html/impress.php
+++ /dev/null
@@ -1,134 +0,0 @@
-Check();
-include ("check_priv.php");
-include_once ("top_menu_compta.php");
-ShowMenuCompta($g_dossier,$g_UserProperty);
-
-// $_GET['direct'] if we want to print from
-// the advanced menu in the user interface
-if ( isset ($_GET['direct'])) {
- if ( isset ($g_jrn) ) {
- echo_debug("g_jrn is set --> come from user_profile");
- $p_id=$g_jrn;
- } else {
- if (isset ($_GET["p_id"]) ) {
- $p_id=$_GET["p_id"];
- }
- }
-}
-
-include_once("impress_inc.php");
-ShowMenuComptaRight($g_dossier,$g_UserProperty);
-if ( $g_UserProperty['use_admin'] == 0 ) {
- $r=CheckAction($g_dossier,$g_user,IMP);
- if ($r == 0 ){
- /* Cannot Access */
- NoAccess();
- }
- if ( isset ($_GET["type"])) {
- if ( $type=="jrn") {
- $right=CheckJrn($g_dossier,$g_user,$p_id);
- if ($right == 0 ){
- /* Cannot Access */
- NoAccess();
- exit -1;
- }
- }
- }
-}
-
-$cn=DbConnect($g_dossier);
-
-// if the user has the profile compta show the left menu
-if ( $g_UserProperty['use_usertype'] == 'compta' or
- ! isset ($_GET['direct']))
- ShowMenuJrnUserImp($cn,$g_user,$g_dossier);
-
-// if the user has the profile compta show the left menu
-if ( $g_UserProperty['use_usertype'] == 'user') {
- if ( isset ($_GET['direct'])){
- // Get the jrn_type_id
- include_once('jrn.php');
- $JrnProp=GetJrnProp($g_dossier,$g_jrn);
- $jrn_type=$JrnProp['jrn_def_type'];
-
- // Display available menus
- ShowMenuJrnUser($g_dossier,$g_UserProperty,$jrn_type,$g_jrn);
-
- // display jrn's menu
- include_once('user_menu.php');
- $menu_jrn=u_ShowMenuJrn($cn,$jrn_type);
- echo '
';
- echo $menu_jrn;
- echo '
';
- }
-} // Menu for user's profile when printing from user_jrn
-
-// Ask the period
-if ( isset ( $_GET["action"]) ) {
- echo_debug(" action is set ");
- $a_print=$HTTP_GET_VARS;
- // p_id come from the user interface
- if ( isset($p_id) and isset ( $_GET['direct'])) {
- $a_print['p_id']=$p_id;
- }
- echo '
';
- echo '
Choississez la période
';
- ViewImp($a_print,$cn);
- echo '
';
-}//if ( isset ( $_GET["action"] ))
-
-// The period is given, now show the result
-if ( isset ( $_POST["print"]) ) {
- echo '