Merge branch 'hotfix/1.7.11'

bnu · bnu · commit 07c28ac41eac · 2015-02-17T14:57:26.000+09:00
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
@@ -367,6 +367,8 @@ function init()
 		$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 @@ function init()
 						$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 @@ function _setRequestArgument()
 			{
 				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
@@ -5,8 +5,9 @@
 </head>
 <body>
     <script>
-        var idx = location.href.indexOf('?');
-        var url = parent.location.href;
+        var url = location.href;
+        var idx = url.indexOf('?');
+
         if(idx > -1 ) {
             var query_string = location.href.substr(idx+1, location.href.length);
             var args = {};
@@ -23,4 +24,4 @@
         }
     </script>
 </body>
-</html>
+</html>
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -29,7 +29,7 @@
 /**
  * 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
@@ -267,6 +267,15 @@ function dispBoardContentView(){
 					}
 				}
 
+				// 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
@@ -876,7 +876,10 @@ function updateReadedCount(&$oDocument)
 		}
 
 		// 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/point/point.controller.php b/modules/point/point.controller.php
@@ -420,10 +420,12 @@ function triggerUpdateReadedCount(&$obj)
 		// Get the defaul configurations of the Point Module
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
+		$_SESSION['banned_document'][$obj->document_srl] = false;
 		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
+			$_SESSION['banned_document'][$obj->document_srl] = true;
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,8 @@ function init()`
`367`	`367`	`$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);`
`368`	`368`
`369`	`369`	`// set locations for javascript use`
	`370`	`+ $url = array();`
	`371`	`+ $current_url = self::getRequestUri();`
`370`	`372`	`if($_SERVER['REQUEST_METHOD'] == 'GET')`
`371`	`373`	`{`
`372`	`374`	`if($this->get_vars)`
`@@ -386,17 +388,21 @@ function init()`
`386`	`388`	`$url[] = $key . '=' . urlencode($val);`
`387`	`389`	`}`
`388`	`390`	`}`
`389`		`- $this->set('current_url', self::getRequestUri() . '?' . join('&', $url));`
	`391`	`+`
	`392`	`+ $current_url = self::getRequestUri();`
	`393`	`+ if($url) $current_url .= '?' . join('&', $url);`
`390`	`394`	`}`
`391`	`395`	`else`
`392`	`396`	`{`
`393`		`- $this->set('current_url', $this->getUrl());`
	`397`	`+ $current_url = $this->getUrl();`
`394`	`398`	`}`
`395`	`399`	`}`
`396`	`400`	`else`
`397`	`401`	`{`
`398`		`- $this->set('current_url', self::getRequestUri());`
	`402`	`+ $current_url = self::getRequestUri();`
`399`	`403`	`}`
	`404`	`+`
	`405`	`+ $this->set('current_url', $current_url);`
`400`	`406`	`$this->set('request_uri', self::getRequestUri());`
`401`	`407`	`}`
`402`	`408`
`@@ -1157,6 +1163,7 @@ function _setRequestArgument()`
`1157`	`1163`	`{`
`1158`	`1164`	`continue;`
`1159`	`1165`	`}`
	`1166`	`+ $key = htmlentities($key);`
`1160`	`1167`	`$val = $this->_filterRequestVar($key, $val);`
`1161`	`1168`
`1162`	`1169`	`if($requestMethod == 'GET' && isset($_GET[$key]))`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,15 @@ function dispBoardContentView(){`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
	`270`	`+ // if the document is TEMP saved, check Grant`
	`271`	`+ if($oDocument->getStatus() == 'TEMP')`
	`272`	`+ {`
	`273`	`+ if(!$oDocument->isGranted())`
	`274`	`+ {`
	`275`	`+ $oDocument = $oDocumentModel->getDocument(0);`
	`276`	`+ }`
	`277`	`+ }`
	`278`	`+`
`270`	`279`	`}`
`271`	`280`	`else`
`272`	`281`	`{`
Original file line number	Diff line number	Diff line change
`@@ -876,7 +876,10 @@ function updateReadedCount(&$oDocument)`
`876`	`876`	`}`
`877`	`877`
`878`	`878`	`// Register session`
`879`		`- $_SESSION['readed_document'][$document_srl] = true;`
	`879`	`+ if(!$_SESSION['banned_document'][$document_srl])`
	`880`	`+ {`
	`881`	`+ $_SESSION['readed_document'][$document_srl] = true;`
	`882`	`+ }`
`880`	`883`
`881`	`884`	`return TRUE;`
`882`	`885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,10 +420,12 @@ function triggerUpdateReadedCount(&$obj)`
`420`	`420`	`// Get the defaul configurations of the Point Module`
`421`	`421`	`$config = $oModuleModel->getModuleConfig('point');`
`422`	`422`	`// When the requested points are negative, compared it with the current point`
	`423`	`+ $_SESSION['banned_document'][$obj->document_srl] = false;`
`423`	`424`	`if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)`
`424`	`425`	`{`
`425`	`426`	`$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);`
`426`	`427`	`$obj->add('content', $message);`
	`428`	`+ $_SESSION['banned_document'][$obj->document_srl] = true;`
`427`	`429`	`return new Object(-1, $message);`
`428`	`430`	`}`
`429`	`431`	`// If not logged in, pass`