Merge branch 'seeddms-4.1.2' into develop

Conflicts:
	Makefile
	inc/inc.Version.php
	install/install.php

CHANGELOG

@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.1.2
+--------------------------------------------------------------------------------
+- set propper internal folder path of sub folders after moving a folder
+  to a new place
+
 --------------------------------------------------------------------------------
                      Changes in version 4.1.1
 --------------------------------------------------------------------------------

Makefile

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 VERSION=4.2.0
-=======
-VERSION=4.1.1
->>>>>>> seeddms-4.1.1
 SRC=CHANGELOG inc conf utils index.php languages views op out 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

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

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -178,6 +178,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;
+
 		$this->_parentID = $newParent->getID();
 		$this->_parent = $newParent;
 
@@ -192,6 +193,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			$pathPrefix .= ":";
 		}
 
+		/* Update path in folderList for all documents */
 		$queryStr = "SELECT `tblDocuments`.`id`, `tblDocuments`.`folderList` FROM `tblDocuments` WHERE `folderList` LIKE '%:".$this->_id.":%'";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
@@ -203,6 +205,18 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			$res = $db->getResult($queryStr);
 		}
 
+		/* Update path in folderList for all documents */
+		$queryStr = "SELECT `tblFolders`.`id`, `tblFolders`.`folderList` FROM `tblFolders` WHERE `folderList` LIKE '%:".$this->_id.":%'";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+
+		foreach ($resArr as $row) {
+			$newPath = preg_replace("/^.*:".$this->_id.":(.*$)/", $pathPrefix."\\1", $row["folderList"]);
+			$queryStr="UPDATE `tblFolders` SET `folderList` = '".$newPath."' WHERE `tblFolders`.`id` = '".$row["id"]."'";
+			$res = $db->getResult($queryStr);
+		}
+
 		return true;
 	} /* }}} */
 

SeedDMS_Core/package.xml

@@ -15,16 +15,16 @@
  <date>2013-04-05</date>
  <time>16:08:38</time>
  <version>
-  <release>4.1.1</release>
+  <release>4.1.2</release>
-  <api>4.1.1</api>
+  <api>4.1.0</api>
  </version>
  <stability>
-  <release>beta</release>
+  <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- stay in sync with seeddms application
+- set propper folderList of sub folders after moving a folder
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -449,5 +449,21 @@ New release
 - minor bugfixes
    </notes>
   </release>
+  <release>
+   <date>2013-04-05</date>
+   <time>16:08:38</time>
+   <version>
+    <release>4.1.1</release>
+    <api>4.1.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- stay in sync with seeddms application
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,11 @@
 
 class SeedDMS_Version {
 
+<<<<<<< HEAD
 	var $_number = "4.2.0";
+=======
+	var $_number = "4.1.2";
+>>>>>>> seeddms-4.1.2
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

install/install.php

@@ -116,7 +116,11 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
+<<<<<<< HEAD
 define("SEEDDMS_VERSION", "4.2.0");
+=======
+define("SEEDDMS_VERSION", "4.1.2");
+>>>>>>> seeddms-4.1.2
 
 require_once('../inc/inc.ClassSettings.php');
 

views/bootstrap/class.ObjectCheck.php

@@ -46,7 +46,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				for ($i = 1; $i  < count($tmppath); $i++) {
 					print "/".htmlspecialchars($tmppath[$i]->getName());
 				}
-				print $folder->getName();
 				print "</a></td>";
 				
 				$owner = $folder->getOwner();