diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 58356a5f386..d9b69e35fcf 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -2,7 +2,7 @@ /* Copyright (C) 2002-2004 Rodolphe Quiedeville * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2005-2008 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2008 Raphael Bertrand (Resultic) * @@ -534,7 +534,6 @@ class Contact extends CommonObject $this->mail = $obj->email; $this->birthday = $this->db->jdate($obj->birthday); - $this->birthday_alert = $obj->birthday_alert; $this->note = $obj->note; $this->default_lang = $obj->default_lang; $this->user_id = $obj->user_id; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 42a6119c611..044fbd74443 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3690,7 +3690,7 @@ class Form } else { - if ($conf->gravatar->enabled && $email) + if (! empty($conf->gravatar->enabled) && $email) { global $dolibarr_main_url_root; $ret.=''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 11a335a39b2..d81d3a3e006 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1177,19 +1177,22 @@ function dol_print_phone($phone,$country="FR",$cid=0,$socid=0,$addlink=0,$separ= if (! empty($addlink)) { - if ($conf->clicktodial->enabled) + if (! empty($conf->clicktodial->enabled)) { if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial(); if (empty($conf->global->CLICKTODIAL_URL)) $urlmask='ErrorClickToDialModuleNotConfigured'; else $urlmask=$conf->global->CLICKTODIAL_URL; + $clicktodial_poste=(! empty($user->clicktodial_poste)?urlencode($user->clicktodial_poste):''); + $clicktodial_login=(! empty($user->clicktodial_login)?urlencode($user->clicktodial_login):''); + $clicktodial_password=(! empty($user->clicktodial_password)?urlencode($user->clicktodial_password):''); // This line is for backward compatibility - $url = sprintf($urlmask, urlencode($phone), urlencode($user->clicktodial_poste), urlencode($user->clicktodial_login), urlencode($user->clicktodial_password)); + $url = sprintf($urlmask, urlencode($phone), $clicktodial_poste, $clicktodial_login, $clicktodial_password); // Thoose lines are for substitution - $substitarray=array('__PHONEFROM__'=>urlencode($user->clicktodial_poste), + $substitarray=array('__PHONEFROM__'=>$clicktodial_poste, '__PHONETO__'=>urlencode($phone), - '__LOGIN__'=>urlencode($user->clicktodial_login), - '__PASS__'=>urlencode($user->clicktodial_password)); + '__LOGIN__'=>$clicktodial_login, + '__PASS__'=>$clicktodial_password); $url = make_substitutions($url, $substitarray); $newphonesav=$newphone; $newphone ='ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE) + if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE)) { $langs->load("ldap"); $head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id; @@ -71,7 +71,7 @@ function user_prepare_head($object) $head[$h][2] = 'guisetup'; $h++; - if ($conf->clicktodial->enabled) + if (! empty($conf->clicktodial->enabled)) { $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id; $head[$h][1] = $langs->trans("ClickToDial"); @@ -85,7 +85,7 @@ function user_prepare_head($object) // $this->tabs = array('entity:-tabname:Title:@mymodule:conditiontoshow:/mymodule/mypage.php?id=__ID__'); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'user'); - if (! $user->societe_id) + if (! empty($user->societe_id)) { $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); @@ -120,7 +120,7 @@ function group_prepare_head($object) $head[$h][2] = 'group'; $h++; - if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE) + if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE)) { $langs->load("ldap"); $head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id; @@ -166,7 +166,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) } $selected_theme=$conf->global->MAIN_THEME; - if (! empty($fuser)) $selected_theme=$fuser->conf->MAIN_THEME; + if (! empty($fuser->conf->MAIN_THEME)) $selected_theme=$fuser->conf->MAIN_THEME; $colspan=2; if ($foruserprofile) $colspan=4; diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 54386047e45..c98aff33804 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -900,7 +900,7 @@ abstract class DolibarrModules if ($resql) { $obj=$this->db->fetch_object($resql); - if ($obj->value) + if (! empty($obj->value) && ! empty($this->rights)) { // Si module actif foreach ($this->rights as $key => $value) diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index 36a951891cb..08af34a7784 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -39,6 +39,7 @@ ConfirmCloseService=Esteu segur de voler tancar aquest servei? ValidateAContract=Validar un contracte ActivateService=Activar el servei ConfirmActivateService=Esteu segur de voler activar aquest servei en data %s? +RefContract=Ref. contracte DateContract=Data contracte DateServiceActivate=Data activació del servei DateServiceUnactivate=Data desactivació del servei diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang index 02e7366f001..02e98c0a52c 100644 --- a/htdocs/langs/ca_ES/install.lang +++ b/htdocs/langs/ca_ES/install.lang @@ -155,7 +155,11 @@ MigrationShippingDelivery2=Actualització de les dades expedicions 2 MigrationFinished=Acabada l'actualització LastStepDesc=Últim pas: Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta. ActivateModule=Activació del mòdul %s -#########= +LinkedElementsInvalidDeleted=han estat eliminats %s enllaços invàlids +NothingToDelete=No s'ha trobat enllaços invàlids +SourceType=Origen +TargetType=Destí +######### # upgrade= MigrationFixData=Correcció de dades desnormalitzades MigrationOrder=Migració de dades de les comandes clients diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang index 0509a2951ae..e81f133a31f 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -39,6 +39,7 @@ ConfirmCloseService=¿Está seguro de querer cerrar este servicio? ValidateAContract=Validar un contrato ActivateService=Activar el servicio ConfirmActivateService=¿Está seguro de querer activar este servicio en fecha %s? +RefContract=Ref. contrato DateContract=Fecha contrato DateServiceActivate=Fecha activación del servicio DateServiceUnactivate=Fecha desactivación del servicio diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang index 3e344427cca..52882e9b7c5 100644 --- a/htdocs/langs/es_ES/install.lang +++ b/htdocs/langs/es_ES/install.lang @@ -155,6 +155,10 @@ MigrationShippingDelivery2=Actualización de los datos de expediciones 2 MigrationFinished=Actualización terminada LastStepDesc=Último paso: Indique aquí la cuenta y la contraseña del primer usuario que usted utilizará para conectarse a la aplicación. No pierda estos identificadores, es la cuenta que permite administrar el resto. ActivateModule=Activación del módulo %s +LinkedElementsInvalidDeleted=han sido eliminados %s enlaces inválidos +NothingToDelete=No se han encontrado enlaces inválidos +SourceType=Origen +TargetType=Destino ######### # upgrade MigrationFixData=Corrección de datos desnormalizados diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 48b388bd971..4ec4d7fbed7 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -1,7 +1,7 @@ * Copyright (c) 2005-2012 Laurent Destailleur - * Copyright (c) 2005-2011 Regis Houssin + * Copyright (c) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -437,7 +437,7 @@ class UserGroup extends CommonObject return; } - if ($this->all_permissions_are_loaded) + if (! empty($this->all_permissions_are_loaded)) { // Si les permissions ont deja ete chargees, on quitte return; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 606dda9c780..bac1632013e 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -1,6 +1,7 @@ - * Copyright (C) 2005-2012 Laurent Destailleur +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2005-2012 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -133,17 +134,17 @@ if ($id) print 'ClickToDial '.$langs->trans("Login").''; print ''; - print ''; + print ''; print ''; print 'ClickToDial '.$langs->trans("Password").''; print ''; - print ''; + print ''; print "\n"; print 'ClickToDial '.$langs->trans("IdPhoneCaller").''; print ''; - print ''; + print ''; print "\n"; print ''; @@ -158,7 +159,7 @@ if ($id) print ''; - if ($user->admin) + if (! empty($user->admin)) { print "".''; print ''; } print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print "\n"; print ''; - print ''; + print ''; print "
ClickToDial URL'; @@ -172,13 +173,13 @@ if ($id) print '
ClickToDial '.$langs->trans("Login").''.$fuser->clicktodial_login.''.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').'
ClickToDial '.$langs->trans("Password").''.preg_replace('/./','*',$fuser->clicktodial_password).''.preg_replace('/./','*',(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'')).'
ClickToDial '.$langs->trans("IdPhoneCaller").''.$fuser->clicktodial_poste.''.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').'
\n"; } @@ -189,7 +190,7 @@ if ($id) */ print '
'; - if ($user->admin && $action <> 'edit') + if (! empty($user->admin) && $action <> 'edit') { print ''.$langs->trans("Modify").''; } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 780422e8246..8d5418636bc 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -32,26 +32,28 @@ require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +if (! empty($conf->ldap->enabled)) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); +if (! empty($conf->adherent->enabled)) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); $id = GETPOST('id','int'); -$action = GETPOST("action"); +$action = GETPOST('action','alpha'); +$confirm = GETPOST('confirm','alpha'); +$subaction = GETPOST('subaction','alpha'); $group = GETPOST("group","int",3); -$confirm = GETPOST("confirm"); +$message=''; // Define value to know what current user can do on users -$canadduser=($user->admin || $user->rights->user->user->creer); -$canreaduser=($user->admin || $user->rights->user->user->lire); -$canedituser=($user->admin || $user->rights->user->user->creer); -$candisableuser=($user->admin || $user->rights->user->user->supprimer); +$canadduser=(! empty($user->admin) || $user->rights->user->user->creer); +$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire); +$canedituser=(! empty($user->admin) || $user->rights->user->user->creer); +$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer); $canreadgroup=$canreaduser; $caneditgroup=$canedituser; if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { - $canreadgroup=($user->admin || $user->rights->user->group_advance->read); - $caneditgroup=($user->admin || $user->rights->user->group_advance->write); + $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read); + $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write); } // Define value to know what current user can do on properties of edited user if ($id) @@ -87,14 +89,14 @@ $form = new Form($db); /** * Actions */ -if ($_GET["subaction"] == 'addrights' && $canedituser) +if ($subaction == 'addrights' && $canedituser) { $edituser = new User($db); $edituser->fetch($id); $edituser->addrights($_GET["rights"]); } -if ($_GET["subaction"] == 'delrights' && $canedituser) +if ($subaction == 'delrights' && $canedituser) { $edituser = new User($db); $edituser->fetch($id); @@ -116,8 +118,6 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser) { if ($id <> $user->id) { - $message=''; - $edituser = new User($db); $edituser->fetch($id); @@ -162,7 +162,6 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser) // Action ajout user if ($action == 'add' && $canadduser) { - $message=""; if (! $_POST["nom"]) { $message='
'.$langs->trans("NameNotDefined").'
'; @@ -286,8 +285,6 @@ if ($action == 'update' && ! $_POST["cancel"]) if ($caneditfield) // Case we can edit all field { - $message=""; - if (! $_POST["nom"]) { $message='
'.$langs->trans("NameNotDefined").'
'; @@ -539,7 +536,9 @@ if (($action == 'create') || ($action == 'adduserldap')) print "
"; print "
"; - if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') + dol_htmloutput_errors($message); + + if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')) { /* * Affiche formulaire d'ajout d'un compte depuis LDAP @@ -589,40 +588,35 @@ if (($action == 'create') || ($action == 'adduserldap')) { $message='
'.$ldap->error.'
'; } - } - dol_htmloutput_errors($message); - - if ($conf->ldap->enabled && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') - { // Si la liste des users est rempli, on affiche la liste deroulante if (is_array($liste)) { - print "\n\n\n"; + print "\n\n\n"; - print '
'; - print ''; - print ''; - print ''; - print '
'; - print $langs->trans("LDAPUsers"); - print ''; - print ''; - print $form->selectarray('users', $liste, '', 1); - print ''; - print ''; - print '
'; - print '
'; + print '
'; + print ''; + print ''; + print ''; + print '
'; + print $langs->trans("LDAPUsers"); + print ''; + print ''; + print $form->selectarray('users', $liste, '', 1); + print ''; + print ''; + print '
'; + print '
'; - print "\n\n\n"; - print '
'; + print "\n\n\n"; + print '
'; } } - print '
'; + print ''; print ''; print ''; - if ($ldap_sid) print ''; + if (! empty($ldap_sid)) print ''; print ''; print ''; @@ -632,52 +626,52 @@ if (($action == 'create') || ($action == 'adduserldap')) // Nom print ''; print ''; // Prenom print ''; print ''; // Login print ''; print ''; $generated_password=''; - if (! $ldap_sid) // ldap_sid is for activedirectory + if (empty($ldap_sid)) // ldap_sid is for activedirectory { require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); $generated_password=getRandomPassword(''); @@ -687,13 +681,13 @@ if (($action == 'create') || ($action == 'adduserldap')) // Mot de passe print ''; print ''; // Administrateur - if ($user->admin) + if (! empty($user->admin)) { print ''; print '
'.$langs->trans("Lastname").''; - if ($ldap_nom) + if (! empty($ldap_nom)) { print ''; print $ldap_nom; } else { - print ''; + print ''; } print '
'.$langs->trans("Firstname").''; - if ($ldap_prenom) + if (! empty($ldap_prenom)) { print ''; print $ldap_prenom; } else { - print ''; + print ''; } print '
'.$langs->trans("Login").''; - if ($ldap_login) + if (! empty($ldap_login)) { print ''; print $ldap_login; } - elseif ($ldap_loginsmb) + elseif (! empty($ldap_loginsmb)) { print ''; print $ldap_loginsmb; } else { - print ''; + print ''; } print '
'.$langs->trans("Password").''; - if ($ldap_sid) + if (! empty($ldap_sid)) { print 'Mot de passe du domaine'; } else { - if ($ldap_pass) + if (! empty($ldap_pass)) { print ''; print preg_replace('/./i','*',$ldap_pass); @@ -707,15 +701,15 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Administrator").''; - print $form->selectyesno('admin',$_POST["admin"],1); + print $form->selectyesno('admin',GETPOST('admin'),1); if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode)) { - if ($conf->use_javascript_ajax) + if (! empty($conf->use_javascript_ajax)) { print '