Merged in from DEV trunk...

"KTS-1973" "Webservice error when calling get_folder_contents fom VB.NET" Updated. Added typecast to integer for content listing. Removed the 'return true' for procedures. Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6611 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
"KTS-1973" "Webservice error when calling get_folder_contents fom VB.NET" Updated. Added typecast to integer for content listing. Removed the 'return true' for procedures. Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6611 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 97c2e57f
Showing 1 changed file with 8 additions and 67 deletions
ktapi/ktapi.inc.php
 <?
-
 /**
  *
  * Implements a cleaner wrapper API for KnowledgeTree.
@@ -314,7 +313,6 @@ class KTAPI_Session
 		$this->user 		= null;
 		$this->session 		= '';
 		$this->sessionid 	= -1;
-		return true;
 	}
 }
@@ -655,6 +653,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		$num_items = count($contents);
 		for($i=0;$i<$num_items;$i++)		
 		{
+			$contents[$i]['id'] = (int) $contents[$i]['id'];
 			if ($contents[$i]['item_type'] == 'D')
 			{
 				$contents[$i]['items'] = array();
@@ -766,7 +765,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * This deletes the current folder.
 	 *
 	 * @param string $reason
-	 * @return true
 	 */
 	function delete($reason)
 	{
@@ -790,15 +788,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-
-		return true;
 	}
 	/**
 	 * This renames the folder
 	 *
 	 * @param string $newname
-	 * @return true
 	 */
 	function rename($newname)
 	{		
@@ -817,8 +812,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-
-		return true;
 	}
 	/**
@@ -826,7 +819,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @param KTAPI_Folder $ktapi_target_folder
 	 * @param string $reason
-	 * @return true
 	 */
 	function move($ktapi_target_folder, $reason='')
 	{
@@ -852,8 +844,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-
-		return true;
 	}
 	/**
@@ -861,7 +851,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @param KTAPI_Folder $ktapi_target_folder
 	 * @param string $reason
-	 * @return true
 	 */
 	function copy($ktapi_target_folder, $reason='')
 	{
@@ -888,8 +877,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-
-		return true;
 	}
 	/**
@@ -1000,7 +987,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $reason
 	 * @param string $tempfilename
 	 * @param bool $major_update
-	 * @return true
 	 */	
 	function checkin($filename, $reason, $tempfilename, $major_update=false)
 	{	
@@ -1038,14 +1024,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-		return true;    	
 	}
 	/**
 	 * This reverses the checkout process.
 	 *
 	 * @param string $reason
-	 * @return true
 	 */
 	function undo_checkout($reason)
 	{
@@ -1080,14 +1064,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
 		}
 		DBUtil::commit();
-		return true;
 	}
 	/**
 	 * This returns a URL to the file that can be downloaded.
 	 *
 	 * @param string $reason
-	 * @return true;
 	 */
 	function checkout($reason)
 	{
@@ -1112,15 +1094,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		DBUtil::commit();
-
-		return true;
 	}
 	/**
 	 * This deletes a document from the folder.
 	 *
 	 * @param string $reason
-	 * @return mixed This returns true or a PEAR::Error 
 	 */
 	function delete($reason)
 	{
@@ -1145,15 +1124,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		DBUtil::commit();
-
-		return true;		
 	}
 	/**
 	 * This changes the owner of the file.
 	 *
 	 * @param string $ktapi_newuser
-	 * @return true
 	 */	
 	function change_owner($newusername, $reason='Changing of owner.')
 	{
@@ -1200,7 +1176,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		DBUtil::commit();
-		return true;		
 	}	
 	/**
@@ -1210,7 +1185,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $reason
 	 * @param string $newname
 	 * @param string $newfilename
-	 * @return true
 	 */
 	function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
 	{
@@ -1226,7 +1200,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 			$newfilename=null;
 		}
-		
 		$user = $this->ktapi->get_user();
 		if ($this->document->getIsCheckedOut())
@@ -1303,9 +1276,7 @@ class KTAPI_Document extends KTAPI_FolderItem
             );
             $oTrigger->setInfo($aInfo);
             $ret = $oTrigger->postValidate();
-        }	
-        
-		return true;        
+        }
 	}
 	/**
@@ -1315,7 +1286,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $reason
 	 * @param string $newname
 	 * @param string $newfilename
-	 * @return true
 	 */
 	function move(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
 	{
@@ -1403,15 +1373,12 @@ class KTAPI_Document extends KTAPI_FolderItem
         }
         DBUtil::commit();
-                   
-		return true; 	
 	}	
 	/**
 	 * This changes the filename of the document.
 	 *
 	 * @param string $newname
-	 * @return true
 	 */
 	function renameFile($newname)
 	{
@@ -1430,15 +1397,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_INTERNAL_ERROR);
         }
         DBUtil::commit(); 
-		 	
-        return true;
 	}
 	/**
 	 * This changes the document type of the document.
 	 *
 	 * @param string $newname
-	 * @return true
 	 */
 	function change_document_type($documenttype)
 	{
@@ -1464,14 +1428,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 			}
 			DBUtil::commit();
 		}
-        return true;
 	}	
 	/**
 	 * This changes the title of the document.
 	 *
 	 * @param string $newname
-	 * @return true
 	 */
 	function rename($newname)
 	{
@@ -1496,15 +1458,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 			}
 			DBUtil::commit();
 		}
-			
-        return true;
 	}
 	/**
 	 * This flags the document as 'archived'.
 	 *
 	 * @param string $reason
-	 * @return true
 	 */
 	function archive($reason)
 	{
@@ -1541,16 +1500,13 @@ class KTAPI_Document extends KTAPI_FolderItem
             );
             $oTrigger->setInfo($aInfo);
             $ret = $oTrigger->postValidate();
-        }
-		 	
-        return true;		
+        }	
 	}	
 	/**
 	 * This starts a workflow on a document.
 	 *
 	 * @param string $workflow
-	 * @return true
 	 */
 	function start_workflow($workflow)
 	{
@@ -1582,14 +1538,11 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_WORKFLOW_INVALID);
 		}
 		DBUtil::commit();
-		
-		return true;		
 	}
 	/**
 	 * This deletes the workflow on the document.
 	 *
-	 * @return true
 	 */
 	function delete_workflow()
 	{
@@ -1614,8 +1567,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new PEAR_Error(KTAPI_ERROR_WORKFLOW_INVALID);
 		}
 		DBUtil::commit();
-		
-		return true;		
 	}
 	/**
@@ -1623,7 +1574,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $transition
 	 * @param string $reason
-	 * @return true
 	 */
 	function perform_workflow_transition($transition, $reason)
 	{
@@ -1653,9 +1603,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 			DBUtil::rollback();
 			return new PEAR_Error(KTAPI_ERROR_WORKFLOW_INVALID);
 		}
-		DBUtil::commit();
-		
-		return true;			
+		DBUtil::commit();	
 	}		
@@ -1737,7 +1685,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * This updates the metadata on the file. This includes the 'title'.
 	 *
 	 * @param array This is an array containing the metadata to be associated with the file.
-	 * @return mixed This returns true or a PEAR::Error 
 	 */
 	function update_metadata($metadata)
 	{		 
@@ -1782,8 +1729,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 		 	return new PEAR_Error(sprintf(_kt("Unexpected validation failure: %s."), $result->getMessage()));	
 		 }
 		 DBUtil::commit();
-		 
-		 return true; 		
 	}
@@ -1964,7 +1909,6 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * This does a download of a version of the document.
 	 *
 	 * @param string $version
-	 * @return true
 	 */
 	function download($version=null)
 	{		
@@ -1974,8 +1918,6 @@ class KTAPI_Document extends KTAPI_FolderItem
         $oDocumentTransaction = & new DocumentTransaction($this->document, 'Document downloaded', 'ktcore.transactions.download', $aOptions);
         $oDocumentTransaction->create();
-        
-        return true;
 	}
 	/**
@@ -2032,11 +1974,13 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * This expunges a document from the system.
 	 *
 	 * @access public
-	 * @return mixed This returns true or a PEAR::Error 
 	 */
 	function expunge()
 	{
-		if ($this->document->getStatusID())
+		if ($this->document->getStatusID() != 3)
+		{
+			return new PEAR_Error('You should not purge this');
+		}
 		DBUtil::startTransaction();
 		$transaction = & new DocumentTransaction($this->document, "Document expunged", 'ktcore.transactions.expunge');
@@ -2052,15 +1996,12 @@ class KTAPI_Document extends KTAPI_FolderItem
 		$result= $storage->expunge($this->document);
 		$this->commitTransaction();
-
-		return true; 
 	}
 	/**
 	 * This expunges a document from the system.
 	 *
 	 * @access public
-	 * @return mixed This returns true or a PEAR::Error 
 	 */
 	function restore()
 	{