diff --git a/ktapi/KTAPIFolder.inc.php b/ktapi/KTAPIFolder.inc.php index 74b9d5d..3b701a2 100755 --- a/ktapi/KTAPIFolder.inc.php +++ b/ktapi/KTAPIFolder.inc.php @@ -288,10 +288,10 @@ class KTAPI_Folder extends KTAPI_FolderItem * @access public * @param KTAPI $ktapi * @param string $foldername - * @param int $folderid + * @param int $folderid The parent folder id * @return KTAPI_Folder */ - function _get_folder_by_name($ktapi, $foldername, $parentId) + function _get_folder_by_name($ktapi, $foldername, $folderid) { $foldername=trim($foldername); if (empty($foldername)) @@ -310,8 +310,8 @@ class KTAPI_Folder extends KTAPI_FolderItem $foldername = KTUtil::replaceInvalidCharacters($foldername); $foldername = sanitizeForSQL($foldername); $sql = "SELECT id FROM folders WHERE - (name='$foldername' and parent_id=$parentId) OR - (name='$foldername' and parent_id is null and $parentId=1)"; + (name='$foldername' and parent_id=$folderid) OR + (name='$foldername' and parent_id is null and $folderid=1)"; $row = DBUtil::getOneResult($sql); if (is_null($row) || PEAR::isError($row)) { @@ -552,8 +552,8 @@ class KTAPI_Folder extends KTAPI_FolderItem foreach ($folder_children as $folder) { - - if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder) + + if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder) /*|| KTPermissionUtil::userHasPermissionOnItem($user, $read_permission, $folder)*/) { if ($depth-1 > 0) diff --git a/ktwebservice/webservice.php b/ktwebservice/webservice.php index f03b85c..28e5de3 100644 --- a/ktwebservice/webservice.php +++ b/ktwebservice/webservice.php @@ -769,20 +769,17 @@ class KTWebService // get_folder_detail_by_name $this->__dispatch_map['get_folder_detail_by_name'] = - array('in' => array('session_id' => 'string', 'folder_name' => 'string', 'parent_id' => 'int' ), + array('in' => array('session_id' => 'string', 'folder_name' => 'string'), 'out' => array('return' => "{urn:$this->namespace}kt_folder_detail"), ); - /* If this is now the same as version 2 for this function, we don't need this. - * if ($this->version >=3) { - // was - $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' ); + // was + //$this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' ); // now $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'parent_id'=>'int' ); } - */ // get_folder_contents $this->__dispatch_map['get_folder_contents'] =