From dc29b17c9758af945a4f85c0fc7e8ee78d4e007d Mon Sep 17 00:00:00 2001 From: ovclas Date: Mon, 2 Jul 2012 05:09:03 +0000 Subject: [PATCH] merge from 10807, 10815 git-svn-id: http://xe-core.googlecode.com/svn/trunk@10817 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- modules/document/document.controller.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index f6d77f31e..f2e53b33a 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -13,7 +13,7 @@ * @brief display XE's full version * Even The file should be revised when releasing altough no change is made **/ - define('__XE_VERSION__', '1.5.2.6'); + define('__XE_VERSION__', '1.5.2.7'); define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. /** diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 7cfb853c8..a805a4cb1 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1786,9 +1786,9 @@ class documentController extends document { { // Check login information if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); - $module_info = Context::get('module_info'); $logged_info = Context::get('logged_info'); + // Get form information $obj = Context::getRequestVars(); // Change the target module to log-in information @@ -1805,8 +1805,17 @@ class documentController extends document { $oDocumentController = &getController('document'); // Check if already exist geulinji $oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager); + // Update if already exists if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) { + if($oDocument->get('module_srl') != $obj->module_srl) + { + return new Object(-1, 'msg_invalid_request'); + } + if(!$oDocument->isGranted()) + { + return new Object(-1, 'msg_invalid_request'); + } //if exist document status is already public, use temp status can point problem $obj->status = $oDocument->get('status'); $output = $oDocumentController->updateDocument($oDocument, $obj);