Add validation when change the url without a workspace but with a session active
This commit is contained in:
@@ -30,6 +30,10 @@ if (isset ($_POST['form']['USER_ENV'])) {
|
|||||||
die ();
|
die ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@session_destroy();
|
||||||
|
session_start();
|
||||||
|
session_regenerate_id();
|
||||||
|
|
||||||
//Required classes for dbArray work
|
//Required classes for dbArray work
|
||||||
require_once ("propel/Propel.php");
|
require_once ("propel/Propel.php");
|
||||||
require_once ("creole/Creole.php");
|
require_once ("creole/Creole.php");
|
||||||
|
|||||||
@@ -240,22 +240,22 @@ class SkinEngine
|
|||||||
|
|
||||||
$templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileExtjs['basename'];
|
$templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileExtjs['basename'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$template = new TemplatePower($templateFile);
|
$template = new TemplatePower($templateFile);
|
||||||
$template->prepare();
|
$template->prepare();
|
||||||
$template->assign('header', $header);
|
$template->assign('header', $header);
|
||||||
$template->assign('styles', $styles);
|
$template->assign('styles', $styles);
|
||||||
$template->assign('bodyTemplate', $body);
|
$template->assign('bodyTemplate', $body);
|
||||||
|
|
||||||
// verify is RTL
|
// verify is RTL
|
||||||
$oServerConf =& serverConf::getSingleton();
|
$oServerConf =& serverConf::getSingleton();
|
||||||
if ($oServerConf->isRtl(SYS_LANG)) {
|
if ($oServerConf->isRtl(SYS_LANG)) {
|
||||||
$template->assign('dirBody', 'dir="RTL"');
|
$template->assign('dirBody', 'dir="RTL"');
|
||||||
}
|
}
|
||||||
// end verify
|
// end verify
|
||||||
|
|
||||||
// verify is IE
|
// verify is IE
|
||||||
$doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
|
$doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
|
||||||
$meta = '';
|
$meta = '';
|
||||||
$iexplores = array(
|
$iexplores = array(
|
||||||
'IE=10' => '(MSIE 10\.[0-9]+)',
|
'IE=10' => '(MSIE 10\.[0-9]+)',
|
||||||
@@ -264,16 +264,16 @@ class SkinEngine
|
|||||||
'IE=7' => '(MSIE 7\.[0-9]+)',
|
'IE=7' => '(MSIE 7\.[0-9]+)',
|
||||||
'IE=6' => '(MSIE 6\.[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'])) {
|
if (preg_match('/'.$pattern.'/', $_SERVER['HTTP_USER_AGENT'])) {
|
||||||
$doctype = '';
|
$doctype = '';
|
||||||
$meta = '<meta http-equiv="X-UA-Compatible" content="'. $browser .'"/>';
|
$meta = '<meta http-equiv="X-UA-Compatible" content="'. $browser .'"/>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// end verify
|
// end verify
|
||||||
|
|
||||||
$template->assign('meta', $meta);
|
$template->assign('meta', $meta);
|
||||||
$template->assign('doctype', $doctype);
|
$template->assign('doctype', $doctype);
|
||||||
echo $template->getOutputContent();
|
echo $template->getOutputContent();
|
||||||
}
|
}
|
||||||
@@ -598,7 +598,9 @@ class SkinEngine
|
|||||||
$header = '';
|
$header = '';
|
||||||
|
|
||||||
if (isset($oHeadPublisher)) {
|
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->printHeader();
|
||||||
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
|
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user