Peter M. Groen / knowledgetree

Commit 3c8de84dd59d135b273896a1f19bd3162a6ebb70

Authored by conradverm
1 parent 8b590179

KTS-1694 

"SOAP Webservice Implementation"
Updated. Initial modifications to cater for passing by reference under PHP4.

Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6478 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 38 additions and 18 deletions
ktapi/ktapi.inc.php
  View file @3c8de84
... ... @@ -322,7 +322,7 @@ class KTAPI_FolderItem
322 322 */
323 323 var $ktapi;
324 324  
325   - function &can_user_access_object_requiring_permission(&$object, &$permission)
  325 + function &can_user_access_object_requiring_permission(&$object, $permission)
326 326 {
327 327 return $this->ktapi->can_user_access_object_requiring_permission($object, $permission);
328 328 }
... ... @@ -1865,9 +1865,14 @@ class KTAPI_Document extends KTAPI_FolderItem
1865 1865 {
1866 1866 $documenttype = DocumentType::get($documenttypeid);
1867 1867  
1868   - $detail['document_type'] = $documenttype->getName();
  1868 + $documenttype=$documenttype->getName();
1869 1869 }
1870   -
  1870 + else
  1871 + {
  1872 + $documenttype = '* unknown *';
  1873 + }
  1874 + $detail['document_type'] = $documenttype;
  1875 +
1871 1876 $detail['version'] = $document->getVersion();
1872 1877 $detail['filename'] = $document->getFilename();
1873 1878  
... ... @@ -1878,22 +1883,25 @@ class KTAPI_Document extends KTAPI_FolderItem
1878 1883 {
1879 1884 $user = User::get($userid);
1880 1885 $username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
1881   -
1882   -
1883   - $detail['created_by'] = $username;
1884 1886 }
1885   -
  1887 + else
  1888 + {
  1889 + $username='n/a';
  1890 + }
  1891 + $detail['created_by'] = $username;
1886 1892 $detail['updated_date'] = $document->getLastModifiedDate();
1887 1893  
1888 1894 $userid = $document->getModifiedUserId();
1889 1895 if (is_numeric($userid))
1890 1896 {
1891 1897 $user = User::get($userid);
1892   - $username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
1893   -
1894   - $detail['updated_by'] = $username;
  1898 + $username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
1895 1899 }
1896   -
  1900 + else
  1901 + {
  1902 + $username='n/a';
  1903 + }
  1904 + $detail['updated_by'] = $username;
1897 1905 $detail['document_id'] = $document->getId();
1898 1906 $detail['folder_id'] = $document->getFolderID();
1899 1907  
... ... @@ -1902,17 +1910,24 @@ class KTAPI_Document extends KTAPI_FolderItem
1902 1910 {
1903 1911 $workflow = KTWorkflow::get($workflowid);
1904 1912 $workflowname=(is_null($workflow) || PEAR::isError($workflow))?'* unknown *':$workflow->getName();
1905   - $detail['workflow'] = $workflowname;
1906 1913 }
  1914 + else
  1915 + {
  1916 + $workflowname='n/a';
  1917 + }
  1918 + $detail['workflow'] = $workflowname;
1907 1919  
1908 1920 $stateid = $document->getWorkflowStateId();
1909 1921 if (is_numeric($stateid))
1910 1922 {
1911 1923 $state = KTWorkflowState::get($stateid);
1912 1924 $workflowstate=(is_null($state) || PEAR::isError($state))?'* unknown *':$state->getName();
1913   -
1914   - $detail['workflow_state'] = $workflowstate;
1915 1925 }
  1926 + else
  1927 + {
  1928 + $workflowstate = 'n/a';
  1929 + }
  1930 + $detail['workflow_state']=$workflowstate;
1916 1931  
1917 1932 $userid = $document->getCheckedOutUserID();
1918 1933  
... ... @@ -1920,9 +1935,12 @@ class KTAPI_Document extends KTAPI_FolderItem
1920 1935 {
1921 1936 $user = User::get($userid);
1922 1937 $username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
1923   -
1924   - $detail['checkout_by'] = $username;
1925 1938 }
  1939 + else
  1940 + {
  1941 + $username = 'n/a';
  1942 + }
  1943 + $detail['checkout_by'] = $username;
1926 1944  
1927 1945 $detail['full_path'] = $this->ktapi_folder->get_full_path() . '/' . $this->get_title();
1928 1946  
... ... @@ -2140,7 +2158,7 @@ class KTAPI
2140 2158 * @param string $permission
2141 2159 * @return User
2142 2160 */
2143   - function can_user_access_object_requiring_permission(&$object, &$permission)
  2161 + function can_user_access_object_requiring_permission(&$object, $permission)
2144 2162 {
2145 2163 assert(!is_null($object));
2146 2164 assert(is_a($object,'DocumentProxy') || is_a($object,'FolderProxy') || is_a($object,'Document') || is_a($object,'Folder'));
... ... @@ -2360,6 +2378,8 @@ class KTAPI
2360 2378 */
2361 2379 function _load_metadata_tree($fieldid, $parentid=0)
2362 2380 {
  2381 + return KTAPI::get_metadata_lookup($fieldid);
  2382 + /*
2363 2383 $sql = "SELECT id, name FROM metadata_lookup_tree WHERE document_field_id=$fieldid AND metadata_lookup_tree_parent=$parentid";
2364 2384 $rows = DBUtil::getResultArray($sql);
2365 2385 if (is_null($rows) || PEAR::isError($rows))
... ... @@ -2375,7 +2395,7 @@ class KTAPI
2375 2395 );
2376 2396 $results[] = $result;
2377 2397 }
2378   - return $results;
  2398 + return $results;*/
2379 2399 }
2380 2400  
2381 2401 /**
... ...