Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@eldy
eldy committed Jun 14, 2012
2 parents a9d5109 + 1155b00 commit e3d8c07
Show file tree
Hide file tree
Showing 11 changed files with 128 additions and 58 deletions.
15 changes: 15 additions & 0 deletions htdocs/admin/ihm.php
View file
Expand Up @@ -58,6 +58,7 @@
dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["main_use_preview_tabs"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
Expand Down Expand Up @@ -207,6 +208,14 @@
print '</td>';
print '<td width="20">&nbsp;</td>';
print '</tr>';

// Hide unauthorized button
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED',isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0,1);
print '</td>';
print '<td width="20">&nbsp;</td>';
print '</tr>';

// Hide helpcenter link on login page
$var=!$var;
Expand Down Expand Up @@ -357,6 +366,12 @@
print '</td>';
print '<td width="20">&nbsp;</td>';
print '</tr>';

// Hide unauthorized button
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
print yn($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED,1);
print '</td></tr>';

// Link to help center
$var=!$var;
Expand Down
85 changes: 46 additions & 39 deletions htdocs/comm/mailing/fiche.php
View file
Expand Up @@ -40,7 +40,13 @@
$action=GETPOST('action','alpha');
$confirm=GETPOST('confirm','alpha');
$urlfrom=GETPOST('urlfrom');
$message = '';

$mesg='';
if (isset($_SESSION['DolMessage']))
{
$mesg=$_SESSION['DolMessage'];
unset($_SESSION['DolMessage']);
}

$object=new Mailing($db);
$result=$object->fetch($id);
Expand Down Expand Up @@ -140,14 +146,14 @@
{
// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
// on affiche donc juste un message
$message='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
$message.='<br><textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
$message.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
$mesg='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
$mesg.='<br><textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
$mesg.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
$action='';
}
else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
{
$message='<div class="warning">'.$langs->trans("NotEnoughPermissions").'</div>';
$mesg='<div class="warning">'.$langs->trans("NotEnoughPermissions").'</div>';
$action='';
}
else
Expand Down Expand Up @@ -363,9 +369,8 @@
dol_syslog($db->error());
dol_print_error($db);
}
$message='';

$action = '';

}
}

Expand All @@ -379,15 +384,15 @@
$object->sendto = $_POST["sendto"];
if (! $object->sendto)
{
$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("MailTo")).'</div>';
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("MailTo")).'</div>';
$error++;
}

if (! $error)
{
// Le message est-il en html
$msgishtml=-1; // Inconnu par defaut
if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;

// Pratique les substitutions sur le sujet et message
$object->sujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
Expand Down Expand Up @@ -419,11 +424,11 @@
$result=$mailfile->sendfile();
if ($result)
{
$message='<div class="ok">'.$langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)).'</div>';
$mesg='<div class="ok">'.$langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)).'</div>';
}
else
{
$message='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
$mesg='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
}

$action='';
Expand All @@ -433,8 +438,6 @@
// Action add emailing
if ($action == 'add')
{
$message='';

$object->email_from = trim($_POST["from"]);
$object->email_replyto = trim($_POST["replyto"]);
$object->email_errorsto = trim($_POST["errorsto"]);
Expand All @@ -444,21 +447,21 @@
$object->bgcolor = trim($_POST["bgcolor"]);
$object->bgimage = trim($_POST["bgimage"]);

if (! $object->titre) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTitle"));
if (! $object->sujet) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $object->body) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));
if (! $object->titre) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTitle"));
if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $object->body) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));

if (! $message)
if (! $mesg)
{
if ($object->create($user) >= 0)
{
Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
$message=$object->error;
$mesg=$object->error;
}

$message='<div class="error">'.$message.'</div>';
$mesg='<div class="error">'.$mesg.'</div>';
$action="create";
}

Expand All @@ -472,20 +475,20 @@
else if ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto','alpha'));
else if ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));

else if ($action == 'settitre' && empty($object->titre)) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
else if ($action == 'setfrom' && empty($object->email_from)) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
else if ($action == 'settitre' && empty($object->titre)) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
else if ($action == 'setfrom' && empty($object->email_from)) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));

if (! $message)
if (! $mesg)
{
if ($object->update($user) >= 0)
{
Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
$message=$object->error;
$mesg=$object->error;
}

$message='<div class="error">'.$message.'</div>';
$mesg='<div class="error">'.$mesg.'</div>';
$action="";
}

Expand All @@ -504,7 +507,7 @@
$action="edit";
}

// Action update emailing
// Action remove file
if (! empty($_POST["removedfile"]))
{
$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
Expand All @@ -530,20 +533,20 @@
$object->bgcolor = trim($_POST["bgcolor"]);
$object->bgimage = trim($_POST["bgimage"]);

if (! $object->sujet) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $object->body) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));
if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $object->body) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));

if (! $message)
if (! $mesg)
{
if ($object->update($user) >= 0)
{
Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
$message=$object->error;
$mesg=$object->error;
}

$message='<div class="error">'.$message.'</div>';
$mesg='<div class="error">'.$mesg.'</div>';
$action="edit";
}
else
Expand All @@ -557,7 +560,9 @@
{
if ($object->id > 0)
{
$object->valid($user);
$object->valid($user);

$_SESSION['DolMessage']='<div class="ok">'.$langs->trans("MailingSuccessfullyValidated").'</div>';

Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
Expand Down Expand Up @@ -639,7 +644,7 @@

print_fiche_titre($langs->trans("NewMailing"));

dol_htmloutput_mesg($message);
dol_htmloutput_mesg($mesg);

print '<table class="border" width="100%">';
print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTitle").'</td><td><input class="flat" name="titre" size="40" value="'.$_POST['titre'].'"></td></tr>';
Expand Down Expand Up @@ -697,8 +702,6 @@

dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');

dol_htmloutput_mesg($message);

// Confirmation de la validation du mailing
if ($action == 'valid')
{
Expand Down Expand Up @@ -914,7 +917,14 @@

if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
{
print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
{
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
}
else
{
print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
}
}

print '<br><br></div>';
Expand Down Expand Up @@ -1001,10 +1011,7 @@
* Mailing en mode edition
*/

$mesgs=array();
if ($mesg) $mesgs[]=$mesg;
if ($message) $message[]=$message;
dol_htmloutput_mesg('',$mesgs);
dol_htmloutput_mesg($mesg);

print '<table class="border" width="100%">';

Expand Down
6 changes: 5 additions & 1 deletion htdocs/core/lib/emailing.lib.php
View file
Expand Up @@ -29,7 +29,7 @@
*/
function emailing_prepare_head($object)
{
global $langs, $conf;
global $user, $langs, $conf;

$h = 0;
$head = array();
Expand All @@ -38,6 +38,10 @@ function emailing_prepare_head($object)
$head[$h][1] = $langs->trans("MailCard");
$head[$h][2] = 'card';
$h++;

if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->recipient) {
return $head;
}

$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
$head[$h][1] = $langs->trans("MailRecipients");
Expand Down
32 changes: 24 additions & 8 deletions htdocs/core/modules/modMailing.class.php
View file
Expand Up @@ -97,20 +97,36 @@ function modMailing($db)
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'valider';

$r++;
$this->rights[$r][0] = 228;
$this->rights[$r][1] = 'Envoyer les mailings';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'send';

$r++;
$this->rights[$r][0] = 229;
$this->rights[$r][1] = 'Supprimer les mailings';
$this->rights[$r][2] = 'd';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'supprimer';

$r++;
$this->rights[$r][0] = 237;
$this->rights[$r][1] = 'View recipients and info';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'recipient';

$r++;
$this->rights[$r][0] = 238;
$this->rights[$r][1] = 'Manually send mailings';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'send';

$r++;
$this->rights[$r][0] = 239;
$this->rights[$r][1] = 'Delete mailings after validation and/or sent';
$this->rights[$r][2] = 'd';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
$this->rights[$r][5] = 'delete';

}

Expand Down
9 changes: 4 additions & 5 deletions htdocs/langs/en_US/admin.lang
View file
Expand Up @@ -327,6 +327,7 @@ UrlGenerationParameters=Parameters to secure URLs
SecurityTokenIsUnique=Use a unique securekey parameter for each URL
EnterRefToBuildUrl=Enter reference for object %s
GetSecuredUrl=Get calculated URL
ButtonHideUnauthorized=Hide buttons unauthorized (instead of seeing gray)

# Modules
Module0Name=Users & groups
Expand Down Expand Up @@ -553,11 +554,9 @@ Permission221=Read emailings
Permission222=Create/modify emailings (topic, recipients...)
Permission223=Validate emailings (allows sending)
Permission229=Delete emailings
Permission231=Define mode of payment
Permission232=Create/modify supplier invoices
Permission233=Validate supplier invoices
Permission234=Delete supplier invoices
Permission236=Export supplier invoices
Permission237=View recipients and info
Permission238=Manually send mailings
Permission239=Delete mailings after validation or sent
Permission241=Read categories
Permission242=Create/modify categories
Permission243=Delete categories
Expand Down
9 changes: 4 additions & 5 deletions htdocs/langs/fr_FR/admin.lang
View file
Expand Up @@ -328,6 +328,7 @@ UrlGenerationParameters=Sécurisation des URLs
SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
EnterRefToBuildUrl=Entrez la référence pour l'objet %s
GetSecuredUrl=Obtenir l'URL calculée
ButtonHideUnauthorized=Cacher les boutons non autorisés (au lieu de les voir grisés)

# Modules= undefined
Module0Name= Utilisateurs & groupes
Expand Down Expand Up @@ -551,11 +552,9 @@ Permission221= Consulter les mailings
Permission222= Créer/modifier les mailings (sujet, destinataires, etc.)
Permission223= Valider les mailings (permet leur envoi)
Permission229= Supprimer les mailings
Permission231= Définir le mode de règlement
Permission232= Créer/modifier les factures fournisseurs
Permission233= Valider les factures fournisseurs
Permission234= Supprimer les factures fournisseurs
Permission236= Exporter les factures fournisseurs et attributs
Permission237= Visualiser les destinataires et les infos
Permission238= Envoyer les mailings manuellement
Permission239= Supprimer les mailings après leur validation ou leur envoi
Permission241= Lire les catégories
Permission242= Créer/modifier les catégories
Permission243= Supprimer les catégories
Expand Down
6 changes: 6 additions & 0 deletions htdocs/theme/amarok/style.css.php
View file
Expand Up @@ -144,6 +144,12 @@
color-stop(0, rgba(0,0,0,.3))
);
}

<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
.butActionRefused {
display: none;
}
<?php } ?>

.tabsAction {margin-top:12px !important; text-align:center;}
.menu_titre img{padding-bottom:2px;}
Expand Down

0 comments on commit e3d8c07

Please sign in to comment.