Peter M. Groen / knowledgetree

Commit 8daa489cdacd6cfdc68b50f055494d25fffc99d6

Authored by michael
1 parent 1ee45ecb

fixed redirection 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@475 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
control.php
  View file @8daa489
@@ -46,15 +46,21 @@ if (!$page) { @@ -46,15 +46,21 @@ if (!$page) {
46 // redirect to no permission page 46 // redirect to no permission page
47 redirect("$default->owl_ui_url/noAccess.php"); 47 redirect("$default->owl_ui_url/noAccess.php");
48 } else { 48 } else {
  49 + $default->log->debug("control.php redirect=$redirect");
49 $page = $default->owl_root_url . $page; 50 $page = $default->owl_root_url . $page;
50 // set authorised flag and redirect 51 // set authorised flag and redirect
51 // strip querystring form $page before setting page authorisation flag 52 // strip querystring form $page before setting page authorisation flag
52 if (strstr($page, "?")) { 53 if (strstr($page, "?")) {
53 $accessPage = substr($page, 0, strpos($page, "?")); 54 $accessPage = substr($page, 0, strpos($page, "?"));
54 - $default->log->debug("control.php: page without querystring=$accessPage"); 55 + $default->log->debug("control.php: page without querystring=$accessPage; with=$page");
55 } else { 56 } else {
56 $accessPage = $page; 57 $accessPage = $page;
57 } 58 }
  59 +
  60 + if (strlen($redirect) > 0) {
  61 + $page = $page . (strstr($page, "?") ? "&redirect=$redirect" : "?redirect=$redirect");
  62 + }
  63 +
58 $_SESSION["pageAccess"][$accessPage] = true; 64 $_SESSION["pageAccess"][$accessPage] = true;
59 $default->log->debug("control.php: just set SESSION[\"pageAccess\"][$accessPage]=" . $_SESSION["pageAccess"][$accessPage]); 65 $default->log->debug("control.php: just set SESSION[\"pageAccess\"][$accessPage]=" . $_SESSION["pageAccess"][$accessPage]);
60 redirect($page); 66 redirect($page);