lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniformize code

Browse Source
This commit is contained in:
Juanjo Menent 2011-09-02 15:41:35 +00:00
parent 37086d010e
commit e237ca83f7
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/admin/agenda.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -31,7 +32,6 @@ if (!$user->admin)
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");
$langs->load("agenda");
$action=$_POST["action"]; $action=$_POST["action"];
@ -67,7 +67,7 @@ else
/* /*
* Actions * Actions
*/ */
if ($_POST["action"] == "save" && empty($_POST["cancel"])) if ($action == "save" && empty($_POST["cancel"]))
{ {
$i=0; $i=0;
@ -77,12 +77,24 @@ if ($_POST["action"] == "save" && empty($_POST["cancel"]))
{ {
$param='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code']; $param='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
//print "param=".$param." - ".$_POST[$param]; //print "param=".$param." - ".$_POST[$param];
if (! empty($_POST[$param])) dolibarr_set_const($db,$param,$_POST[$param],'chaine',0,'',$conf->entity); if (! empty($_POST[$param])) $res = dolibarr_set_const($db,$param,$_POST[$param],'chaine',0,'',$conf->entity);
else dolibarr_del_const($db,$param,$conf->entity); else $res = dolibarr_del_const($db,$param,$conf->entity);
} }
$db->commit(); $db->commit();
$mesg = '<font class="ok">'.$langs->trans("SetupSaved").'</font>';
if (! $res > 0) $error++;
if (! $error)
{
$db->commit();
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
}
else
{
$db->rollback();
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
}
} }
@ -150,11 +162,9 @@ print "</form>\n";
print '</div>'; print '</div>';
if ($mesg) print "<br>$mesg<br>";
print "<br>"; print "<br>";
dol_htmloutput_mesg($mesg);
$db->close(); $db->close();

4
htdocs/admin/agenda_xcal.php
View File

@ -122,7 +122,7 @@ print '</div>';
clearstatcache(); clearstatcache();
if ($mesg) print "<br>$mesg<br>"; //if ($mesg) print "<br>$mesg<br>";
print "<br>"; print "<br>";
// Show message // Show message
@ -146,6 +146,8 @@ $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login); $message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login);
print info_admin($message); print info_admin($message);
dol_htmloutput_mesg($mesg);
$db->close(); $db->close();
llxFooter(); llxFooter();