Merge pull request #7 from xpressengine/develop

Develop
xpressengine · Oct 4, 2014 · 5b86ea4 · 5b86ea4
2 parents 12efdf6 + 5b61879
commit 5b86ea4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 65 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -259,19 +259,21 @@ module.exports = function(grunt) {
 			if(tasks.length === 0) {
 				grunt.util.spawn({
 					cmd: "tar",
-					args: ['cfz', 'xe.'+version+'.tar.gz', 'xe/'],
+					args: ['cfz', '../xe.'+version+'.tar.gz', './'],
 					opts: {
-						cwd: 'build'
+						cwd: 'build/xe',
+						cache: false
 					}
 				}, function (error, result, code) {
 					grunt.log.ok('Archived(full) : ' + build_dir + '/xe.'+version+'.tar.gz');
 					createPackageChecksum(build_dir + '/xe.'+version+'.tar.gz');
 
 					grunt.util.spawn({
 						cmd: "zip",
-						args: ['-r', 'xe.'+version+'.zip', 'xe/'],
+						args: ['-r', '../xe.'+version+'.zip', './'],
 						opts: {
-							cwd: 'build'
+							cwd: 'build/xe',
+							cache: false
 						}
 					}, function (error, result, code) {
 						grunt.log.ok('Archived(full) : ' + build_dir + '/xe.'+version+'.zip');
@@ -313,8 +315,8 @@ module.exports = function(grunt) {
 
 					// changed
 					if(diff.length) {
-						var args_tar = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.tar.gz', version];
-						var args_zip = ['archive', '--prefix=xe/', '-o', 'build/xe.'+version+'.changed.zip', version];
+						var args_tar = ['archive', '-o', 'build/xe.'+version+'.changed.tar.gz', version];
+						var args_zip = ['archive', '-o', 'build/xe.'+version+'.changed.zip', version];
 						args_tar = args_tar.concat(diff);
 						args_zip = args_zip.concat(diff);
 

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
@@ -1295,14 +1295,16 @@ function _filterRequestVar($key, $val, $do_stripslashes = 1)
 			}
 			else
 			{
+				$result[$k] = $v;
+
 				if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc())
 				{
-					$v = stripslashes($v);
+					$result[$k] = stripslashes($result[$k]);
 				}
 
-				if(!is_array($v))
+				if(!is_array($result[$k]))
 				{
-					$result[$k] = trim($v);
+					$result[$k] = trim($result[$k]);
 				}
 			}
 		}

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
@@ -380,22 +380,6 @@ function procModule()
 			$kind = 'admin';
 		}
 
-		if($kind == 'admin')
-		{
-			$oMemberController = ModuleHandler::getModuleInstance('member', 'controller');
-			$validate_session = $oMemberController->validateSession();
-			$oMemberController->regenerateSession();
-			if(!$validate_session)
-			{
-				$this->error = 'security_invalid_session';
-				$oMessageObject = ModuleHandler::getModuleInstance('message', 'view');
-				$oMessageObject->setError(-1);
-				$oMessageObject->setMessage($this->error);
-				$oMessageObject->dispMessage();
-				return $oMessageObject;
-			}
-		}
-
 		// check REQUEST_METHOD in controller
 		if($type == 'controller')
 		{

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.7.1');
+define('__XE_VERSION__', '1.7.7.2');
 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/document/document.controller.php b/modules/document/document.controller.php
@@ -822,6 +822,9 @@ function moveDocumentToTrash($obj)
 	 */
 	function updateReadedCount(&$oDocument)
 	{
+		// Pass if Crawler access
+		if(isCrawler()) return false;
+
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
 		$logged_info = Context::get('logged_info');

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
@@ -1810,8 +1810,6 @@ function doLogin($user_id, $password = '', $keep_signed = false)
 			}
 		}
 
-		$_SESSION['session_checkup'] = null;
-		$this->regenerateSession();
 		$this->setSessionInfo();
 
 		return $output;
@@ -1871,37 +1869,6 @@ function setSessionInfo()
 		$this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
 	}
 
-	function validateSession()
-	{
-		$destory_session = false;
-		if($_SESSION['destroyed'] === true) $destory_session = true;
-
-		if($destory_session)
-		{
-			$this->destroySessionInfo();
-			return false;
-		}
-
-		return true;
-	}
-
-	function regenerateSession()
-	{
-		if(!$_SESSION['session_checkup'])
-		{
-			$_SESSION['session_checkup'] = time();
-		}
-
-		if(time() - $_SESSION['session_checkup'] > 30)
-		{
-			$_SESSION['destroyed'] = true;
-			session_regenerate_id();
-			$_SESSION['destroyed'] = false;
-			$_SESSION['session_checkup'] = time();
-		}
-	}
-
-
 	/**
 	 * Logged method for providing a personalized menu
 	 * Login information is used in the output widget, or personalized page

diff --git a/modules/member/member.model.php b/modules/member/member.model.php
@@ -234,12 +234,6 @@ function getLoggedInfo()
 			}
 			Context::set('logged_info', $logged_info);
 
-			if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
-			{
-				$oMemberController = getController('member');
-				$oMemberController->regenerateSession();
-			}
-
 			return $logged_info;
 		}
 		return NULL;