Commit 6405a514a5a497d6da8d36bd5b801d0b6fb8ce0c
1 parent
c1b449fa
WSA-25
"get_document_detail_by_name fails with user that doesn't have permission to root folder" Implemented. add get_folder_by_name to ktapi Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7161 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
20 additions
and
10 deletions
ktapi/KTAPIFolder.inc.php
| @@ -144,14 +144,7 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -144,14 +144,7 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 144 | return (int) $this->folderid; | 144 | return (int) $this->folderid; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | - /** | ||
| 148 | - * This can resolve a folder relative to the current directy by name | ||
| 149 | - * | ||
| 150 | - * @access public | ||
| 151 | - * @param string $foldername | ||
| 152 | - * @return KTAPI_Folder | ||
| 153 | - */ | ||
| 154 | - function &get_folder_by_name($foldername) | 147 | + function &_get_folder_by_name($foldername, $folderid) |
| 155 | { | 148 | { |
| 156 | $foldername=trim($foldername); | 149 | $foldername=trim($foldername); |
| 157 | if (empty($foldername)) | 150 | if (empty($foldername)) |
| @@ -161,7 +154,6 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -161,7 +154,6 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 161 | 154 | ||
| 162 | $split = explode('/', $foldername); | 155 | $split = explode('/', $foldername); |
| 163 | 156 | ||
| 164 | - $folderid=$this->folderid; | ||
| 165 | foreach($split as $foldername) | 157 | foreach($split as $foldername) |
| 166 | { | 158 | { |
| 167 | if (empty($foldername)) | 159 | if (empty($foldername)) |
| @@ -180,6 +172,19 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -180,6 +172,19 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 180 | return KTAPI_Folder::get($this->ktapi, $folderid); | 172 | return KTAPI_Folder::get($this->ktapi, $folderid); |
| 181 | } | 173 | } |
| 182 | 174 | ||
| 175 | + | ||
| 176 | + /** | ||
| 177 | + * This can resolve a folder relative to the current directy by name | ||
| 178 | + * | ||
| 179 | + * @access public | ||
| 180 | + * @param string $foldername | ||
| 181 | + * @return KTAPI_Folder | ||
| 182 | + */ | ||
| 183 | + function &get_folder_by_name($foldername) | ||
| 184 | + { | ||
| 185 | + return KTAPI_Folder::_get_folder_by_name($foldername, $this->folderid); | ||
| 186 | + } | ||
| 187 | + | ||
| 183 | function get_full_path() | 188 | function get_full_path() |
| 184 | { | 189 | { |
| 185 | $path = $this->folder->getFullPath() . '/' . $this->folder->getName(); | 190 | $path = $this->folder->getFullPath() . '/' . $this->folder->getName(); |
ktapi/ktapi.inc.php
| @@ -293,6 +293,11 @@ class KTAPI | @@ -293,6 +293,11 @@ class KTAPI | ||
| 293 | return KTAPI_Folder::get($this, $folderid); | 293 | return KTAPI_Folder::get($this, $folderid); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | + function &get_folder_by_name($foldername) | ||
| 297 | + { | ||
| 298 | + return KTAPI_Folder::_get_folder_by_name($foldername, 1); | ||
| 299 | + } | ||
| 300 | + | ||
| 296 | /** | 301 | /** |
| 297 | * This returns a refererence to a document based on document id. | 302 | * This returns a refererence to a document based on document id. |
| 298 | * | 303 | * |
| @@ -575,7 +580,7 @@ class KTAPI | @@ -575,7 +580,7 @@ class KTAPI | ||
| 575 | } | 580 | } |
| 576 | return $results; | 581 | return $results; |
| 577 | } | 582 | } |
| 578 | - | 583 | + |
| 579 | 584 | ||
| 580 | } | 585 | } |
| 581 | 586 |