diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index c8b8b6020d0..b3938e5b3e2 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -32,7 +32,7 @@ $langs->load("admin");
$langs->load("mails");
if (!$user->admin)
- accessforbidden();
+accessforbidden();
$substitutionarrayfortest=array(
'__ID__' => 'TESTIdRecord',
@@ -43,8 +43,8 @@ $substitutionarrayfortest=array(
/*
-* Actions
-*/
+ * Actions
+ */
if (isset($_POST["action"]) && $_POST["action"] == 'update')
{
@@ -72,26 +72,26 @@ if ($_POST['addfile'] || $_POST['addfilehtml'])
if (! empty($_FILES['addedfile']['tmp_name']))
{
- if (! is_dir($upload_dir)) create_exdir($upload_dir);
+ if (! is_dir($upload_dir)) create_exdir($upload_dir);
- if (is_dir($upload_dir))
- {
- if (dol_move_uploaded_file($_FILES['addedfile']['tmp_name'], $upload_dir . "/" . $_FILES['addedfile']['name'],0) > 0)
- {
- $message = ''.$langs->trans("FileTransferComplete").'
';
- //print_r($_FILES);
+ if (is_dir($upload_dir))
+ {
+ if (dol_move_uploaded_file($_FILES['addedfile']['tmp_name'], $upload_dir . "/" . $_FILES['addedfile']['name'],0) > 0)
+ {
+ $message = ''.$langs->trans("FileTransferComplete").'
';
+ //print_r($_FILES);
include_once(DOL_DOCUMENT_ROOT.'/html.formmail.class.php');
$formmail = new FormMail($db);
$formmail->add_attached_files($upload_dir . "/" . $_FILES['addedfile']['name'],$_FILES['addedfile']['name'],$_FILES['addedfile']['type']);
- }
- else
- {
- // Echec transfert (fichier d�passant la limite ?)
- $message = ''.$langs->trans("ErrorFileNotUploaded").'
';
- // print_r($_FILES);
- }
- }
+ }
+ else
+ {
+ // Echec transfert (fichier d�passant la limite ?)
+ $message = ''.$langs->trans("ErrorFileNotUploaded").'
';
+ // print_r($_FILES);
+ }
+ }
}
if ($_POST['addfile']) $_GET["action"]='test';
if ($_POST['addfilehtml']) $_GET["action"]='testhtml';
@@ -101,7 +101,7 @@ if ($_POST['addfile'] || $_POST['addfilehtml'])
* Send mail
*/
if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
- && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel'])
+&& ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel'])
{
$error=0;
@@ -122,9 +122,9 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
$formmail = new FormMail($db);
$attachedfiles=$formmail->get_attached_files();
- $filepath = $attachedfiles['paths'];
- $filename = $attachedfiles['names'];
- $mimetype = $attachedfiles['mimes'];
+ $filepath = $attachedfiles['paths'];
+ $filename = $attachedfiles['names'];
+ $mimetype = $attachedfiles['mimes'];
if (empty($_POST["frommail"]))
{
@@ -138,41 +138,41 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
$_GET["action"]='test';
$error++;
}
- if (! $error)
- {
+ if (! $error)
+ {
// Le message est-il en html
$msgishtml=0; // Message is not HTML
if ($_POST['action'] == 'sendhtml') $msgishtml=1; // Force message to HTML
- // Pratique les substitutions sur le sujet et message
+ // Pratique les substitutions sur le sujet et message
$subject=make_substitutions($subject,$substitutionarrayfortest);
$body=make_substitutions($body,$substitutionarrayfortest);
- require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
+ require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
$mailfile = new CMailFile($subject,$sendto,$email_from,$body,
- $filepath,$mimetype,$filename,
- $sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml,$errors_to);
+ $filepath,$mimetype,$filename,
+ $sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml,$errors_to);
$result=$mailfile->sendfile();
- if ($result)
- {
- $message=''.$langs->trans("MailSuccessfulySent",$email_from,$sendto).'
';
- }
- else
- {
- $message=''.$langs->trans("ResultKo").'
'.$mailfile->error.' '.$result.'
';
- }
+ if ($result)
+ {
+ $message=''.$langs->trans("MailSuccessfulySent",$email_from,$sendto).'
';
+ }
+ else
+ {
+ $message=''.$langs->trans("ResultKo").'
'.$mailfile->error.' '.$result.'
';
+ }
- $_GET["action"]='';
- }
+ $_GET["action"]='';
+ }
}
/*
-* View
-*/
+ * View
+ */
$linuxlike=1;
if (eregi('^win',PHP_OS)) $linuxlike=0;
@@ -203,30 +203,30 @@ if ($message) print $message.'
';
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
$html=new Form($db);
-
+
print '';
+ print '
';
}
else
{
$var=true;
- print '';
- print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
+ print '';
+ print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
- // Disable
- $var=!$var;
- print '| '.$langs->trans("MAIN_DISABLE_ALL_MAILS").' | '.yn($conf->global->MAIN_DISABLE_ALL_MAILS).' |
';
+ // Disable
+ $var=!$var;
+ print '| '.$langs->trans("MAIN_DISABLE_ALL_MAILS").' | '.yn($conf->global->MAIN_DISABLE_ALL_MAILS).' |
';
- // Method
- $var=!$var;
- print '| '.$langs->trans("MAIN_MAIL_SENDMODE").' | ';
- if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') print 'PHP mail function';
- elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') print 'SMTPS library';
- else { print $langs->trans("Undefined"); }
- print ' |
';
+ // Method
+ $var=!$var;
+ print '| '.$langs->trans("MAIN_MAIL_SENDMODE").' | ';
+ if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') print 'PHP mail function';
+ elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') print 'SMTPS library';
+ else { print $langs->trans("Undefined"); }
+ print ' |
';
- // Server
- $var=!$var;
- if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
- }
- else
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_SMTP_SERVER.' |
';
- }
+ // Server
+ $var=!$var;
+ if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
+ }
+ else
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_SMTP_SERVER.' |
';
+ }
- // Port
- $var=!$var;
- if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
- }
- else
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_SMTP_PORT.' |
';
- }
+ // Port
+ $var=!$var;
+ if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
+ }
+ else
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_SMTP_PORT.' |
';
+ }
- // SMTPS ID
- $var=!$var;
- if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | '.$conf->global->MAIN_MAIL_SMTPS_ID.' |
';
- }
+ // SMTPS ID
+ $var=!$var;
+ if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | '.$conf->global->MAIN_MAIL_SMTPS_ID.' |
';
+ }
- // SMTPS PW
- $var=!$var;
- if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
- {
- print '| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | '.$conf->global->MAIN_MAIL_SMTPS_PW.' |
';
- }
+ // SMTPS PW
+ $var=!$var;
+ if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+ {
+ print '| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | '.$conf->global->MAIN_MAIL_SMTPS_PW.' |
';
+ }
- // From
- $var=!$var;
- print '| '.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_EMAIL_FROM.' |
';
+ // From
+ $var=!$var;
+ print '| '.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_EMAIL_FROM.' |
';
- print '
';
+ print '
';
// Boutons actions
- print '';
// Affichage formulaire de TEST
if ($_GET["action"] == 'testconnect')
{
- print '
';
- print_titre($langs->trans("DoTestServerAvailability"));
+ print '
';
+ print_titre($langs->trans("DoTestServerAvailability"));
- // Cree l'objet formulaire mail
- include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
- $mail = new CMailFile('','','','');
- $result=$mail->check_server_port($server,$port);
- if ($result) print ''.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
';
- else
- {
- print ''.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
- if ($mail->error) print ' - '.$langs->convToOutputCharset($mail->error,'ISO-8859-1');
- print '
';
- }
- print '
';
+ // Cree l'objet formulaire mail
+ include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
+ $mail = new CMailFile('','','','');
+ $result=$mail->check_server_port($server,$port);
+ if ($result) print ''.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
';
+ else
+ {
+ print ''.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
+ if ($mail->error) print ' - '.$langs->convToOutputCharset($mail->error,'ISO-8859-1');
+ print '
';
+ }
+ print '
';
}
// Affichage formulaire de TEST simple
if ($_GET["action"] == 'test')
{
- print '
';
- print_titre($langs->trans("DoTestSend"));
+ print '
';
+ print_titre($langs->trans("DoTestSend"));
- // Cree l'objet formulaire mail
- include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
- $formmail = new FormMail($db);
- $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->withfromreadonly=0;
- $formmail->withsubstit=0;
- $formmail->withfrom=1;
- $formmail->witherrorsto=1;
- $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
- $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
- $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
- $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
- $formmail->withtopicreadonly=0;
- $formmail->withfile=2;
- $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
- $formmail->withbodyreadonly=0;
- $formmail->withcancel=1;
- $formmail->withdeliveryreceipt=1;
- $formmail->withfckeditor=0;
- // Tableau des substitutions
- $formmail->substit=$substitutionarrayfortest;
- // Tableau des parametres complementaires du post
- $formmail->param["action"]="send";
- $formmail->param["models"]="body";
- $formmail->param["mailid"]=$mil->id;
- $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
+ // Cree l'objet formulaire mail
+ include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
+ $formmail = new FormMail($db);
+ $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->withfromreadonly=0;
+ $formmail->withsubstit=0;
+ $formmail->withfrom=1;
+ $formmail->witherrorsto=1;
+ $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
+ $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
+ $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
+ $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
+ $formmail->withtopicreadonly=0;
+ $formmail->withfile=2;
+ $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
+ $formmail->withbodyreadonly=0;
+ $formmail->withcancel=1;
+ $formmail->withdeliveryreceipt=1;
+ $formmail->withfckeditor=0;
+ // Tableau des substitutions
+ $formmail->substit=$substitutionarrayfortest;
+ // Tableau des parametres complementaires du post
+ $formmail->param["action"]="send";
+ $formmail->param["models"]="body";
+ $formmail->param["mailid"]=$mil->id;
+ $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
- // Init list of files
- if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
- {
- $formmail->clear_attached_files();
- }
+ // Init list of files
+ if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
+ {
+ $formmail->clear_attached_files();
+ }
- $formmail->show_form('addfile');
+ $formmail->show_form('addfile');
- print '
';
+ print '
';
}
// Affichage formulaire de TEST HTML
if ($_GET["action"] == 'testhtml')
{
- print '
';
- print_titre($langs->trans("DoTestSendHTML"));
+ print '
';
+ print_titre($langs->trans("DoTestSendHTML"));
- // Cree l'objet formulaire mail
- include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
- $formmail = new FormMail($db);
- $formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
- $formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM;
- $formmail->withfromreadonly=0;
- $formmail->withsubstit=0;
- $formmail->withfrom=1;
- $formmail->witherrorsto=1;
- $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
- $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
- $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
- $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
- $formmail->withtopicreadonly=0;
- $formmail->withfile=2;
- $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
- $formmail->withbodyreadonly=0;
- $formmail->withcancel=1;
- $formmail->withdeliveryreceipt=1;
- $formmail->withfckeditor=1;
- // Tableau des substitutions
- $formmail->substit=$substitutionarrayfortest;
- // Tableau des parametres complementaires du post
- $formmail->param["action"]="sendhtml";
- $formmail->param["models"]="body";
- $formmail->param["mailid"]=$mil->id;
- $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
+ // Cree l'objet formulaire mail
+ include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
+ $formmail = new FormMail($db);
+ $formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
+ $formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM;
+ $formmail->withfromreadonly=0;
+ $formmail->withsubstit=0;
+ $formmail->withfrom=1;
+ $formmail->witherrorsto=1;
+ $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
+ $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
+ $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
+ $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
+ $formmail->withtopicreadonly=0;
+ $formmail->withfile=2;
+ $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
+ $formmail->withbodyreadonly=0;
+ $formmail->withcancel=1;
+ $formmail->withdeliveryreceipt=1;
+ $formmail->withfckeditor=1;
+ // Tableau des substitutions
+ $formmail->substit=$substitutionarrayfortest;
+ // Tableau des parametres complementaires du post
+ $formmail->param["action"]="sendhtml";
+ $formmail->param["models"]="body";
+ $formmail->param["mailid"]=$mil->id;
+ $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
- // Init list of files
- if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
- {
- $formmail->clear_attached_files();
- }
+ // Init list of files
+ if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
+ {
+ $formmail->clear_attached_files();
+ }
- $formmail->show_form('addfilehtml');
+ $formmail->show_form('addfilehtml');
- print '
';
+ print '
';
}
}
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 5c8006d730a..fc4e7c5c7a3 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -203,7 +203,7 @@ if (function_exists("imagecreatefrompng"))
else
{
$html = new Form($db);
- $desc = $html->textwithwarning('',$langs->transnoentities("EnableGDLibraryDesc"),1);
+ $desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,0,'warning');
print $desc;
}
print "";
@@ -246,7 +246,7 @@ if (function_exists("cl_scanfile")) // Clamav
else
{
$html = new Form($db);
- $desc = $html->textwithwarning('',$langs->transnoentities("EnablePhpAVModuleDesc"),1);
+ $desc = $html->textwithpicto('',$langs->transnoentities("EnablePhpAVModuleDesc"),1,0,'warning');
print $desc;
}
print "";
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 6bd4e8b3af5..de92eee7286 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -128,7 +128,7 @@ else
}
if ($show==0) print $row[1];
if ($show==1) print $html->textwithhelp($row[1],$text);
- if ($show==2) print $html->textwithwarning($row[1],$text);
+ if ($show==2) print $html->textwithpicto($row[1],$text,1,0,'warning');
print '';
print "\n";
}
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 0d1e5868526..3847915b9ae 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -145,12 +145,12 @@ class Form
}
/**
- * \brief Affiche un texte avec picto help qui affiche un tooltip
- * \param text Texte à afficher
- * \param htmltooltip Contenu html du tooltip
- * \param direction 1=Le picto est après, -1=le picto est avant
- * \param usehelpcursor 1=Utilise curseur help, 0=Curseur par defaut
- * \return string Code html du texte,picto
+ * \brief Show a text with a picto and a tooltip on picto
+ * \param text Text to show
+ * \param htmltooltip Content of tooltip
+ * \param direction 1=Icon is after text, -1=Icon is before text
+ * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
+ * \return string HTML code of text, picto, tooltip
*/
function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1)
{
@@ -161,33 +161,22 @@ class Form
}
/**
- * \brief Affiche un texte avec picto warning qui affiche un tooltip
- * \param text Texte à afficher
- * \param htmltooltip Contenu html du tooltip
- * \param direction 1=Le picto est après, -1=le picto est avant
- * \return string Code html du texte,picto
+ * \brief Show a text with a picto and a tooltip on picto
+ * \param text Text to show
+ * \param htmltooltip Content of tooltip
+ * \param direction 1=Icon is after text, -1=Icon is before text
+ * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
+ * \return string HTML code of text, picto, tooltip
*/
- function textwithwarning($text,$htmltext,$direction=1)
+ function textwithpicto($text,$htmltext,$direction=1,$usehelpcursor=0,$type='help')
{
global $conf;
$alt='';
+ if ($type == 'help') $img=img_help($usehelpcursor,$alt);
+ if ($type == 'warning') $img=img_warning($alt);
+ if ($type == 'superadmin') $img=img_redstar($alt);
if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
- return $this->textwithtooltip($text,$htmltext,2,$direction,img_warning($alt));
- }
-
- /**
- * \brief Affiche un texte avec picto redstar qui affiche un tooltip
- * \param text Texte à afficher
- * \param htmltooltip Contenu html du tooltip
- * \param direction 1=Le picto est après, -1=le picto est avant
- * \return string Code html du texte,picto
- */
- function textwithredstar($text,$htmltext,$direction=1)
- {
- global $conf;
- $alt='';
- if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
- return $this->textwithtooltip($text,$htmltext,2,$direction,img_redstar($alt));
+ return $this->textwithtooltip($text,$htmltext,2,$direction,$img);
}
@@ -696,7 +685,7 @@ class Form
function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0)
{
global $conf;
-
+
// Permettre l'exclusion d'utilisateurs
if (is_array($exclude)) $excludeUsers = implode("','",$exclude);
@@ -804,7 +793,7 @@ class Form
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
}
$sql.= " WHERE p.entity = ".$conf->entity;
-
+
if($finished == 0)
{
$sql.= " AND p.finished = ".$finished;
@@ -1462,7 +1451,7 @@ class Form
function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0)
{
global $langs, $conf;
-
+
$langs->load("admin");
$sql = "SELECT rowid, label, bank";
@@ -1485,7 +1474,7 @@ class Form
{
print '';
}
-
+
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 86b949141bc..70a127ae6e9 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -754,7 +754,7 @@ else
* Affichage onglets
*/
$head = user_prepare_head($fuser);
-
+
$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User");
$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title;
@@ -892,7 +892,7 @@ else
// Administrateur
print '| '.$langs->trans("Administrator").' | ';
print ''.yn($fuser->admin);
- if ($fuser->admin && !$fuser->entity)
+ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $fuser->admin && ! $fuser->entity)
{
print ' '.img_redstar($langs->trans("SuperAdministrator"));
}
@@ -1337,7 +1337,7 @@ else
$text='';
if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
{
- $text=$html->textwithwarning($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication));
+ $text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,0,'warning');
}
}
else
@@ -1366,7 +1366,7 @@ else
{
$yn = yn($fuser->admin);
print '';
- print $html->textwithwarning($yn,$langs->trans("DontChangeSuperAdmin"));
+ print $html->textwithpicto($yn,$langs->trans("DontChangeSuperAdmin"),1,0,'warning');
}
print ' |
';
}
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 51bc91d612e..c5bcf0cab73 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -99,7 +99,7 @@ if ($resql)
print "";
print "| rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."";
- if ($obj->admin && !$obj->entity)
+ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{
print img_redstar($langs->trans("SuperAdministrator"));
}
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index aafe4705126..c341c7b9d70 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -98,7 +98,7 @@ if ($result)
print " |
";
print '| '.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'';
- if ($obj->admin && !$obj->entity)
+ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{
print img_redstar($langs->trans("SuperAdministrator"));
}
|