--- /tmp/dsg/dolibarr/htdocs/blockedlog/admin/github_blockedlog.php
+++ /tmp/dsg/dolibarr/htdocs/blockedlog/admin/client_blockedlog.php
@@ -32,10 +32,8 @@
if (!$user->admin || empty($conf->blockedlog->enabled)) accessforbidden();
-$action = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
-
-$withtab = GETPOST('withtab', 'int');
/*
@@ -51,9 +49,11 @@
if (dolibarr_set_const($db, $code, $values, 'chaine', 0, '', $conf->entity) > 0)
{
- header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
+ header("Location: ".$_SERVER["PHP_SELF"]);
exit;
- } else {
+ }
+ else
+ {
dol_print_error($db);
}
}
@@ -63,9 +63,11 @@
$code = $reg[1];
if (dolibarr_del_const($db, $code, 0) > 0)
{
- Header("Location: ".$_SERVER["PHP_SELF"].($withtab ? '?withtab='.$withtab : ''));
+ Header("Location: ".$_SERVER["PHP_SELF"]);
exit;
- } else {
+ }
+ else
+ {
dol_print_error($db);
}
}
@@ -81,15 +83,17 @@
llxHeader('', $langs->trans("BlockedLogSetup"));
$linkback = '';
-if ($withtab) {
+if (GETPOST('withtab', 'alpha'))
+{
$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
}
print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'), $linkback);
-if ($withtab) {
+if (GETPOST('withtab', 'alpha'))
+{
$head = blockedlogadmin_prepare_head();
- print dol_get_fiche_head($head, 'blockedlog', '', -1);
+ dol_fiche_head($head, 'blockedlog', '', -1);
}
@@ -114,26 +118,21 @@
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
print '<td class="right" width="300">';
-
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
- print '<input type="hidden" name="withtab" value="'.$withtab.'">';
print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
-
print '</td></tr>';
}
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BlockedLogDisableNotAllowedForCountry").'</td>';
print '<td>';
-
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="set_BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY">';
-print '<input type="hidden" name="withtab" value="'.$withtab.'">';
$sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";
$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
@@ -173,9 +172,9 @@
print '</table>';
-if ($withtab)
+if (GETPOST('withtab', 'alpha'))
{
- print dol_get_fiche_end();
+ dol_fiche_end();
}
print '<br><br>';
--- /tmp/dsg/dolibarr/htdocs/blockedlog/admin/github_blockedlog_list.php
+++ /tmp/dsg/dolibarr/htdocs/blockedlog/admin/client_blockedlog_list.php
@@ -35,7 +35,7 @@
if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) accessforbidden();
-$action = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'blockedloglist'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
@@ -56,8 +56,8 @@
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
@@ -133,11 +133,15 @@
{
$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
$firstid = $obj->rowid;
- } else { // If not data found for filter, we do not need previoushash neither firstid
+ }
+ else
+ { // If not data found for filter, we do not need previoushash neither firstid
$previoushash = 'nodata';
$firstid = '';
}
- } else {
+ }
+ else
+ {
$error++;
setEventMessages($db->lasterror, null, 'errors');
}
@@ -207,7 +211,9 @@
$statusofrecord = 'Valid';
if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
else $statusofrecordnote = '';
- } else {
+ }
+ else
+ {
$statusofrecord = 'KO';
$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
$loweridinerror = $obj->rowid;
@@ -239,7 +245,9 @@
}
exit;
- } else {
+ }
+ else
+ {
setEventMessages($db->lasterror, null, 'errors');
}
}
@@ -255,7 +263,9 @@
if (GETPOST('withtab', 'alpha'))
{
$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
-} else {
+}
+else
+{
$title = $langs->trans("BrowseBlockedLog");
}
@@ -269,7 +279,9 @@
if ($blocks == -2)
{
setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
- } else {
+ }
+ else
+ {
dol_print_error($block_static->db, $block_static->error, $block_static->errors);
exit;
}
@@ -286,7 +298,7 @@
if (GETPOST('withtab', 'alpha'))
{
$head = blockedlogadmin_prepare_head();
- print dol_get_fiche_head($head, 'fingerprints', '', -1);
+ dol_fiche_head($head, 'fingerprints', '', -1);
}
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("FingerprintsDesc")."<br></span>\n";
@@ -311,7 +323,6 @@
//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
print '<div class="right">';
print $langs->trans("RestrictYearToExport").': ';
@@ -429,7 +440,9 @@
// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
// to find the $loweridinerror.
-} else {
+}
+else
+{
// This is version that optimize the memory (but will not report errors that are outside the filter range)
$loweridinerror = 0;
$checkresult = array();
@@ -497,7 +510,9 @@
{
if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
- } else {
+ }
+ else
+ {
print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
}
@@ -559,7 +574,7 @@
if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL))
{
- ?>
+ ?>
<script type="text/javascript">
$.ajax({
@@ -582,7 +597,7 @@
if (GETPOST('withtab', 'alpha'))
{
- print dol_get_fiche_end();
+ dol_fiche_end();
}
print '<br><br>';