mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-03-11 16:35:38 +00:00
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
This commit is contained in:
commit
fa9e8d9d66
|
@ -155,6 +155,8 @@
|
|||
and as long as no reviewer/approver has reviewed/approved the document
|
||||
- use only svg icons for mimetypes
|
||||
- add check for processes (reviews/approvals) where the user/group is deleted
|
||||
- redirect in op/op.Login.php to referuri will not add protocol and host,
|
||||
because this doesn't work if a reverse proxy is used (Closes #336)
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Changes in version 4.3.35
|
||||
|
|
|
@ -221,7 +221,8 @@ $controller->run();
|
|||
add_log_line();
|
||||
|
||||
if (isset($referuri) && strlen($referuri)>0) {
|
||||
header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri);
|
||||
// header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri);
|
||||
header("Location: " . $referuri);
|
||||
}
|
||||
else {
|
||||
header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($user->getHomeFolder() ? $user->getHomeFolder() : $settings->_rootFolderID)));
|
||||
|
|
Loading…
Reference in New Issue
Block a user