';
print '
'."\n";
@@ -366,16 +428,36 @@ print "\n";
print '';
-if (!empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], "c.rowid", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['d.fk_type']['checked'])) print_liste_field_titre($arrayfields['d.fk_type']['label'], $_SERVER["PHP_SELF"], "c.fk_type", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['d.firstname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], "d.firstname", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['d.login']['checked'])) print_liste_field_titre($arrayfields['d.login']['label'], $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.libelle']['checked'])) print_liste_field_titre($arrayfields['t.libelle']['label'], $_SERVER["PHP_SELF"], "c.note", $param, "", '', $sortfield, $sortorder);
-if (!empty($arrayfields['d.bank']['checked'])) print_liste_field_titre($arrayfields['d.bank']['label'], $_SERVER["PHP_SELF"], "b.fk_account", $param, "", "", $sortfield, $sortorder);
-if (!empty($arrayfields['c.dateadh']['checked'])) print_liste_field_titre($arrayfields['c.dateadh']['label'], $_SERVER["PHP_SELF"], "c.dateadh", $param, "", '', $sortfield, $sortorder, 'center nowraponall ');
-if (!empty($arrayfields['c.datef']['checked'])) print_liste_field_titre($arrayfields['c.datef']['label'], $_SERVER["PHP_SELF"], "c.datef", $param, "", '', $sortfield, $sortorder, 'center nowraponall ');
-if (!empty($arrayfields['d.amount']['checked'])) print_liste_field_titre($arrayfields['d.amount']['label'], $_SERVER["PHP_SELF"], "c.subscription", $param, "", '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['d.ref']['checked'])) {
+ print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], "c.rowid", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.fk_type']['checked'])) {
+ print_liste_field_titre($arrayfields['d.fk_type']['label'], $_SERVER["PHP_SELF"], "c.fk_type", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.lastname']['checked'])) {
+ print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.firstname']['checked'])) {
+ print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], "d.firstname", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.login']['checked'])) {
+ print_liste_field_titre($arrayfields['d.login']['label'], $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.libelle']['checked'])) {
+ print_liste_field_titre($arrayfields['t.libelle']['label'], $_SERVER["PHP_SELF"], "c.note", $param, "", '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['d.bank']['checked'])) {
+ print_liste_field_titre($arrayfields['d.bank']['label'], $_SERVER["PHP_SELF"], "b.fk_account", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['c.dateadh']['checked'])) {
+ print_liste_field_titre($arrayfields['c.dateadh']['label'], $_SERVER["PHP_SELF"], "c.dateadh", $param, "", '', $sortfield, $sortorder, 'center nowraponall ');
+}
+if (!empty($arrayfields['c.datef']['checked'])) {
+ print_liste_field_titre($arrayfields['c.datef']['label'], $_SERVER["PHP_SELF"], "c.datef", $param, "", '', $sortfield, $sortorder, 'center nowraponall ');
+}
+if (!empty($arrayfields['d.amount']['checked'])) {
+ print_liste_field_titre($arrayfields['d.amount']['label'], $_SERVER["PHP_SELF"], "c.subscription", $param, "", '', $sortfield, $sortorder, 'right ');
+}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -384,8 +466,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (!empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (!empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['c.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['c.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+}
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print " \n";
@@ -420,7 +506,9 @@ while ($i < min($num, $limit)) {
// Ref
if (!empty($arrayfields['d.ref']['checked'])) {
print ''.$subscription->getNomUrl(1).' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Type
if (!empty($arrayfields['d.fk_type']['checked'])) {
@@ -429,24 +517,32 @@ while ($i < min($num, $limit)) {
print $adht->getNomUrl(1);
}
print '';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Lastname
if (!empty($arrayfields['d.lastname']['checked'])) {
print ''.$adherent->getNomUrl(-1, 0, 'card', 'lastname').' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Firstname
if (!empty($arrayfields['d.firstname']['checked'])) {
print ''.$adherent->firstname.' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Login
if (!empty($arrayfields['d.login']['checked'])) {
print ''.$adherent->login.' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Label
@@ -454,7 +550,9 @@ while ($i < min($num, $limit)) {
print '';
print dol_trunc($obj->note, 128);
print ' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Banque
@@ -467,24 +565,34 @@ while ($i < min($num, $limit)) {
print $accountstatic->getNomUrl(1);
}
print "\n";
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Date start
if (!empty($arrayfields['c.dateadh']['checked'])) {
print ''.dol_print_date($db->jdate($obj->dateadh), 'day')." \n";
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Date end
if (!empty($arrayfields['c.datef']['checked'])) {
print ''.dol_print_date($db->jdate($obj->datef), 'day')." \n";
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Price
if (!empty($arrayfields['d.amount']['checked'])) {
print ''.price($obj->subscription).' ';
- if (!$i) $totalarray['nbfield']++;
- if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
+ }
$totalarray['val']['d.amount'] += $obj->subscription;
}
// Extra fields
@@ -498,24 +606,32 @@ while ($i < min($num, $limit)) {
print '';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Date modification
if (!empty($arrayfields['c.tms']['checked'])) {
print '';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Action column
print '';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
print ' ';
- if (!$i) $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
print "\n";
$i++;
@@ -528,7 +644,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
// If no record found
if ($num == 0) {
$colspan = 1;
- foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+ foreach ($arrayfields as $key => $val) {
+ if (!empty($val['checked'])) {
+ $colspan++;
+ }
+ }
print ''.$langs->trans("NoRecordFound").'
';
-if ($withtab)
-{
+if ($withtab) {
print dol_get_fiche_end();
}
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 8f7b209cc6e..6b59c009ae7 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -33,7 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
$langs->loadLangs(array("admin", "other", "blockedlog", "bills"));
-if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) accessforbidden();
+if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) {
+ accessforbidden();
+}
$action = GETPOST('action', 'aZ09');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'blockedloglist'; // To manage different context of search
@@ -41,32 +43,46 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
$search_showonlyerrors = GETPOST('search_showonlyerrors', 'int');
-if ($search_showonlyerrors < 0) $search_showonlyerrors = 0;
+if ($search_showonlyerrors < 0) {
+ $search_showonlyerrors = 0;
+}
$search_id = GETPOST('search_id', 'alpha');
$search_fk_user = GETPOST('search_fk_user', 'intcomma');
$search_start = -1;
-if (GETPOST('search_startyear') != '') $search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear'));
+if (GETPOST('search_startyear') != '') {
+ $search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear'));
+}
$search_end = -1;
-if (GETPOST('search_endyear') != '') $search_end = dol_mktime(23, 59, 59, GETPOST('search_endmonth'), GETPOST('search_endday'), GETPOST('search_endyear'));
+if (GETPOST('search_endyear') != '') {
+ $search_end = dol_mktime(23, 59, 59, GETPOST('search_endmonth'), GETPOST('search_endday'), GETPOST('search_endyear'));
+}
$search_code = GETPOST('search_code', 'alpha');
$search_ref = GETPOST('search_ref', 'alpha');
$search_amount = GETPOST('search_amount', 'alpha');
-if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_startmonth')) $search_start = dol_time_plus_duree(dol_now(), '-1', 'w');
+if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_startmonth')) {
+ $search_start = dol_time_plus_duree(dol_now(), '-1', 'w');
+}
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (empty($sortfield)) $sortfield = 'rowid';
-if (empty($sortorder)) $sortorder = 'DESC';
+if (empty($sortfield)) {
+ $sortfield = 'rowid';
+}
+if (empty($sortorder)) {
+ $sortorder = 'DESC';
+}
$block_static = new BlockedLog($db);
$block_static->loadTrackedEvents();
@@ -76,8 +92,7 @@ $result = restrictedArea($user, 'blockedlog', 0, '');
$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
$max_time = @ini_get("max_execution_time");
-if ($max_time && $max_time < $max_execution_time_for_importexport)
-{
+if ($max_time && $max_time < $max_execution_time_for_importexport) {
dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
}
@@ -88,8 +103,7 @@ if ($max_time && $max_time < $max_execution_time_for_importexport)
*/
// Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$search_id = '';
$search_fk_user = '';
$search_start = -1;
@@ -120,14 +134,12 @@ if ($action === 'downloadblockchain') {
$previoushash = '';
$firstid = '';
- if (!$error)
- {
+ if (!$error) {
// Get ID of first line
$sql = "SELECT rowid,date_creation,tms,user_fullname,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user,object_data";
$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
$sql .= " WHERE entity = ".$conf->entity;
- if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0)
- {
+ if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 1);
$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 12);
$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
@@ -136,12 +148,10 @@ if ($action === 'downloadblockchain') {
$sql .= $db->plimit(1);
$res = $db->query($sql);
- if ($res)
- {
+ if ($res) {
// Make the first fetch to get first line
$obj = $db->fetch_object($res);
- if ($obj)
- {
+ if ($obj) {
$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
$firstid = $obj->rowid;
} else { // If not data found for filter, we do not need previoushash neither firstid
@@ -154,14 +164,12 @@ if ($action === 'downloadblockchain') {
}
}
- if (!$error)
- {
+ if (!$error) {
// Now restart request with all data = no limit(1) in sql request
$sql = "SELECT rowid,date_creation,tms,user_fullname,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user,object_data";
$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
$sql .= " WHERE entity = ".$conf->entity;
- if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0)
- {
+ if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 1);
$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 12);
$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
@@ -169,8 +177,7 @@ if ($action === 'downloadblockchain') {
$sql .= " ORDER BY rowid ASC"; // Required so later we can use the parameter $previoushash of checkSignature()
$res = $db->query($sql);
- if ($res)
- {
+ if ($res) {
header('Content-Type: application/octet-stream');
header("Content-Transfer-Encoding: Binary");
header("Content-disposition: attachment; filename=\"unalterable-log-archive-".$dolibarr_main_db_name."-".(GETPOST('yeartoexport', 'int') > 0 ? GETPOST('yeartoexport', 'int').(GETPOST('monthtoexport', 'int') > 0 ?sprintf("%02d", GETPOST('monthtoexport', 'int')) : '').'-' : '').$previoushash.".csv\"");
@@ -193,8 +200,7 @@ if ($action === 'downloadblockchain') {
$loweridinerror = 0;
$i = 0;
- while ($obj = $db->fetch_object($res))
- {
+ while ($obj = $db->fetch_object($res)) {
// We set here all data used into signature calculation (see checkSignature method) and more
// IMPORTANT: We must have here, the same rule for transformation of data than into the fetch method (db->jdate for date, ...)
$block_static->id = $obj->rowid;
@@ -213,19 +219,20 @@ if ($action === 'downloadblockchain') {
$checksignature = $block_static->checkSignature($previoushash); // If $previoushash is not defined, checkSignature will search it
- if ($checksignature)
- {
+ if ($checksignature) {
$statusofrecord = 'Valid';
- if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
- else $statusofrecordnote = '';
+ if ($loweridinerror > 0) {
+ $statusofrecordnote = 'ValidButFoundAPreviousKO';
+ } else {
+ $statusofrecordnote = '';
+ }
} else {
$statusofrecord = 'KO';
$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
$loweridinerror = $obj->rowid;
}
- if ($i == 0)
- {
+ if ($i == 0) {
$statusofrecordnote = $langs->trans("PreviousFingerprint").': '.$previoushash.($statusofrecordnote ? ' - '.$statusofrecordnote : '');
}
print $obj->rowid;
@@ -263,8 +270,7 @@ if ($action === 'downloadblockchain') {
$form = new Form($db);
-if (GETPOST('withtab', 'alpha'))
-{
+if (GETPOST('withtab', 'alpha')) {
$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
} else {
$title = $langs->trans("BrowseBlockedLog");
@@ -275,10 +281,8 @@ llxHeader('', $langs->trans("BrowseBlockedLog"));
$MAXLINES = 10000;
$blocks = $block_static->getLog('all', $search_id, $MAXLINES, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code);
-if (!is_array($blocks))
-{
- if ($blocks == -2)
- {
+if (!is_array($blocks)) {
+ if ($blocks == -2) {
setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
} else {
dol_print_error($block_static->db, $block_static->error, $block_static->errors);
@@ -287,15 +291,13 @@ if (!is_array($blocks))
}
$linkback = '';
-if (GETPOST('withtab', 'alpha'))
-{
+if (GETPOST('withtab', 'alpha')) {
$linkback = '
'.$langs->trans("BackToModuleList").' ';
}
print load_fiche_titre($title, $linkback);
-if (GETPOST('withtab', 'alpha'))
-{
+if (GETPOST('withtab', 'alpha')) {
$head = blockedlogadmin_prepare_head();
print dol_get_fiche_head($head, 'fingerprints', '', -1);
}
@@ -305,19 +307,45 @@ print '
'.$langs->trans("Fingerprint
print '';
$retstring .= ' ';
-for ($month = 1; $month <= 12; $month++)
-{
+for ($month = 1; $month <= 12; $month++) {
$retstring .= '';
$retstring .= dol_print_date(mktime(12, 0, 0, $month, 1, 2000), "%b");
$retstring .= " ";
@@ -343,7 +370,9 @@ print $retstring;
print ''.$langs->trans('DownloadBlockChain').' ';
+if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+ print ' | '.$langs->trans('DownloadBlockChain').' ';
+}
print '