diff --git a/apps/maarch_entreprise/admin/history/history.php b/apps/maarch_entreprise/admin/history/history.php
index 772a402f2bf914342e5d0cc4d6a08a2e0f5da02c..92c5c804e728125b8e8db0377c57f4d30700e6b0 100755
--- a/apps/maarch_entreprise/admin/history/history.php
+++ b/apps/maarch_entreprise/admin/history/history.php
@@ -1,104 +1,72 @@
<?php
-
-/*
-* Copyright 2008,2009 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
/**
-* @brief Displays application logs
+* Copyright Maarch since 2008 under licence GPLv3.
+* See LICENCE.txt file at the root folder for more details.
+* This file is part of Maarch software.
+
*
+* @brief history
*
-* @file
-* @author Claire Figueras <dev@maarch.org>
-* @author Laurent Giovannoni <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup admin
+* @author dev <dev@maarch.org>
+* @ingroup apps
*/
-
-require_once("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_list_show.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php");
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_list_show.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
$core_tools2 = new core_tools();
$core_tools2->test_admin('view_history', 'apps');
/****************Management of the location bar ************/
$init = false;
-if (isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == "true") {
+if (isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == 'true') {
$init = true;
}
-$level = "";
+$level = '';
if (isset($_REQUEST['level']) && ($_REQUEST['level'] == 2 || $_REQUEST['level'] == 3 || $_REQUEST['level'] == 4 || $_REQUEST['level'] == 1)) {
$level = $_REQUEST['level'];
}
$page_path = $_SESSION['config']['businessappurl'].'index.php?page=history&admin=history';
$page_label = _VIEW_HISTORY2;
-$page_id = "history";
+$page_id = 'history';
$core_tools2->manage_location_bar($page_path, $page_label, $page_id, $init, $level);
/***********************************************************/
$db = new Database();
-$where = '';
+$where = '';
$arrayPDO = array();
-$label = '';
-$tab = array();
-$modules = array();
-$stmt = $db->query("SELECT DISTINCT ON(lower(id_module)) id_module FROM history WHERE id_module NOT IN ('null') ORDER BY lower(id_module)");
-while ($res = $stmt->fetchObject()) {
- if ($res->id_module == 'admin') {
- array_push($modules, array('id' => 'admin', 'label' => _ADMIN));
- } elseif (isset($_SESSION['modules_loaded'][$res->id_module]['comment']) && !empty($_SESSION['modules_loaded'][$res->id_module]['comment'])) {
- array_push($modules, array('id' => $res->id_module, 'label' => $_SESSION['modules_loaded'][$res->id_module]['comment']));
- } else {
- array_push($modules, array('id' => $res->id_module, 'label' => $res->id_module));
- }
-}
+$label = '';
+$tab = array();
+$modules = array();
function cmp($a, $b)
{
- return strcmp(strtolower($a["label"]), strtolower($b["label"]));
+ return strcmp(strtolower($a['label']), strtolower($b['label']));
}
-usort($modules, "cmp");
-usort($_SESSION['history_keywords'], "cmp");
-$history_action= '';
+usort($_SESSION['history_keywords'], 'cmp');
+$history_action = '';
$history_user = '';
-$history_module= '';
-$history_datefin = '';
+$history_module = '';
+$history_datefin = '';
$history_datestart = '';
$req = new request();
-if (isset($_REQUEST['search']) ||
-(isset($_SESSION['m_admin']['history']['action']) && !empty($_SESSION['m_admin']['history']['action'])) ||
-(isset($_SESSION['m_admin']['history']['user']) && !empty($_SESSION['m_admin']['history']['user'])) ||
-(isset($_SESSION['m_admin']['history']['module']) && !empty($_SESSION['m_admin']['history']['module'])) ||
-(isset($_SESSION['m_admin']['history']['datefin']) && !empty($_SESSION['m_admin']['history']['datefin'])) ||
+if (isset($_REQUEST['search']) ||
+(isset($_SESSION['m_admin']['history']['action']) && !empty($_SESSION['m_admin']['history']['action'])) ||
+(isset($_SESSION['m_admin']['history']['user']) && !empty($_SESSION['m_admin']['history']['user'])) ||
+(isset($_SESSION['m_admin']['history']['module']) && !empty($_SESSION['m_admin']['history']['module'])) ||
+(isset($_SESSION['m_admin']['history']['datefin']) && !empty($_SESSION['m_admin']['history']['datefin'])) ||
(isset($_SESSION['m_admin']['history']['datestart']) && !empty($_SESSION['m_admin']['history']['datestart']))
) {
- $pattern = "/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/";
+ $pattern = '/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/';
$_SESSION['chosen_user'] = '';
if ((isset($_REQUEST['action'])) || (isset($_SESSION['m_admin']['history']['action']) && !empty($_SESSION['m_admin']['history']['action']))) {
if (isset($_REQUEST['action'])) {
- $history_action= $_REQUEST['action'];
+ $history_action = $_REQUEST['action'];
$_SESSION['m_admin']['history']['action'] = $history_action;
} else {
- $history_action=$_SESSION['m_admin']['history']['action'];
+ $history_action = $_SESSION['m_admin']['history']['action'];
}
if (!empty($history_action)) {
- $where .= " ".$_SESSION['tablename']['history'].".event_type = ? and ";
+ $where .= ' '.$_SESSION['tablename']['history'].'.event_type = ? and ';
$arrayPDO = array_merge($arrayPDO, array($history_action));
}
}
@@ -108,27 +76,27 @@ if (isset($_REQUEST['search']) ||
$history_user = $_REQUEST['user'];
$_SESSION['m_admin']['history']['user'] = $history_user;
} else {
- $history_user=$_SESSION['m_admin']['history']['user'];
+ $history_user = $_SESSION['m_admin']['history']['user'];
}
if (!empty($history_user)) {
- $tmp = str_replace(')', '', substr($history_user, strrpos($history_user,'(')+1));
- $where .= " ".$_SESSION['tablename']['history'].".user_id = ? and";
+ $tmp = str_replace(')', '', substr($history_user, strrpos($history_user, '(') + 1));
+ $where .= ' '.$_SESSION['tablename']['history'].'.user_id = ? and';
$arrayPDO = array_merge($arrayPDO, array($tmp));
}
}
if (isset($_REQUEST['module']) || (isset($_SESSION['m_admin']['history']['module']) && !empty($_SESSION['m_admin']['history']['module']))) {
if (isset($_REQUEST['module'])) {
- $history_module= $_REQUEST['module'];
+ $history_module = $_REQUEST['module'];
$_SESSION['m_admin']['history']['module'] = $history_module;
} else {
- $history_module=$_SESSION['m_admin']['history']['module'];
+ $history_module = $_SESSION['m_admin']['history']['module'];
}
if (!empty($history_module)) {
- $where .= " lower(".$_SESSION['tablename']['history'].".id_module) = lower(?) and";
+ $where .= ' lower('.$_SESSION['tablename']['history'].'.id_module) = lower(?) and';
$arrayPDO = array_merge($arrayPDO, array($history_module));
}
}
- if (isset($_REQUEST['datestart']) || (isset( $_SESSION['m_admin']['history']['datestart']) && !empty($_SESSION['m_admin']['history']['datestart']))) {
+ if (isset($_REQUEST['datestart']) || (isset($_SESSION['m_admin']['history']['datestart']) && !empty($_SESSION['m_admin']['history']['datestart']))) {
if (isset($_REQUEST['datestart'])) {
$_SESSION['m_admin']['history']['datestart'] = $_REQUEST['datestart'];
}
@@ -137,27 +105,27 @@ if (isset($_REQUEST['search']) ||
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
//if ($_SESSION['config']['databasetype'] == "POSTGRESQL") {
- $history_datestart = $_SESSION['m_admin']['history']['datestart'];
+ $history_datestart = $_SESSION['m_admin']['history']['datestart'];
//} else {
// $history_datestart = str_replace('-','', $_SESSION['m_admin']['history']['datestart']);
//}
- $where .= " (".$req->extract_date($_SESSION['tablename']['history'].".event_date")." >= ?) and ";
+ $where .= ' ('.$req->extract_date($_SESSION['tablename']['history'].'.event_date').' >= ?) and ';
$arrayPDO = array_merge($arrayPDO, array($history_datestart));
}
}
- if (isset($_REQUEST['datefin']) || (isset( $_SESSION['m_admin']['history']['datefin']) && !empty($_SESSION['m_admin']['history']['datefin']))) {
+ if (isset($_REQUEST['datefin']) || (isset($_SESSION['m_admin']['history']['datefin']) && !empty($_SESSION['m_admin']['history']['datefin']))) {
if (isset($_REQUEST['datefin'])) {
$_SESSION['m_admin']['history']['datefin'] = $_REQUEST['datefin'];
}
- if (preg_match($pattern, $_SESSION['m_admin']['history']['datefin'])==false) {
+ if (preg_match($pattern, $_SESSION['m_admin']['history']['datefin']) == false) {
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
//if ($_SESSION['config']['databasetype'] == "POSTGRESQL") {
- $history_datefin = $_SESSION['m_admin']['history']['datefin'];
+ $history_datefin = $_SESSION['m_admin']['history']['datefin'];
//} else {
// $history_datefin = str_replace('-','', $_SESSION['m_admin']['history']['datefin']);
//}
- $where .= " (".$req->extract_date($_SESSION['tablename']['history'].".event_date")." <= ?) and ";
+ $where .= ' ('.$req->extract_date($_SESSION['tablename']['history'].'.event_date').' <= ?) and ';
$arrayPDO = array_merge($arrayPDO, array($history_datefin));
}
}
@@ -166,13 +134,13 @@ if (isset($_REQUEST['search']) ||
}
$select[$_SESSION['tablename']['history']] = array();
-array_push($select[$_SESSION['tablename']['history']], 'id', 'event_date', 'user_id', 'table_name', 'record_id', 'event_type', 'info');
+array_push($select[$_SESSION['tablename']['history']], 'id', 'event_date', 'user_id', 'table_name', 'record_id', 'event_type', 'info', 'id_module');
$select[$_SESSION['tablename']['users']] = array();
array_push($select[$_SESSION['tablename']['users']], 'lastname', 'firstname');
$list = new list_show();
if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) {
$order = trim($_REQUEST['order']);
-}else{
+} else {
$order = 'desc';
$_REQUEST['order'] = 'desc';
}
@@ -181,133 +149,160 @@ if (isset($_REQUEST['order_field']) && !empty($_REQUEST['order_field'])) {
$field = trim($_REQUEST['order_field']);
}
$orderstr = $list->define_order($order, $field);
-$tab = $req->PDOselect($select, $where,$arrayPDO,$orderstr, $_SESSION['config']['databasetype'], $limit="500",true,$_SESSION['tablename']['history'],$_SESSION['tablename']['users'], 'user_id');
-for ($i=0;$i<count($tab);$i++) {
- for ($j=0;$j<count($tab[$i]);$j++) {
- foreach(array_keys($tab[$i][$j]) as $value) {
- if ($tab[$i][$j][$value]=="id") {
- $tab[$i][$j]["id"]=$tab[$i][$j]['value'];
- $tab[$i][$j]["show"]=false;
+$tab = $req->PDOselect($select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $limit = '500', true, $_SESSION['tablename']['history'], $_SESSION['tablename']['users'], 'user_id');
+
+$tmpIdModuleComp = [];
+for ($i = 0; $i < count($tab); ++$i) {
+ for ($j = 0; $j < count($tab[$i]); ++$j) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($tab[$i][$j][$value] == 'id') {
+ $tab[$i][$j]['id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="event_date") {
- $tab[$i][$j]["value"]=$req->dateformat($tab[$i][$j]['value'], '-');
- $tab[$i][$j]["label"]=_DATE;
- $tab[$i][$j]["size"]="17";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='event_date';
+ if ($tab[$i][$j][$value] == 'event_date') {
+ $tab[$i][$j]['value'] = $req->dateformat($tab[$i][$j]['value'], '-');
+ $tab[$i][$j]['label'] = _DATE;
+ $tab[$i][$j]['size'] = '17';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'event_date';
}
- if ($tab[$i][$j][$value]== "user_id") {
- $tab[$i][$j]["user_id"]= $tab[$i][$j]['value'];
- $tab[$i][$j]["label"]= _USERS;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='user_id';
+ if ($tab[$i][$j][$value] == 'user_id') {
+ $tab[$i][$j]['user_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _USERS;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'user_id';
}
- if ($tab[$i][$j][$value]=="table_name") {
- $tab[$i][$j]["table_name"]= $tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_TABLE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='table_name';
+ if ($tab[$i][$j][$value] == 'table_name') {
+ $tab[$i][$j]['table_name'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _TABLE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'table_name';
}
- if ($tab[$i][$j][$value]=="record_id") {
- $tab[$i][$j]["record_id"]= $tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_ID;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='record_id';
+ if ($tab[$i][$j][$value] == 'record_id') {
+ $tab[$i][$j]['record_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _ID;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'record_id';
}
- if ($tab[$i][$j][$value]=='event_type') {
- $tab[$i][$j]['value']= $this->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]['event_type']= $tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_ACTION;
- $tab[$i][$j]["size"]="8";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='event_type';
+ if ($tab[$i][$j][$value] == 'event_type') {
+ $tab[$i][$j]['value'] = $this->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['event_type'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _ACTION;
+ $tab[$i][$j]['size'] = '8';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'event_type';
}
- if ($tab[$i][$j][$value]=="info") {
- $tab[$i][$j]['value']= $this->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["info"]= $tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_COMMENTS;
- $tab[$i][$j]["size"]="65";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='info';
+ if ($tab[$i][$j][$value] == 'info') {
+ $tab[$i][$j]['value'] = $this->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['info'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _COMMENTS;
+ $tab[$i][$j]['size'] = '65';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'info';
+ }
+ if ($tab[$i][$j][$value] == 'id_module' && $tab[$i][$j]['value'] != null && $tab[$i][$j]['value'] != 'null' && !empty($tab[$i][$j]['value']) && !in_array($tab[$i][$j]['value'], $tmpIdModuleComp)) {
+ $tmpIdModuleComp[] = $tab[$i][$j]['value'];
+ if ($tab[$i][$j]['value'] == 'admin') {
+ array_push($modules, array('id' => 'admin', 'label' => _ADMIN));
+ } elseif (isset($_SESSION['modules_loaded'][$tab[$i][$j]['value']]['comment']) && !empty($_SESSION['modules_loaded'][$tab[$i][$j]['value']]['comment'])) {
+ array_push($modules, array('id' => $tab[$i][$j]['value'], 'label' => ucfirst($_SESSION['modules_loaded'][$tab[$i][$j]['value']]['comment'])));
+ } else {
+ array_push($modules, array('id' => $tab[$i][$j]['value'], 'label' => ucfirst(($tab[$i][$j]['value']))));
+ }
}
}
}
}
-for ($i=0;$i<count($tab);$i++) {
- for ($j=0;$j<count($tab[$i]);$j++) {
- foreach(array_keys($tab[$i][$j]) as $value) {
- if ($value == 'column' and $tab[$i][$j][$value]=='event_type') {
+
+usort($modules, 'cmp');
+
+if (!empty($history_module)) {
+ $modules = $_SESSION['m_admin']['history']['module_list'];
+} else {
+ $_SESSION['m_admin']['history']['module_list'] = $modules;
+}
+
+for ($i = 0; $i < count($tab); ++$i) {
+ for ($j = 0; $j < count($tab[$i]); ++$j) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($value == 'column' and $tab[$i][$j][$value] == 'event_type') {
$val = $core_tools2->is_var_in_history_keywords_tab($tab[$i][$j]['event_type']);
$tab[$i][$j]['value'] = $val;
}
}
}
}
-$nb =count($tab);
+$nb = count($tab);
?>
-<h1><i class="fa fa-history fa-2x"> </i> <?php echo _HISTORY_TITLE.' : '. $nb.' '._RESULTS;?></h1>
+<h1><i class="fa fa-history fa-2x"> </i> <?php echo _HISTORY_TITLE.' : '.$nb.' '._RESULTS; ?></h1>
<div id="inner_content">
<?php
-$list->admin_list($tab, $nb, ' ', 'id','history','history','id', true, '', '', '', '', '', '', TRUE, FALSE, '', '', '', false, false);
+$list->admin_list($tab, $nb, ' ', 'id', 'history', 'history', 'id', true, '', '', '', '', '', '', true, false, '', '', '', false, false);
?>
<br/>
<div id="search_hist" class="block">
-<form id ="frm_search_hist" style="position:relative;" action="<?php echo $_SESSION['config']['businessappurl'];?>index.php?page=history&admin=history" method="post" class="form">
+<form id ="frm_search_hist" style="position:relative;" action="<?php echo $_SESSION['config']['businessappurl']; ?>index.php?page=history&admin=history" method="post" class="form">
<div>
<input type="hidden" name="page" value="history"/>
<input type="hidden" name="admin" value="history" />
<table border="0" width="99%" class="forms" summary="">
<tr>
<td style="width:33%;">
- <div><label><?php echo _ACTIONS;?> :</label>
+ <div><label><?php echo _ACTIONS; ?> :</label>
<select name="action" id="action">
- <option value=""><?php echo _CHOOSE_ACTION;?></option>
- <?php
- for ($i=0;$i<count($_SESSION['history_keywords']);$i++) {
+ <option value=""><?php echo _CHOOSE_ACTION; ?></option>
+ <?php
+ for ($i = 0; $i < count($_SESSION['history_keywords']); ++$i) {
?>
- <option value="<?php functions::xecho($_SESSION['history_keywords'][$i]['id']);?>" <?php if ($history_action== $_SESSION['history_keywords'][$i]['id']) {echo 'selected="selected"';}?>><?php echo $_SESSION['history_keywords'][$i]['label'];?></option>
- <?php
+ <option value="<?php functions::xecho($_SESSION['history_keywords'][$i]['id']); ?>" <?php if ($history_action == $_SESSION['history_keywords'][$i]['id']) {
+ echo 'selected="selected"';
+ } ?>><?php echo $_SESSION['history_keywords'][$i]['label']; ?></option>
+ <?php
}
?>
</select></div>
</td>
<td style="width:33%;">
- <div><label><?php echo _MODULES;?> :</label>
+ <div><label><?php echo _MODULES; ?> :</label>
<select name="module" id="module">
- <option value=""><?php echo _CHOOSE_MODULE;?></option>
- <?php
- for ($i=0;$i<count($modules);$i++) {
+ <option value=""><?php echo _CHOOSE_MODULE; ?></option>
+ <?php
+ for ($i = 0; $i < count($modules); ++$i) {
?>
- <option value="<?php functions::xecho($modules[$i]['id']);?>" <?php if ($history_module== $modules[$i]['id']) {echo 'selected="selected"';}?>><?php functions::xecho($modules[$i]['label']);?></option>
+ <option value="<?php functions::xecho($modules[$i]['id']); ?>" <?php if ($history_module == $modules[$i]['id']) {
+ echo 'selected="selected"';
+ } ?>><?php functions::xecho($modules[$i]['label']); ?></option>
<?php
}
?>
</select></div>
</td>
<td style="width:33%;">
- <div> <label><?php echo _USER;?> :</label>
- <input type="text" name="user" id="user" value="<?php if (isset($history_user)){ functions::xecho($history_user);}?>" /><div id="show_user" class="autocomplete"></div>
+ <div> <label><?php echo _USER; ?> :</label>
+ <input type="text" name="user" id="user" value="<?php if (isset($history_user)) {
+ functions::xecho($history_user);
+ }?>" /><div id="show_user" class="autocomplete" style="position: relative; left:227px; top: 1px; width: 199.667px;"></div>
</div>
</td>
</tr>
@@ -315,25 +310,29 @@ $list->admin_list($tab, $nb, ' ', 'id','history','history','id', true, '',
<table border="0" width="99%" class="forms" summary="">
<tr>
<td>
- <p><span><?php echo _SINCE;?> :</span> <input name="datestart" type="text" id="datestart" onclick='showCalender(this);' value="<?php if (isset($history_datestart)){functions::xecho($history_datestart);}?>" />
+ <p><span><?php echo _SINCE; ?> :</span> <input name="datestart" type="text" id="datestart" onclick='showCalender(this);' value="<?php if (isset($history_datestart)) {
+ functions::xecho($history_datestart);
+ }?>" />
</p>
</td>
<td colspan="2">
<p>
- <span ><?php echo _FOR;?> :</span> <input name="datefin" type="text" id="datefin" onclick="showCalender(this);" value="<?php if (isset($history_datefin)){functions::xecho($history_datefin);}?>" />
+ <span ><?php echo _FOR; ?> :</span> <input name="datefin" type="text" id="datefin" onclick="showCalender(this);" value="<?php if (isset($history_datefin)) {
+ functions::xecho($history_datefin);
+ }?>" />
</p>
</td>
</tr>
<tr>
<td colspan="2" align="left">
<p>
- <input type="submit" name="search" value="<?php echo _SEARCH;?>" class="button" />
- <input type="button" class="button" name="cancel" value="<?php echo _CANCEL;?>" onclick="javascript:window.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php?page=admin';"/>
+ <input type="submit" name="search" value="<?php echo _SEARCH; ?>" class="button" />
+ <input type="button" class="button" name="cancel" value="<?php echo _CANCEL; ?>" onclick="javascript:window.location.href='<?php echo $_SESSION['config']['businessappurl']; ?>index.php?page=admin';"/>
</p>
</td>
<td align="center">
<a href="#" onclick="clear_form('frm_search_hist');$('frm_search_hist').submit();">
- <i class="fa fa-refresh fa-2x" title="<?php echo _CLEAR_FORM;?>"></i>
+ <i class="fa fa-refresh fa-2x" title="<?php echo _CLEAR_FORM; ?>"></i>
</a>
</td>
</tr>
@@ -344,4 +343,4 @@ $list->admin_list($tab, $nb, ' ', 'id','history','history','id', true, '',
<div class="block_end"> </div>
<br/>
</div>
-<script type="text/javascript">launch_autocompleter('<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&page=users_autocomplete_list&getDisableUser', 'user', 'show_user');</script>
+<script type="text/javascript">launch_autocompleter('<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&page=users_autocomplete_list&getDisableUser', 'user', 'show_user');</script>