Peter M. Groen / knowledgetree

Commit f6211d3cb2ebd4b48d2dc7de9d8081b346ece67c

Authored by conradverm
1 parent fa0db5fb

KTS-1857 

"FolderUtil has a typo in validaion and has some debug output that impacts on web services."
Fixed.

Reviewed By: Jalaloedien Abrahams

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6453 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
lib/foldermanagement/folderutil.inc.php
  View file @f6211d3
@@ -72,7 +72,7 @@ class KTFolderUtil { @@ -72,7 +72,7 @@ class KTFolderUtil {
72 } 72 }
73 73
74 // check for conflicts first 74 // check for conflicts first
75 - if (Folder::folderExistsName(KTUtil::getId($oParentfolder), $sFolderName)) { 75 + if (Folder::folderExistsName(KTUtil::getId($oParentFolder), $sFolderName)) {
76 return PEAR::raiseError(sprintf(_kt('The folder %s already exists.'), $sFolderName)); 76 return PEAR::raiseError(sprintf(_kt('The folder %s already exists.'), $sFolderName));
77 } 77 }
78 78
@@ -215,7 +215,7 @@ class KTFolderUtil { @@ -215,7 +215,7 @@ class KTFolderUtil {
215 KTPermissionUtil::inheritPermissionObject($oFolder, $aOptions); 215 KTPermissionUtil::inheritPermissionObject($oFolder, $aOptions);
216 } 216 }
217 217
218 - return; 218 + return true;
219 } 219 }
220 220
221 function rename($oFolder, $sNewName, $oUser) { 221 function rename($oFolder, $sNewName, $oUser) {
@@ -529,12 +529,12 @@ class KTFolderUtil { @@ -529,12 +529,12 @@ class KTFolderUtil {
529 } 529 }
530 530
531 531
532 - var_dump($aFolderMap); 532 + // var_dump($aFolderMap);
533 533
534 // now we can go ahead. 534 // now we can go ahead.
535 foreach ($aDocuments as $oDocument) { 535 foreach ($aDocuments as $oDocument) {
536 $oChildDestinationFolder = Folder::get($aFolderMap[$oDocument->getFolderID()]); 536 $oChildDestinationFolder = Folder::get($aFolderMap[$oDocument->getFolderID()]);
537 - var_dump($oDocument->getFolderID()); 537 +// var_dump($oDocument->getFolderID());
538 $res = KTDocumentUtil::copy($oDocument, $oChildDestinationFolder); 538 $res = KTDocumentUtil::copy($oDocument, $oChildDestinationFolder);
539 if (PEAR::isError($res) || ($res === false)) { 539 if (PEAR::isError($res) || ($res === false)) {
540 $oStorage->removeFolder($oNewBaseFolder); 540 $oStorage->removeFolder($oNewBaseFolder);