diff --git a/html/ajax.php b/html/ajax.php index d955a0749..542cec329 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -15,8 +15,9 @@ if ( !isset ($_REQUEST['gDossier'])) exit(); mb_internal_encoding("UTF-8"); $cn=new Database(dossier::id()); -$user=new User($cn); -$user->check(true); +global $g_user; +$g_user=new User($cn); +$g_user->check(true); /* if a code has been asked */ if (isset($_REQUEST['plugin_code']) ) diff --git a/html/ajax_card.php b/html/ajax_card.php index 92ea7ec1c..dbb36c0f6 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -87,9 +87,10 @@ set_language(); ajax_disconnected($_REQUEST['ctl']); $cn=new Database($gDossier); -$user=new User($cn); -$user->check(true); -$user->check_dossier($gDossier,true); +global $g_user; +$g_user=new User($cn); +$g_user->check(true); +$g_user->check_dossier($gDossier,true); $html=var_export($_REQUEST,true); switch($op) { @@ -97,7 +98,7 @@ switch($op) /* Remove a attribut */ /* ------------------------------------------------------------ */ case 'rmfa': - if ($user->check_action(FICCAT)==0)exit(); + if ($g_user->check_action(FICCAT)==0)exit(); ob_start(); if( ! isset($_GET['ad_id']) || isNumber($_GET['ad_id']) ==0) throw new Exception ( "Parametre ad_id est invalide",11); @@ -130,7 +131,7 @@ case 'dc': if ( $qcode != '') { $f->get_by_qcode($qcode); - $can_modify=$user->check_action(FIC); + $can_modify=$g_user->check_action(FIC); if ( isset($ro) ) { $can_modify=0; @@ -176,7 +177,7 @@ case 'dc': /* Blank card */ /* ------------------------------------------------------------ */ case 'bc': - if ( $user->check_action(FICADD)==1 ) + if ( $g_user->check_action(FICADD)==1 ) { $r=''; $r=HtmlInput::anchor_close($ctl); @@ -285,7 +286,7 @@ case 'st': case 'sc': $html=HtmlInput::anchor_close($ctl); $html.=h2info('Nouvelle fiche'); - if ( $user->check_action(FICADD)==1 ) + if ( $g_user->check_action(FICADD)==1 ) { $f=new Fiche($cn); $f->insert($fd_id,$_POST); @@ -375,7 +376,7 @@ case 'fs': $html=$r; break; case 'ac': - if ( $user->check_action(FICCAT)==1 ) + if ( $g_user->check_action(FICCAT)==1 ) { /*---------------------------------------------------------------------- @@ -433,7 +434,7 @@ case 'scc': * *----------------------------------------------------------------------*/ $html=''; - if ( $user->check_action(FICCAT) == 1 ) + if ( $g_user->check_action(FICCAT) == 1 ) { $script=create_script("removeDiv('$ctl')"); $html.=$script; @@ -468,7 +469,7 @@ case 'upc': $html=HtmlInput::anchor_close($ctl); $html.=h2info('Détail fiche'); - if ( $user->check_action(FICADD)==0 ) + if ( $g_user->check_action(FICADD)==0 ) { $html.=alert(_('Action interdite'),true); } diff --git a/html/ajax_history.php b/html/ajax_history.php index 19ba4b4d7..f8f34d48e 100644 --- a/html/ajax_history.php +++ b/html/ajax_history.php @@ -38,12 +38,10 @@ mb_internal_encoding("UTF-8"); *if $_SESSION['g_user'] is not set : echo a warning */ ajax_disconnected($div); - -//var_dump($_GET); -$cn=new Database(dossier::id()); -$user=new User($cn); +global $g_user; +$g_user=new User($cn); /* security */ -if ( $user->check_dossier(dossier::id(),true) == 'X' ) exit(); +if ( $g_user->check_dossier(dossier::id(),true) == 'X' ) exit(); $from_div=(isset ($_REQUEST['ajax']))?1:0; @@ -55,7 +53,7 @@ if ( isset($_GET['f_id'])) $exercice=new Exercice($cn); $old=''; $fiche=new Fiche($cn,$_GET['f_id']); - $year=$user->get_exercice(); + $year=$g_user->get_exercice(); if ( $year == 0 ) { $html="erreur aucune période par défaut, allez dans préférence pour en choisir une"; @@ -125,7 +123,7 @@ if ( isset($_GET['f_id'])) if ( isset($_REQUEST['pcm_val'])) { $poste=new Acc_Account_Ledger($cn,$_REQUEST['pcm_val']); - $year=$user->get_exercice(); + $year=$g_user->get_exercice(); if ( $year == 0 ) { $html="erreur aucune période par défaut, allez dans préférence pour en choisir une"; diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index dc4f4d3d2..63ec3df8d 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -64,9 +64,10 @@ $cn=new Database(dossier::id()); $g_parameter=new Own($cn); // check if the user is valid and can access this folder -$User=new User($cn); -$User->check(); -if ( $User->check_dossier(dossier::id(),true)=='X' ) +global $g_user; +$g_user=new User($cn); +$g_user->check(); +if ( $g_user->check_dossier(dossier::id(),true)=='X' ) { ob_start(); require_once ('template/ledger_detail_forbidden.php'); @@ -90,7 +91,7 @@ EOF; $op=new Acc_Operation($cn); $op->jr_id=$_REQUEST['jr_id']; $ledger=$op->get_ledger(); -$access=$User->get_ledger_access($ledger); +$access=$g_user->get_ledger_access($ledger); if ( $access == 'X' ) { ob_start(); diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 913a5e359..d5ed12b59 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -57,22 +57,21 @@ if ($cont != 0) exit(); extract($_REQUEST); set_language(); - -$cn = new Database($gDossier); -$user = new User($cn); -$user->check(true); -$user->check_dossier($gDossier, true); -$html = var_export($_REQUEST, true); global $g_user; -$g_user=$user; +$cn = new Database($gDossier); +$g_user = new User($cn); +$g_user->check(true); +$g_user->check_dossier($gDossier, true); +$html = var_export($_REQUEST, true); + switch ($op) { case "remove_anc": - if ($user->check_module('ANCODS') == 0) exit(); + if ($g_user->check_module('ANCODS') == 0) exit(); $cn->exec_sql("delete from operation_analytique where oa_group=$1", array($_GET['oa'])); break; case "rm_stock": - if ($user->check_module('STOCK') == 0) exit(); + if ($g_user->check_module('STOCK') == 0) exit(); require_once('constant.security.php'); $cn->exec_sql('delete from stock_goods where sg_id=$1', array($s_id)); $html = escape_xml($s_id); @@ -133,7 +132,7 @@ EOF; case 'rem_cat_doc': require_once('class_document_type.php'); // if user can not return error message - if ($user->check_action(PARCATDOC) == 0) + if ($g_user->check_action(PARCATDOC) == 0) { $html = "nok"; header('Content-type: text/xml; charset=UTF-8'); @@ -264,8 +263,8 @@ EOF; */ case 'dl': require_once('class_lettering.php'); - $exercice = $user->get_exercice(); - if ($user->check_module("LETCARD") == 0 && $user->check_module("LETACC") == 0) exit(); + $exercice = $g_user->get_exercice(); + if ($g_user->check_module("LETCARD") == 0 && $g_user->check_module("LETACC") == 0) exit(); $periode = new Periode($cn); list($first_per, $last_per) = $periode->get_limit($exercice); diff --git a/html/ajax_poste.php b/html/ajax_poste.php index 95b8ffc14..5641ab5e1 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -59,9 +59,10 @@ set_language(); if ( $cont != 0 ) exit(); $cn=new Database(dossier::id()); include_once ("class_user.php"); -$User=new User($cn); -$User->Check(); -if ($User->get_folder_access(dossier::id()) == 'X') exit(); +global $g_user; +$g_user=new User($cn); +$g_user->Check(); +if ($g_user->get_folder_access(dossier::id()) == 'X') exit(); $xml=""; switch ($op) diff --git a/html/ajax_todo_list.php b/html/ajax_todo_list.php index e00e2bacb..0e723c074 100644 --- a/html/ajax_todo_list.php +++ b/html/ajax_todo_list.php @@ -41,9 +41,10 @@ require_once ('class_user.php'); mb_internal_encoding("UTF-8"); $cn= Dossier::connect(); -$user=new User($cn); -$user->check(true); -$user->check_dossier(Dossier::id(),true); +global $g_user; +$g_user=new User($cn); +$g_user->check(true); +$g_user->check_dossier(Dossier::id(),true); ajax_disconnected('add_todo_list'); if (isset($_REQUEST['show'])) diff --git a/html/direct.php b/html/direct.php index bae501119..7f7274df5 100644 --- a/html/direct.php +++ b/html/direct.php @@ -2,10 +2,11 @@ require_once ("class_database.php"); require_once 'class_user.php'; $cn=new Database($_GET['gDossier']); -$user=new User($cn); -$user->Check(); -$user->check_dossier($_GET['gDossier']); -$res=$cn->exec_sql("select code,description from get_profile_menu($1) where code ~* $2 or description ~* $3 limit 8",array($user->login,$_POST['acs'],$_POST['acs'])); +global $g_user; +$g_user=new User($cn); +$g_user->Check(); +$g_user->check_dossier($_GET['gDossier']); +$res=$cn->exec_sql("select code,description from get_profile_menu($1) where code ~* $2 or description ~* $3 limit 8",array($g_user->login,$_POST['acs'],$_POST['acs'])); $nb=Database::num_row($res); echo "