USER_HISTORY-236 Fix the session block funcionality

This commit is contained in:
Brayan Pereyra
2025-09-24 14:18:54 +00:00
parent 177c7fd5f7
commit 06497d362e
14 changed files with 187 additions and 39 deletions

View File

@@ -354,14 +354,13 @@ class Menu
//$aux = $this->Icons[$ncount];
$aux = $this->JS[$ncount];
if ($this->Types[$ncount] == 'absolute') {
//$target = G::encryptLink(str_replace('sys' . SYS_TEMP, SYS_TEMP, $this->Options[$ncount]));
$target = $this->Options[$ncount];
}
if ($this->Types[$ncount] != 'absolute') {
if (!empty(config("system.workspace"))) {
$target = '/sys' . SYS_TEMP . G::encryptLink('/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]);
$target = '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount];
} else {
$target = '/sys/' . G::encryptLink(SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]);
$target = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount];
}
}
$label = $this->Labels[$ncount];

View File

@@ -327,8 +327,8 @@ class pagedTable
} else {
$this->filter = "";
}
$this->ajaxServer = G::encryptLink('../gulliver/pagedTableAjax');
$this->ownerPage = G::encryptLink(SYS_CURRENT_URI);
$this->ajaxServer = '../gulliver/pagedTableAjax';
$this->ownerPage = SYS_CURRENT_URI;
//Needed for $mysql_real_escape_string
$auxDbc = new DBConnection();
if (isset($this->xmlForm->sql)) {
@@ -420,11 +420,11 @@ class pagedTable
// $xmlPopup='';
// $this->xmlFormFile="";
///* if ($table->Action)
// $this->ajaxServer=G::encryptLink($table->Action);
// $this->ajaxServer=$table->Action;
// else*/
// $this->ajaxServer=G::encryptLink('../gulliver/pagedTableAjax');
// $this->ajaxServer='../gulliver/pagedTableAjax';
// $this->popupPage = $this->ajaxServer . '?function=printForm&filename=' . urlencode($xmlPopup);
// $this->ownerPage=G::encryptLink(SYS_CURRENT_URI);
// $this->ownerPage=SYS_CURRENT_URI;
// $this->sqlConnection='';
// if (isset($table->_source))
// $this->sqlSelect=$table->_source;