clean and add new code
This commit is contained in:
parent
bf1e5bc618
commit
c22ef109ac
@ -80,7 +80,6 @@ print '<td align="center" width="20"> </td>';
|
|||||||
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
|
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
// Mail required for members
|
// Mail required for members
|
||||||
|
|||||||
@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
|
|||||||
if (!$user->admin)
|
if (!$user->admin)
|
||||||
accessforbidden();
|
accessforbidden();
|
||||||
|
|
||||||
$langs->load("users");
|
// Load traductions files requiredby by page
|
||||||
$langs->load("admin");
|
$langs->loadLangs(array("users","admin","other"));
|
||||||
$langs->load("other");
|
|
||||||
|
|
||||||
$action=GETPOST('action','aZ09');
|
$action=GETPOST('action','aZ09');
|
||||||
|
|
||||||
@ -42,7 +41,6 @@ $securityevent=new Events($db);
|
|||||||
$eventstolog=$securityevent->eventstolog;
|
$eventstolog=$securityevent->eventstolog;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Actions
|
* Actions
|
||||||
*/
|
*/
|
||||||
@ -88,8 +86,6 @@ $head=security_prepare_head();
|
|||||||
|
|
||||||
dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
|
dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
|
||||||
|
|
||||||
|
|
||||||
$var=true;
|
|
||||||
print "<table class=\"noborder\" width=\"100%\">";
|
print "<table class=\"noborder\" width=\"100%\">";
|
||||||
print "<tr class=\"liste_titre\">";
|
print "<tr class=\"liste_titre\">";
|
||||||
print "<td colspan=\"2\">".$langs->trans("LogEvents")."</td>";
|
print "<td colspan=\"2\">".$langs->trans("LogEvents")."</td>";
|
||||||
@ -98,8 +94,7 @@ print "</tr>\n";
|
|||||||
foreach ($eventstolog as $key => $arr)
|
foreach ($eventstolog as $key => $arr)
|
||||||
{
|
{
|
||||||
if ($arr['id'])
|
if ($arr['id'])
|
||||||
{
|
{
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.$arr['id'].'</td>';
|
print '<td>'.$arr['id'].'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
|
|||||||
@ -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.class.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
|
||||||
|
|
||||||
$langs->load('admin');
|
// Load traductions files requiredby by page
|
||||||
$langs->load('other');
|
$langs->loadLangs(array("admin","other","trips","errors","dict"));
|
||||||
$langs->load('trips');
|
|
||||||
$langs->load('errors');
|
|
||||||
$langs->load('dict');
|
|
||||||
|
|
||||||
if (!$user->admin) accessforbidden();
|
if (!$user->admin) accessforbidden();
|
||||||
|
|
||||||
@ -176,8 +173,7 @@ if ($action != 'edit')
|
|||||||
echo '<th> </th>';
|
echo '<th> </th>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
$var=true;
|
echo '<tr class="oddeven">';
|
||||||
echo '<tr '.$bc[$var].'>';
|
|
||||||
echo '<td>';
|
echo '<td>';
|
||||||
echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
|
echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
|
||||||
echo '<div id="user" class="float">'.$form->select_dolusers('', 'fk_user').'</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> </th>';
|
echo '<th> </th>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
|
|
||||||
$var=true;
|
|
||||||
foreach ($rules as $rule)
|
foreach ($rules as $rule)
|
||||||
{
|
{
|
||||||
echo '<tr '.$bc[$var].'>';
|
echo '<tr class="oddeven">';
|
||||||
|
|
||||||
echo '<td>';
|
echo '<td>';
|
||||||
if ($action == 'edit' && $object->id == $rule->id)
|
if ($action == 'edit' && $object->id == $rule->id)
|
||||||
@ -260,7 +255,6 @@ foreach ($rules as $rule)
|
|||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo '<td>';
|
echo '<td>';
|
||||||
if ($action == 'edit' && $object->id == $rule->id)
|
if ($action == 'edit' && $object->id == $rule->id)
|
||||||
{
|
{
|
||||||
@ -335,7 +329,6 @@ foreach ($rules as $rule)
|
|||||||
echo '</td>';
|
echo '</td>';
|
||||||
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
$var=!$var;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user