diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 1ed44854d..2f8ca22e6 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -367,6 +367,8 @@ class Context $this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE); // set locations for javascript use + $url = array(); + $current_url = self::getRequestUri(); if($_SERVER['REQUEST_METHOD'] == 'GET') { if($this->get_vars) @@ -386,17 +388,21 @@ class Context $url[] = $key . '=' . urlencode($val); } } - $this->set('current_url', self::getRequestUri() . '?' . join('&', $url)); + + $current_url = self::getRequestUri(); + if($url) $current_url .= '?' . join('&', $url); } else { - $this->set('current_url', $this->getUrl()); + $current_url = $this->getUrl(); } } else { - $this->set('current_url', self::getRequestUri()); + $current_url = self::getRequestUri(); } + + $this->set('current_url', $current_url); $this->set('request_uri', self::getRequestUri()); } @@ -1157,6 +1163,7 @@ class Context { continue; } + $key = htmlentities($key); $val = $this->_filterRequestVar($key, $val); if($requestMethod == 'GET' && isset($_GET[$key])) diff --git a/common/tpl/redirect.html b/common/tpl/redirect.html index 72a28491c..e785edf71 100644 --- a/common/tpl/redirect.html +++ b/common/tpl/redirect.html @@ -5,8 +5,9 @@ - \ No newline at end of file + diff --git a/config/config.inc.php b/config/config.inc.php index 8ebde8bd1..b27624c4a 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -29,7 +29,7 @@ define('__ZBXE__', __XE__); /** * Display XE's full version. */ -define('__XE_VERSION__', '1.7.10'); +define('__XE_VERSION__', '1.7.11'); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 97465b585..18aeed71a 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -267,6 +267,15 @@ class boardView extends board } } + // if the document is TEMP saved, check Grant + if($oDocument->getStatus() == 'TEMP') + { + if(!$oDocument->isGranted()) + { + $oDocument = $oDocumentModel->getDocument(0); + } + } + } else { diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 4a2bedfd0..05f9ecafc 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -876,7 +876,10 @@ class documentController extends document } // Register session - $_SESSION['readed_document'][$document_srl] = true; + if(!$_SESSION['banned_document'][$document_srl]) + { + $_SESSION['readed_document'][$document_srl] = true; + } return TRUE; } diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 2add76494..015b06968 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -355,7 +355,7 @@ class installController extends install if(function_exists('xml_parser_create')) $checklist['xml'] = true; else $checklist['xml'] = false; // 3. Check if ini_get (session.auto_start) == 1 - if(ini_get(session.auto_start)!=1) $checklist['session'] = true; + if(ini_get('session.auto_start')!=1) $checklist['session'] = true; else $checklist['session'] = false; // 4. Check if iconv exists if(function_exists('iconv')) $checklist['iconv'] = true; diff --git a/modules/menu/tpl/css/sitemap.css b/modules/menu/tpl/css/sitemap.css index d44e61b5b..d10971b5b 100644 --- a/modules/menu/tpl/css/sitemap.css +++ b/modules/menu/tpl/css/sitemap.css @@ -46,6 +46,9 @@ body>.x{max-width:none !important} .col>*>h1>a[target="_blank"]:after{vertical-align:middle;opacity:.75;filter:alpha(opacity=75)} .col>*>h1>a:hover, .col>*>h1>a:focus{color:#06C} +.col #menu_find{height:32px} +.col #menu_find input[type="text"]{margin-bottom: 0} +.col #menu_find button[type="button"]{visibility: hidden} .col>.x_close{position:absolute;top:0;right:0;width:30px;height:30px;color:#666;font-size:17px;opacity:.75;filter:alpha(opacity=75)} .col input[type="checkbox"], .col input[type="radio"]{margin:0} diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 9c3794fc2..5ab616fad 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -22,6 +22,11 @@

{$lang->menu_gnb_sub['siteMap']} {$lang->help}

+
\ No newline at end of file