Merge branch 'seeddms-4.3.5' into develop

Conflicts:
	Makefile

CHANGELOG

@@ -5,6 +5,7 @@
 - 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)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.4

Makefile

@@ -1,4 +1,4 @@
-VERSION=4.3.4
+VERSION=4.3.5
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.4';
+			$this->version = '4.3.5';
 	} /* }}} */
 
 	function getDB() { /* {{{ */

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2014-02-01</date>
+ <date>2014-03-04</date>
  <time>16:19:34</time>
  <version>
-  <release>4.3.4</release>
+  <release>4.3.5</release>
-  <api>4.3.4</api>
+  <api>4.3.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fix handling of multivalue attributes
+no changes
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -602,5 +602,21 @@ New release
 - make all functions in SeedDMS_Core_File static (fixes problem with php 5.5.x)
    </notes>
   </release>
+  <release>
+   <date>2014-02-01</date>
+   <time>16:19:34</time>
+   <version>
+    <release>4.3.4</release>
+    <api>4.3.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fix handling of multivalue attributes
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	var $_number = "4.3.4";
+	var $_number = "4.3.5";
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

install/install.php

@@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.3");
+define("SEEDDMS_VERSION", "4.3.5");
 
 require_once('../inc/inc.ClassSettings.php');
 

op/op.FolderAccess.php

@@ -145,7 +145,10 @@ if ($action == "setowner") {
 			$message = "ownership_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			if($folder->getParent())
 				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			else
+				$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['old_owner'] = $oldOwner->getFullName();
 			$params['new_owner'] = $newOwner->getFullName();
@@ -189,7 +192,10 @@ else if ($action == "notinherit") {
 			$message = "access_permission_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			if($folder->getParent())
 				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			else
+				$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;
@@ -222,6 +228,9 @@ else if ($action == "notinherit") {
 			$message = "access_permission_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			if($folder->getParent())
+				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			else
 				$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
@@ -273,7 +282,10 @@ else if ($action == "inherit") {
 			$message = "access_permission_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			if($folder->getParent())
 				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			else
+				$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;