From cab801ca7f3f3e57cd0831a93d17c911e0cae334 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Fri, 4 May 2012 12:40:54 -0400 Subject: [PATCH] BUG 0000 Fix on sysGeneric for redirection on cross ws validation --- workflow/public_html/sysGeneric.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 9be302c32..2e61e0755 100755 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -571,9 +571,11 @@ //redirect to login, if user changed the workspace in the URL if (! $avoidChangedWorkspaceValidation && isset($_SESSION['WORKSPACE']) && $_SESSION['WORKSPACE'] != SYS_SYS) { $_SESSION['WORKSPACE'] = SYS_SYS; - G::SendTemporalMessage ('ID_USER_HAVENT_RIGHTS_SYSTEM', "error"); - header ( 'Location: /sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/main/login' ); + // verify if the current skin is a 'ux' variant + $urlPart = substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs' ? '/main/login' : '/login/login'; + + header('Location: /sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . $urlPart); die; }