clean and add new code

This commit is contained in:
Philippe GRAND 2018-04-24 17:42:13 +02:00
parent bf1e5bc618
commit c22ef109ac
3 changed files with 7 additions and 20 deletions

View File

@ -80,7 +80,6 @@ print '<td align="center" width="20">&nbsp;</td>';
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
print '</tr>';
$var=true;
$form = new Form($db);
// Mail required for members

View File

@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
if (!$user->admin)
accessforbidden();
$langs->load("users");
$langs->load("admin");
$langs->load("other");
// Load traductions files requiredby by page
$langs->loadLangs(array("users","admin","other"));
$action=GETPOST('action','aZ09');
@ -42,7 +41,6 @@ $securityevent=new Events($db);
$eventstolog=$securityevent->eventstolog;
/*
* Actions
*/
@ -88,8 +86,6 @@ $head=security_prepare_head();
dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
$var=true;
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print "<td colspan=\"2\">".$langs->trans("LogEvents")."</td>";
@ -98,8 +94,7 @@ print "</tr>\n";
foreach ($eventstolog as $key => $arr)
{
if ($arr['id'])
{
{
print '<tr class="oddeven">';
print '<td>'.$arr['id'].'</td>';
print '<td>';

View File

@ -30,11 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
$langs->load('admin');
$langs->load('other');
$langs->load('trips');
$langs->load('errors');
$langs->load('dict');
// Load traductions files requiredby by page
$langs->loadLangs(array("admin","other","trips","errors","dict"));
if (!$user->admin) accessforbidden();
@ -176,8 +173,7 @@ if ($action != 'edit')
echo '<th>&nbsp;</th>';
echo '</tr>';
$var=true;
echo '<tr '.$bc[$var].'>';
echo '<tr class="oddeven">';
echo '<td>';
echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
echo '<div id="user" class="float">'.$form->select_dolusers('', 'fk_user').'</div>';
@ -220,10 +216,9 @@ echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
echo '<th>&nbsp;</th>';
echo '</tr>';
$var=true;
foreach ($rules as $rule)
{
echo '<tr '.$bc[$var].'>';
echo '<tr class="oddeven">';
echo '<td>';
if ($action == 'edit' && $object->id == $rule->id)
@ -260,7 +255,6 @@ foreach ($rules as $rule)
echo '</td>';
echo '<td>';
if ($action == 'edit' && $object->id == $rule->id)
{
@ -335,7 +329,6 @@ foreach ($rules as $rule)
echo '</td>';
echo '</tr>';
$var=!$var;
}