diff --git a/html/ajax_extension.php b/html/ajax_extension.php index 7c8e75fef..b5859a2ac 100644 --- a/html/ajax_extension.php +++ b/html/ajax_extension.php @@ -84,7 +84,7 @@ switch($action) { $enable->value=$array; $enable->selected=$ext->get_parameter('enable'); $str_enable=$enable->input(); - $r.='
'; + $r.='
'; $r.='
'; $r.=dossier::hidden(); /* property of the extension */ @@ -97,6 +97,7 @@ switch($action) { array('value'=>'N','label'=>_('Interdit')) ); $array=User::get_list(dossier::id()); + for ($i=0;$ivalue=$ans; diff --git a/html/js/extension.js b/html/js/extension.js index 2163a3b66..193d806b4 100644 --- a/html/js/extension.js +++ b/html/js/extension.js @@ -72,7 +72,7 @@ function extDetail(req){ if ( a.length == 0 ) { var rec=req.responseText;alert ('erreur :'+rec);} var html=answer.getElementsByTagName('code'); var name_ctl=a[0].firstChild.nodeValue+'_content'; - var code_html=html[0].firstChild.nodeValue; + var code_html=getNodeText(html[0]); code_html=unescape_xml(code_html); $(name_ctl).innerHTML=code_html;} catch (e) { diff --git a/html/sec_pdf.php b/html/sec_pdf.php index c4c6626b8..b275edc0f 100755 --- a/html/sec_pdf.php +++ b/html/sec_pdf.php @@ -46,6 +46,21 @@ if ( ! isset($_GET['user_id']) ) return; $SecUser=new User($rep,$_GET['user_id']); +$admin=0; +$access=$SecUser->get_folder_access($gDossier); + +if ( $access == 'L') { + $str='Local Admin';$admin=1; +} elseif ($access=='R') { + $str=' Utilisateur normal'; +} elseif ($access=='P') { + $str=' Extension uniquement'; +} + + +if ( $SecUser->admin==1 ) { + $str=' Super Admin';$admin=1; +} //----------------------------------------------------- @@ -56,11 +71,12 @@ $pdf->setDossierInfo(dossier::name().' Sécurité'); $pdf->AliasNbPages(); $pdf->AddPage(); -$str_user=sprintf("( %d ) %s %s [ %s ]", +$str_user=sprintf("( %d ) %s %s [ %s ] - %s", $SecUser->id, $SecUser->first_name, $SecUser->name, - $SecUser->login); + $SecUser->login, + $str); $pdf->SetFont('DejaVu','B',9); $pdf->Cell(0,7,$str_user,'B',0,'C'); diff --git a/include/class_user.php b/include/class_user.php index f7c7ebfcc..bc74acb22 100644 --- a/include/class_user.php +++ b/include/class_user.php @@ -618,7 +618,7 @@ jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv, $sql="select distinct use_id,use_login,use_first_name,use_name from ac_users left outer join jnt_use_dos using (use_id) where -(dos_id=$1 or use_admin=1) and use_active=1"; +(dos_id=$1 or use_admin=1) and use_active=1 order by use_login,use_name"; $repo=new Database(); $array=$repo->get_array($sql,array($p_dossier)); if ( $repo->size() == 0 ) throw new Exception ('Error inaccessible folder'); diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php index 451eaa491..7c6b0aec1 100644 --- a/include/param_sec.inc.php +++ b/include/param_sec.inc.php @@ -51,9 +51,9 @@ if ( $User->check_action(PARSEC) == 0 ) { $cn=new Database(); /* Show all the users, included local admin */ $user_sql=$cn->exec_sql("select use_id,use_first_name,use_name,use_login,use_admin,priv_priv from ac_users natural join jnt_use_dos ". - " join priv_user on (jnt_id=priv_jnt) where use_login != 'phpcompta' and dos_id=".$gDossier); + " join priv_user on (jnt_id=priv_jnt) where use_login != 'phpcompta' and dos_id=".$gDossier.' order by use_login,use_name'); $MaxUser=Database::num_row($user_sql); - +if ( ! isset($_REQUEST['action'])) { echo '
'; echo ''; @@ -62,7 +62,9 @@ for ($i = 0;$i < $MaxUser;$i++) { // echo ''; if ( $i % 3 == 0 && $i != 0) echo ""; - $str=($l_line['priv_priv'] == 'L')?'Local Admin':' Utilisateur normal'; + $str=($l_line['priv_priv'] == 'L')?'Local Admin':' '; + $str=($l_line['priv_priv'] == 'P')?'Uniquement Extension':$str; + $str=($l_line['priv_priv'] == 'R')?'Utilisateur Normal':$str; if ( $l_line['use_admin'] == 1 ) $str=' Super Admin'; @@ -76,6 +78,7 @@ for ($i = 0;$i < $MaxUser;$i++) { } echo ""; echo '
'; +} $action=""; if ( isset ($_GET["action"] )) { @@ -142,20 +145,25 @@ if ( $action == "view" ) { $cn=new Database(); $User=new User($cn,$_GET['user_id']); - - echo '

'.h($User->first_name).' '.h($User->name).' '.hi($User->login); - $access=$User->get_folder_access($gDossier); - $admin=0; + $access=$User->get_folder_access($gDossier); + if ( $access == 'L') { $str='Local Admin';$admin=1; - } else { - $str=' Utilisateur normal';} + } elseif ($access=='R') { + $str=' Utilisateur normal'; + } elseif ($access=='P') { + $str=' Extension uniquement'; + } + if ( $User->admin==1 ) { $str=' Super Admin';$admin=1; } + echo '

'.h($User->first_name).' '.h($User->name).' '.hi($User->login)."($str)

"; + + if ( $admin != 0 ) { echo '

Cet utilisateur est administrateur, il a tous les droits

'; exit(); @@ -167,6 +175,7 @@ if ( $action == "view" ) { $action=""; return; } + //-------------------------------------------------------------------------------- // Show access for journal //-------------------------------------------------------------------------------- @@ -183,6 +192,8 @@ if ( $action == "view" ) { echo HtmlInput::button('Imprime','imprime',"onclick=\"window.open('".$sHref."');\""); echo HtmlInput::submit('ok','Sauve'); echo HtmlInput::reset('Annule'); + echo HtmlInput::button_anchor('Retour à la liste','?p_action=sec&'.dossier::get(),'retour'); + echo dossier::hidden(); echo HtmlInput::hidden('action','sec'); echo HtmlInput::hidden('user_id',$_GET['user_id']); diff --git a/include/template/extension-sec.php b/include/template/extension-sec.php index 7c232450f..ba15bbf59 100644 --- a/include/template/extension-sec.php +++ b/include/template/extension-sec.php @@ -1,4 +1,4 @@ -
+