Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

2024-11-26 07:22:11 +00:00 · 2017-03-23 18:08:23 +01:00 · 2017-03-23 18:08:23 +01:00 · 6a7e23375c
commit 6a7e23375c
parent a799e091fb a001d32854
9 changed files with 99 additions and 14 deletions
--- a/11
+++ b/11
@ -10,6 +10,11 @@
 - added support for postgresql
 - document attachments can linked to a version and be public or hidden

+--------------------------------------------------------------------------------
+                     Changes in version 5.0.12
+--------------------------------------------------------------------------------
+- merged changes from 4.3.35
+
 --------------------------------------------------------------------------------
                     Changes in version 5.0.11
 --------------------------------------------------------------------------------
@ -88,6 +93,12 @@
 - add .xml to online file types by default
 - add home folder for users

+--------------------------------------------------------------------------------
+                     Changes in version 4.3.35
+--------------------------------------------------------------------------------
+- fix authentication in webdav.php (Closes #250)
+- update last access time only once a minute
+
 --------------------------------------------------------------------------------
                     Changes in version 4.3.34
 --------------------------------------------------------------------------------
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-VERSION=5.1.1
+VERSION=5.1.2
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp

--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@ -363,7 +363,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.1';
+			$this->version = '5.1.2';
 	} /* }}} */

 	/**
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@ -38,7 +38,7 @@ class SeedDMS_Core_DatabaseAccess {
 	protected $_hostname;

 	/**
-	 * @var int port number of database 
+	 * @var int port number of database
 	 */
 	protected $_port;

@ -91,7 +91,17 @@ class SeedDMS_Core_DatabaseAccess {
 	 * @var boolean set to true if in a database transaction
 	 */
 	private $_intransaction;
-	
+
+	/**
+	 * @var string set a valid file name for logging all sql queries
+	 */
+	private $_logfile;
+
+	/**
+	 * @var resource file pointer of log file
+	 */
+	private $_logfp;
+
 	/**
 	 * Return list of all database tables
 	 *
@ -142,6 +152,13 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_user = $user;
 		$this->_passw = $passw;
 		$this->_connected = false;
+		$this->_logfile = '';
+		if($this->_logfile) {
+			$this->_logfp = fopen($this->_logfile, 'a+');
+			if($this->_logfp)
+				fwrite($this->_logfp, microtime()."	BEGIN ------------------------------------------\n");
+		} else
+			$this->_logfp = null;
 		// $tt*****id is a hack to ensure that we do not try to create the
 		// temporary table twice during a single connection. Can be fixed by
 		// using Views (MySQL 5.0 onward) instead of temporary tables.
@ -166,6 +183,16 @@ class SeedDMS_Core_DatabaseAccess {
 		return $this->_driver;
 	} /* }}} */

+	/**
+	 * Destructor of SeedDMS_Core_DatabaseAccess
+	 */
+	function __destruct() { /* {{{ */
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	END --------------------------------------------\n");
+			fclose($this->_logfp);
+		}
+	} /* }}} */
+
 	/**
 	 * Connect to database
 	 *
@ -250,6 +277,10 @@ class SeedDMS_Core_DatabaseAccess {
 		if($retick && $this->_driver == 'pgsql') {
 			$queryStr = $this->rbt($queryStr);
 		}
+
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	".$queryStr."\n");
+		}
 		$res = $this->_conn->query($queryStr);
 		if ($res === false) {
 			if($this->_debug)
@ -274,6 +305,10 @@ class SeedDMS_Core_DatabaseAccess {
 		if($retick && $this->_driver == 'pgsql') {
 			$queryStr = $this->rbt($queryStr);
 		}
+
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	".$queryStr."\n");
+		}
 		$res = $this->_conn->exec($queryStr);
 		if($res === false) {
 			if($this->_debug)
@ -281,7 +316,7 @@ class SeedDMS_Core_DatabaseAccess {
 			return false;
 		} else
 			return true;
-		
+
 		return $res;
 	} /* }}} */

--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -12,11 +12,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2017-02-28</date>
+ <date>2017-03-23</date>
 <time>06:34:50</time>
 <version>
-  <release>5.1.1</release>
-  <api>5.1.1</api>
+  <release>5.1.2</release>
+  <api>5.1.2</api>
 </version>
 <stability>
  <release>stable</release>
@ -24,7 +24,6 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -1179,6 +1178,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
   </stability>
   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
   <notes>
+SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
+   </notes>
+  </release>
+  <release>
+   <date>2017-03-23</date>
+   <time>06:38:12</time>
+   <version>
+    <release>4.3.35</release>
+    <api>4.3.35</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
   </notes>
  </release>
  <release>
@ -1345,7 +1360,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
  </release>
  <release>
   <date>2017-02-28</date>
-   <time>06:23:34</time>
+   <time>07:07:02</time>
   <version>
    <release>5.0.11</release>
    <api>5.0.11</api>
@ -1375,5 +1390,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - added postgres support
   </notes>
  </release>
+  <release>
+   <date>2017-02-20</date>
+   <time>07:07:02</time>
+   <version>
+    <release>5.1.1</release>
+    <api>5.1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.0.11 merged
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@ -70,7 +70,8 @@ if (!isset($_COOKIE["mydms_session"])) {
 }

 /* Update last access time */
-$session->updateAccess($dms_session);
+if((int)$resArr['lastAccess']+60 < time())
+	$session->updateAccess($dms_session);

 /* Load user data */
 $user = $dms->getUser($resArr["userID"]);
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@ -20,7 +20,7 @@

 class SeedDMS_Version {

-	public $_number = "5.1.1";
+	public $_number = "5.1.2";
 	private $_string = "SeedDMS";

 	function __construct() {
--- a/install/install.php
+++ b/install/install.php
@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
 * Load default settings + set
 */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.1.1");
+define("SEEDDMS_VERSION", "5.1.2");

 require_once('../inc/inc.ClassSettings.php');

--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@ -138,7 +138,14 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server

 		if(!$userobj)
 			return false;
-		if(md5($pass) != $userobj->getPwd())
+
+		if(($userobj->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin))
+			return false;
+
+		if($userobj->isDisabled())
+			return false;
+
+		if($userobj->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != ""))
 			return false;

 		$this->user = $userobj;