Merge branch 'seeddms-4.3.5' into develop

CHANGELOG

@@ -5,7 +5,9 @@
 - fix ordering by sequence in folder listing
 - list mandatory approvers/reviewers without access on document
 - login failures will actually increment the failure counter of the user
-- fix runtime error when doing operations on root folder (Bug #128)
+- fix error when doing operations on root folder and notification is
+  turned on (Bug #128)
+- renew session timeout on each click unless cookie lifetime is set to 0
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.4

inc/inc.Authentication.php

@@ -93,4 +93,10 @@ if (!$user->isAdmin()) {
 		}
 	}
 }
+
+/* Update cookie lifetime */
+if($settings->_cookieLifetime) {
+	$lifetime = time() + intval($settings->_cookieLifetime);
+	setcookie("mydms_session", $dms_session, $lifetime, $settings->_httpRoot, null, null, true);
+}
 ?>

op/op.Ajax.php

@@ -48,12 +48,11 @@ if (isset($_COOKIE["mydms_session"])) {
 			$user = $dms->getUser($resArr["su"]);
 		}
 	}
+	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
 } else {
 	$user = null;
 }
 
-include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
-
 $command = $_REQUEST["command"];
 switch($command) {
 	case 'checkpwstrength':
@@ -75,6 +74,12 @@ switch($command) {
 		}
 		break;
 
+	case 'sessioninfo': /* {{{ */
+		if($user) {
+			echo json_encode($resArr);
+		}	
+		break; /* }}} */
+
 	case 'searchdocument': /* {{{ */
 		if($user) {
 			$query = $_GET['query'];
@@ -108,6 +113,7 @@ switch($command) {
 		break; /* }}} */
 
 	case 'subtree': /* {{{ */
+		if($user) {
 			if(empty($_GET['node']))
 				$nodeid = $settings->_rootFolderID;
 			else
@@ -140,9 +146,11 @@ switch($command) {
 
 			echo json_encode($tree);
 	//		echo json_encode(array(array('label'=>'test1', 'id'=>1, 'load_on_demand'=> true), array('label'=>'test2', 'id'=>2, 'load_on_demand'=> true)));
+		}
 		break; /* }}} */
 
 	case 'addtoclipboard': /* {{{ */
+		if($user) {
 			if (isset($_GET["id"]) && is_numeric($_GET["id"]) && isset($_GET['type'])) {
 				switch($_GET['type']) {
 					case "folder":
@@ -161,6 +169,7 @@ switch($command) {
 				echo json_encode($content);
 			} else {
 			}
+		}
 		break; /* }}} */
 
 	case 'testmail': /* {{{ */