Peter M. Groen / knowledgetree

Commit ac19c27b65f633bb7542f69609c73b35b4ecf323

Authored by Megan Watson
1 parent 02be468a

Function now iterates through the folder path using the previous folder id as th… 

…e parent id. Moved additional parameter into WS V3.
PT: 2239730
    
Committed by: Megan Watson
Inline Side-by-side
Showing 2 changed files with 9 additions and 12 deletions
ktapi/KTAPIFolder.inc.php
  View file @ac19c27
@@ -288,10 +288,10 @@ class KTAPI_Folder extends KTAPI_FolderItem @@ -288,10 +288,10 @@ class KTAPI_Folder extends KTAPI_FolderItem
288 * @access public 288 * @access public
289 * @param KTAPI $ktapi 289 * @param KTAPI $ktapi
290 * @param string $foldername 290 * @param string $foldername
291 - * @param int $folderid 291 + * @param int $folderid The parent folder id
292 * @return KTAPI_Folder 292 * @return KTAPI_Folder
293 */ 293 */
294 - function _get_folder_by_name($ktapi, $foldername, $parentId) 294 + function _get_folder_by_name($ktapi, $foldername, $folderid)
295 { 295 {
296 $foldername=trim($foldername); 296 $foldername=trim($foldername);
297 if (empty($foldername)) 297 if (empty($foldername))
@@ -310,8 +310,8 @@ class KTAPI_Folder extends KTAPI_FolderItem @@ -310,8 +310,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
310 $foldername = KTUtil::replaceInvalidCharacters($foldername); 310 $foldername = KTUtil::replaceInvalidCharacters($foldername);
311 $foldername = sanitizeForSQL($foldername); 311 $foldername = sanitizeForSQL($foldername);
312 $sql = "SELECT id FROM folders WHERE 312 $sql = "SELECT id FROM folders WHERE
313 - (name='$foldername' and parent_id=$parentId) OR  
314 - (name='$foldername' and parent_id is null and $parentId=1)"; 313 + (name='$foldername' and parent_id=$folderid) OR
  314 + (name='$foldername' and parent_id is null and $folderid=1)";
315 $row = DBUtil::getOneResult($sql); 315 $row = DBUtil::getOneResult($sql);
316 if (is_null($row) || PEAR::isError($row)) 316 if (is_null($row) || PEAR::isError($row))
317 { 317 {
@@ -552,8 +552,8 @@ class KTAPI_Folder extends KTAPI_FolderItem @@ -552,8 +552,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
552 552
553 foreach ($folder_children as $folder) 553 foreach ($folder_children as $folder)
554 { 554 {
555 -  
556 - if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder) 555 +
  556 + if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder)
557 /*|| KTPermissionUtil::userHasPermissionOnItem($user, $read_permission, $folder)*/) 557 /*|| KTPermissionUtil::userHasPermissionOnItem($user, $read_permission, $folder)*/)
558 { 558 {
559 if ($depth-1 > 0) 559 if ($depth-1 > 0)
ktwebservice/webservice.php
  View file @ac19c27
@@ -769,20 +769,17 @@ class KTWebService @@ -769,20 +769,17 @@ class KTWebService
769 769
770 // get_folder_detail_by_name 770 // get_folder_detail_by_name
771 $this->__dispatch_map['get_folder_detail_by_name'] = 771 $this->__dispatch_map['get_folder_detail_by_name'] =
772 - array('in' => array('session_id' => 'string', 'folder_name' => 'string', 'parent_id' => 'int' ), 772 + array('in' => array('session_id' => 'string', 'folder_name' => 'string'),
773 'out' => array('return' => "{urn:$this->namespace}kt_folder_detail"), 773 'out' => array('return' => "{urn:$this->namespace}kt_folder_detail"),
774 ); 774 );
775 775
776 - /* If this is now the same as version 2 for this function, we don't need this.  
777 - *  
778 if ($this->version >=3) 776 if ($this->version >=3)
779 { 777 {
780 - // was  
781 - $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' ); 778 + // was
  779 + //$this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' );
782 // now 780 // now
783 $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'parent_id'=>'int' ); 781 $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'parent_id'=>'int' );
784 } 782 }
785 - */  
786 783
787 // get_folder_contents 784 // get_folder_contents
788 $this->__dispatch_map['get_folder_contents'] = 785 $this->__dispatch_map['get_folder_contents'] =