From b88fca55cb44988157c662b3afd79543b963efc5 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Fri, 26 Sep 2008 18:03:56 +0000 Subject: [PATCH] =?UTF-8?q?-=20LStips=20:=20Ajout=20de=20bulles=20d'aide?= =?UTF-8?q?=20=20=20->=20help=5Finfo=20ajout=C3=A9=20dans=20la=20configura?= =?UTF-8?q?tion=20des=20attributs=20-=20LSeepeople=20:=20Ajout=20d'une=20b?= =?UTF-8?q?ulle=20d'aide=20pour=20loginshell=20-=20LSdebug=20:=20Renomage?= =?UTF-8?q?=20des=20fonctions=20attach=C3=A9es=20:=20=20=20=20=20-=20debug?= =?UTF-8?q?()=20->=20LSdebug()=20=20=20=20=20-=20debug=5Fpring()=20->=20LS?= =?UTF-8?q?debug=5Fprint()=20=20=20->=20N=C3=A9toyage=20des=20debug=20dans?= =?UTF-8?q?=20le=20code=20et=20renomage=20quand=20n=C3=A9cessaire.=20=20?= =?UTF-8?q?=20->=20Ajout=20d'une=20fonctionnalit=C3=A9=20de=20dump=20de=20?= =?UTF-8?q?variable=20=C3=A0=20LSdebug()=20-=20LSsession=20:=20Correction?= =?UTF-8?q?=20d'un=20probl=C3=A8me=20de=20chemin=20pour=20les=20scripts=20?= =?UTF-8?q?JS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LSobjects/config.LSobjects.LSeepeople.php | 1 + trunk/includes/addons/LSaddons.samba.php | 1 - .../class/class.LSattr_html_select_list.php | 1 - .../class/class.LSattr_html_select_object.php | 2 - trunk/includes/class/class.LSform.php | 2 +- trunk/includes/class/class.LSformElement.php | 3 ++ .../class/class.LSformElement_image.php | 1 - .../class/class.LSformRule_imagesize.php | 1 - trunk/includes/class/class.LSldap.php | 6 +-- trunk/includes/class/class.LSldapObject.php | 12 +++--- trunk/includes/class/class.LSsession.php | 39 ++++++++++-------- trunk/includes/functions.php | 18 +++++--- trunk/includes/js/LSform.js | 1 + trunk/index_ajax.php | 4 +- trunk/select.php | 8 ++-- trunk/templates/create.tpl | 2 +- trunk/templates/css/LSform.css | 20 +++++++++ trunk/templates/images/help.png | Bin 0 -> 786 bytes trunk/templates/modify.tpl | 2 +- trunk/view.php | 8 ++-- 20 files changed, 80 insertions(+), 52 deletions(-) create mode 100644 trunk/templates/images/help.png diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php index d3e05760..91c4b148 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php @@ -222,6 +222,7 @@ $GLOBALS['LSobjects']['LSeepeople'] = array ( ), 'loginShell' => array ( 'label' => _('Interpreteur de commande'), + 'help_info' => _("Permet ou non a l'utilisateur de se connecter à un système POSIX."), 'ldap_type' => 'boolean', 'html_type' => 'boolean', 'required' => 1, diff --git a/trunk/includes/addons/LSaddons.samba.php b/trunk/includes/addons/LSaddons.samba.php index 769c1392..20a9284a 100644 --- a/trunk/includes/addons/LSaddons.samba.php +++ b/trunk/includes/addons/LSaddons.samba.php @@ -187,7 +187,6 @@ } $password = $ldapObject -> attrs[ LS_SAMBA_USERPASSWORD_ATTR ] -> ldap -> getClearPassword(); - debug('pwd : '.$password); $sambapassword = new smbHash; $sambaNTPassword = $sambapassword -> nthash($password); diff --git a/trunk/includes/class/class.LSattr_html_select_list.php b/trunk/includes/class/class.LSattr_html_select_list.php index c82859e2..5e94d99f 100644 --- a/trunk/includes/class/class.LSattr_html_select_list.php +++ b/trunk/includes/class/class.LSattr_html_select_list.php @@ -61,7 +61,6 @@ class LSattr_html_select_list extends LSattr_html{ $regex_check_data.='|^'.preg_quote($val,'/').'$'; } $regex_check_data.='/'; - debug($this -> name.' : < '.$regex_check_data." >
",$GLOBALS['debug_stat']); $form -> addRule($this -> name, 'regex', array('msg'=> 'Valeur incorrect','params' => array('regex' => $regex_check_data)) ); // On retourne un pointeur vers l'element ajouter return $element; diff --git a/trunk/includes/class/class.LSattr_html_select_object.php b/trunk/includes/class/class.LSattr_html_select_object.php index 06877518..7ff9ef99 100644 --- a/trunk/includes/class/class.LSattr_html_select_object.php +++ b/trunk/includes/class/class.LSattr_html_select_object.php @@ -102,7 +102,6 @@ class LSattr_html_select_object extends LSattr_html{ $filter.='('.$conf['value_attribute'].'='.$val.')'; } $filter.=')'; - debug($filter); $obj = new $conf['object_type'](); $list = $obj -> listObjects($filter); } @@ -122,7 +121,6 @@ class LSattr_html_select_object extends LSattr_html{ } } else { - debug($values); return false; } $_SESSION['LSselect'][$conf['object_type']]=$DNs; diff --git a/trunk/includes/class/class.LSform.php b/trunk/includes/class/class.LSform.php index fcf78c4d..c81a48b0 100644 --- a/trunk/includes/class/class.LSform.php +++ b/trunk/includes/class/class.LSform.php @@ -189,7 +189,7 @@ class LSform { if (!$this -> checkData()) { return; } - debug("les données sont checkées"); + LSdebug("les données sont checkées"); $this -> _isValidate = true; return true; } diff --git a/trunk/includes/class/class.LSformElement.php b/trunk/includes/class/class.LSformElement.php index d9734824..2bb7dde9 100644 --- a/trunk/includes/class/class.LSformElement.php +++ b/trunk/includes/class/class.LSformElement.php @@ -204,6 +204,9 @@ class LSformElement { $return['required']=true; } $return['label'] = $this -> getLabel(); + if (isset($this -> params['help_info'])) { + $return['help_info']=$this -> params['help_info']; + } return $return; } diff --git a/trunk/includes/class/class.LSformElement_image.php b/trunk/includes/class/class.LSformElement_image.php index 5cbe0877..37db55b3 100644 --- a/trunk/includes/class/class.LSformElement_image.php +++ b/trunk/includes/class/class.LSformElement_image.php @@ -86,7 +86,6 @@ class LSformElement_image extends LSformElement { } if (is_uploaded_file($_FILES[$this -> name]['tmp_name'])) { - debug($_FILES[$this -> name]['tmp_name']); $fp = fopen($_FILES[$this -> name]['tmp_name'], "r"); $buf = fread($fp, filesize($_FILES[$this -> name]['tmp_name'])); fclose($fp); diff --git a/trunk/includes/class/class.LSformRule_imagesize.php b/trunk/includes/class/class.LSformRule_imagesize.php index 2de06abe..5b69ed90 100644 --- a/trunk/includes/class/class.LSformRule_imagesize.php +++ b/trunk/includes/class/class.LSformRule_imagesize.php @@ -42,7 +42,6 @@ class LSformRule_imagesize extends LSformRule { */ function validate ($value,$options,$formElement) { $file = $GLOBALS['LSsession'] -> getTmpFile($value); - debug('Verify : '.$file.' - Options : '.print_r($options,true)); list($width, $height, $type, $attr) = getimagesize($file); if (is_int($options['param']['maxWidth'])) { diff --git a/trunk/includes/class/class.LSldap.php b/trunk/includes/class/class.LSldap.php index 1cff6aa7..1fb9885f 100644 --- a/trunk/includes/class/class.LSldap.php +++ b/trunk/includes/class/class.LSldap.php @@ -253,7 +253,7 @@ class LSldap { * @retval boolean true si l'objet a bien été mis à jour, false sinon */ function update($object_type,$dn,$change) { - debug($change); + LSdebug($change); $dropAttr=array(); $entry=$this -> getEntry($object_type,$dn); if (is_array($entry)) { @@ -286,8 +286,8 @@ class LSldap { } } $entry -> replace($changeData); - debug('change : 
'.print_r($changeData,true).'
'); - debug('drop : 
'.print_r($dropAttr,true).'
'); + LSdebug('change : 
'.print_r($changeData,true).'
'); + LSdebug('drop : 
'.print_r($dropAttr,true).'
'); if ($new) { $ret = $this -> cnx -> add($entry); diff --git a/trunk/includes/class/class.LSldapObject.php b/trunk/includes/class/class.LSldapObject.php index f15acb04..cc998404 100644 --- a/trunk/includes/class/class.LSldapObject.php +++ b/trunk/includes/class/class.LSldapObject.php @@ -303,7 +303,7 @@ class LSldapObject { } } if($this -> validateAttrsData($idForm)) { - debug("les données sont validées"); + LSdebug("les données sont validées"); if(isset($this -> config['before_modify'])) { if(function_exists($this -> config['before_modify'])) { if(!$this -> config['before_modify']($this)) { @@ -317,7 +317,7 @@ class LSldapObject { } } if ($this -> submitChange($idForm)) { - debug('Les modifications sont submitées'); + LSdebug('Les modifications sont submitées'); $this -> submitError = false; $this -> reloadData(); $this -> refreshForm($idForm); @@ -517,7 +517,7 @@ class LSldapObject { if(($attr -> isUpdate())&&($attr -> isValidate())) { if(($attr -> name == $this -> config['rdn'])&&(!$new)) { $new = true; - debug('Rename'); + LSdebug('Rename'); if (!$this -> beforeRename()) { $GLOBALS['LSerror'] -> addErrorCode(36); return; @@ -547,7 +547,7 @@ class LSldapObject { $dn=$this -> getDn(); if($dn) { $this -> dn=$dn; - debug($submitData); + LSdebug($submitData); if (!$GLOBALS['LSldap'] -> update($this -> getType(),$dn, $submitData)) { return; } @@ -1184,7 +1184,7 @@ class LSldapObject { * @retval True en cas de cas ce succès, False sinon. */ function afterCreate() { - debug('after'); + LSdebug('after'); $error = 0; if ($GLOBALS['LSsession'] -> isSubDnLSobject($this -> getType())) { if (is_array($GLOBALS['LSsession'] -> ldapServer['subDn']['LSobject'][$this -> getType()]['LSobjects'])) { @@ -1193,7 +1193,7 @@ class LSldapObject { if (isset($GLOBALS['LSobjects'][$type]['container_auto_create'])&&isset($GLOBALS['LSobjects'][$type]['container_dn'])) { $dn = $GLOBALS['LSobjects'][$type]['container_dn'].','.$this -> getDn(); if(!$GLOBALS['LSldap'] -> getNewEntry($dn,$GLOBALS['LSobjects'][$type]['container_auto_create']['objectclass'],$GLOBALS['LSobjects'][$type]['container_auto_create']['attrs'],true)) { - debug("Impossible de créer l'entrée fille : ".print_r( + LSdebug("Impossible de créer l'entrée fille : ".print_r( array( 'dn' => $dn, 'objectClass' => $GLOBALS['LSobjects'][$type]['container_auto_create']['objectclass'], diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php index 9650c96e..41dae7a0 100644 --- a/trunk/includes/class/class.LSsession.php +++ b/trunk/includes/class/class.LSsession.php @@ -311,7 +311,7 @@ class LSsession { } if ($nbresult==0) { // identifiant incorrect - debug('identifiant incorrect'); + LSdebug('identifiant incorrect'); $GLOBALS['LSerror'] -> addErrorCode(1006); } else if ($nbresult>1) { @@ -320,9 +320,9 @@ class LSsession { } else { if (isset($_GET['LSsession_recoverPassword'])) { - debug('Recover : Id trouvé'); + LSdebug('Recover : Id trouvé'); if ($this -> ldapServer['recoverPassword']) { - debug('Récupération active'); + LSdebug('Récupération active'); $user=$result[0]; $emailAddress = $user -> getValue($this -> ldapServer['recoverPassword']['mailAttr']); $emailAddress = $emailAddress[0]; @@ -337,7 +337,7 @@ class LSsession { } if (checkEmail($emailAddress)) { - debug('Email : '.$emailAddress); + LSdebug('Email : '.$emailAddress); $this -> dn = $user -> getDn(); // 1ère étape : envoie du recoveryHash if (!isset($_GET['recoveryHash'])) { @@ -378,19 +378,19 @@ class LSsession { } else { // Problème durant l'envoie du mail - debug("Problème durant l'envoie du mail"); + LSdebug("Problème durant l'envoie du mail"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } else { // Erreur durant la mise à jour de l'objet - debug("Erreur durant la mise à jour de l'objet"); + LSdebug("Erreur durant la mise à jour de l'objet"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } else { // Erreur durant la validation du formulaire de modification de perte de password - debug("Erreur durant la validation du formulaire de modification de perte de password"); + LSdebug("Erreur durant la validation du formulaire de modification de perte de password"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } @@ -399,7 +399,7 @@ class LSsession { $attr=$user -> attrs[$this -> ldapServer['authobject_pwdattr']]; if ($attr instanceof LSattribute) { $mdp = generatePassword($attr -> config['html_options']['chars'],$attr -> config['html_options']['lenght']); - debug('Nvx mpd : '.$mdp); + LSdebug('Nvx mpd : '.$mdp); $lostPasswdForm = $user -> getForm('lostPassword'); $lostPasswdForm -> setPostData( array( @@ -423,25 +423,25 @@ class LSsession { } else { // Problème durant l'envoie du mail - debug("Problème durant l'envoie du mail"); + LSdebug("Problème durant l'envoie du mail"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } else { // Erreur durant la mise à jour de l'objet - debug("Erreur durant la mise à jour de l'objet"); + LSdebug("Erreur durant la mise à jour de l'objet"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } else { // Erreur durant la validation du formulaire de modification de perte de password - debug("Erreur durant la validation du formulaire de modification de perte de password"); + LSdebug("Erreur durant la validation du formulaire de modification de perte de password"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } else { // l'attribut password n'existe pas - debug("L'attribut password n'existe pas"); + LSdebug("L'attribut password n'existe pas"); $GLOBALS['LSerror'] -> addErrorCode(1020); } } @@ -468,7 +468,7 @@ class LSsession { } else { $GLOBALS['LSerror'] -> addErrorCode(1006); - debug('mdp incorrect'); + LSdebug('mdp incorrect'); } } } @@ -870,7 +870,10 @@ class LSsession { if (!$script['path']) { $script['path']=LS_JS_DIR; } - $JSscript_txt.="\n"; + else { + $script['path'].='/'; + } + $JSscript_txt.="\n"; } $GLOBALS['Smarty'] -> assign('LSjsConfig',json_encode($this -> _JSconfigParams)); @@ -927,11 +930,11 @@ class LSsession { if ($this -> ajaxDisplay) { $GLOBALS['Smarty'] -> assign('LSerror_txt',$GLOBALS['LSerror']->getErrors()); - $GLOBALS['Smarty'] -> assign('LSdebug_txt',debug_print(true)); + $GLOBALS['Smarty'] -> assign('LSdebug_txt',LSdebug_print(true)); } else { $GLOBALS['LSerror'] -> display(); - debug_print(); + LSdebug_print(); } if (!$this -> template) $this -> setTemplate('empty.tpl'); @@ -960,11 +963,11 @@ class LSsession { } } else { - debug('Impossible de chargé le dn : '.$dn); + LSdebug('Impossible de chargé le dn : '.$dn); } } else { - debug('Impossible de créer l\'objet de type : '.$conf['LSobject']); + LSdebug('Impossible de créer l\'objet de type : '.$conf['LSobject']); } } else { diff --git a/trunk/includes/functions.php b/trunk/includes/functions.php index 56a1704f..95d34945 100644 --- a/trunk/includes/functions.php +++ b/trunk/includes/functions.php @@ -110,7 +110,7 @@ function loadDir($dir,$regexpr='^.*\.php$') { function valid($obj) { - debug('Validation : ok'); + LSdebug('Validation : ok'); return true; } @@ -118,8 +118,14 @@ function return_data($data) { return $data; } -function debug($data,$get=true) { - if ($get) { +function LSdebug($data,$dump=false) { + if ($dump) { + ob_start(); + var_dump($data); + $GLOBALS['LSdebug']['fields'][]=ob_get_contents(); + ob_end_clean(); + } + else { if (is_array($data)||is_object($data)) { $GLOBALS['LSdebug']['fields'][]=$data; } @@ -130,7 +136,7 @@ function debug($data,$get=true) { return true; } -function debug_print($return=false) { +function LSdebug_print($return=false) { if (( $GLOBALS['LSdebug']['fields'] ) && ( $GLOBALS['LSdebug']['active'] )) { $txt='