From afcd23969e95ca762ce7aaa9c87075f224ec5f93 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 1 Oct 2012 13:44:27 -0400 Subject: [PATCH] Add validation when change the url without a workspace but with a session active --- workflow/engine/methods/login/sysLogin.php | 4 ++++ workflow/engine/skinEngine/skinEngine.php | 24 ++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php index 869e75272..bdac765c2 100755 --- a/workflow/engine/methods/login/sysLogin.php +++ b/workflow/engine/methods/login/sysLogin.php @@ -30,6 +30,10 @@ if (isset ($_POST['form']['USER_ENV'])) { die (); } +@session_destroy(); +session_start(); +session_regenerate_id(); + //Required classes for dbArray work require_once ("propel/Propel.php"); require_once ("creole/Creole.php"); diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 6e07d23a1..992c52aa2 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -240,22 +240,22 @@ class SkinEngine $templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileExtjs['basename']; } - + $template = new TemplatePower($templateFile); $template->prepare(); $template->assign('header', $header); $template->assign('styles', $styles); $template->assign('bodyTemplate', $body); - + // verify is RTL $oServerConf =& serverConf::getSingleton(); if ($oServerConf->isRtl(SYS_LANG)) { - $template->assign('dirBody', 'dir="RTL"'); + $template->assign('dirBody', 'dir="RTL"'); } // end verify // verify is IE - $doctype = ''; + $doctype = ''; $meta = ''; $iexplores = array( 'IE=10' => '(MSIE 10\.[0-9]+)', @@ -264,16 +264,16 @@ class SkinEngine 'IE=7' => '(MSIE 7\.[0-9]+)', 'IE=6' => '(MSIE 6\.[0-9]+)' ); - - foreach ($iexplores as $browser => $pattern) { + + foreach ($iexplores as $browser => $pattern) { if (preg_match('/'.$pattern.'/', $_SERVER['HTTP_USER_AGENT'])) { $doctype = ''; - $meta = ''; - } + $meta = ''; + } } // end verify - - $template->assign('meta', $meta); + + $template->assign('meta', $meta); $template->assign('doctype', $doctype); echo $template->getOutputContent(); } @@ -598,7 +598,9 @@ class SkinEngine $header = ''; if (isset($oHeadPublisher)) { - $oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : ''; + if (defined('SYS_SYS')) { + $oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : ''; + } $header = $oHeadPublisher->printHeader(); $header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName); }