From 1d0288e1b612bfa6ad7aa9f8139b6818c470ae52 Mon Sep 17 00:00:00 2001
From: Conrad Vermeulen <conrad@knowledgetree.com>
Date: Fri, 16 Nov 2007 11:55:45 +0000
Subject: [PATCH] WSA-65 "Remove php5 specific modifiers on functions so that web services works on both 3.4.x and 3.5.x" Updated.

---
 ktapi/KTAPIDocument.inc.php | 74 +++++++++++++++++++++++++++++++++++++-------------------------------------
 ktapi/KTAPIFolder.inc.php   | 46 +++++++++++++++++++++++-----------------------
 ktapi/KTAPISession.inc.php  |  2 +-
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php
index 4163474..172a971 100644
--- a/ktapi/KTAPIDocument.inc.php
+++ b/ktapi/KTAPIDocument.inc.php
@@ -56,7 +56,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 */
 	var $ktapi_folder;
 
-	public function get_documentid()
+	function get_documentid()
 	{
 		return $this->documentid;
 	}
@@ -70,7 +70,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param int $documentid
 	 * @return KTAPI_Document
 	 */
-	public static function &get(&$ktapi, $documentid)
+	function &get(&$ktapi, $documentid)
 	{
 		assert(!is_null($ktapi));
 		assert(is_a($ktapi, 'KTAPI'));
@@ -106,7 +106,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		return new KTAPI_Document($ktapi, $ktapi_folder, $document);
 	}
 
-	public function is_deleted()
+	function is_deleted()
 	{
 		return ($this->document->getStatusID() == 3);
 	}
@@ -119,7 +119,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param Document $document
 	 * @return KTAPI_Document
 	 */
-	public function KTAPI_Document(&$ktapi, &$ktapi_folder, &$document)
+	function KTAPI_Document(&$ktapi, &$ktapi_folder, &$document)
 	{
 		assert(is_a($ktapi,'KTAPI'));
 		assert(is_null($ktapi_folder) || is_a($ktapi_folder,'KTAPI_Folder'));
@@ -138,7 +138,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $tempfilename
 	 * @param bool $major_update
 	 */
-	public function checkin($filename, $reason, $tempfilename, $major_update=false)
+	function checkin($filename, $reason, $tempfilename, $major_update=false)
 	{
 		if (!is_file($tempfilename))
 		{
@@ -190,7 +190,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param KTAPI_Document $document
 	 */
-	public function link_document($document, $type)
+	function link_document($document, $type)
 	{
 		$typeid = $this->ktapi->get_link_type_id($type);
 		if (PEAR::isError($typeid))
@@ -211,7 +211,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param KTAPI_Document $document
 	 */
-	public function unlink_document($document)
+	function unlink_document($document)
 	{
 		$sql = "DELETE FROM document_link WHERE parent_document_id=$this->documentid AND child_document_id=$document->documentid";
 		$result = DBUtil::runQuery($sql);
@@ -226,7 +226,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return boolean
 	 */
-	public function is_checked_out()
+	function is_checked_out()
 	{
 		return ($this->document->getIsCheckedOut());
 	}
@@ -236,7 +236,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $reason
 	 */
-	public function undo_checkout($reason)
+	function undo_checkout($reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission($this->document, KTAPI_PERMISSION_WRITE);
 
@@ -271,7 +271,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		DBUtil::commit();
 	}
 
-	public function get_linked_documents()
+	function get_linked_documents()
 	{
 		$sql = "
 		SELECT
@@ -336,7 +336,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $reason
 	 */
-	public function checkout($reason)
+	function checkout($reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission($this->document, KTAPI_PERMISSION_WRITE);
 
@@ -366,7 +366,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $reason
 	 */
-	public function delete($reason)
+	function delete($reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_DELETE);
 
@@ -396,7 +396,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $ktapi_newuser
 	 */
-	public function change_owner($newusername, $reason='Changing of owner.')
+	function change_owner($newusername, $reason='Changing of owner.')
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_CHANGE_OWNERSHIP);
 
@@ -452,7 +452,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $newfilename
 	 * @return KTAPI_Document
 	 */
-	public function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
+	function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
 	{
 		assert(!is_null($ktapi_target_folder));
 		assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
@@ -555,7 +555,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $newname
 	 * @param string $newfilename
 	 */
-	public function move(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
+	function move(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
 	{
 		assert(!is_null($ktapi_target_folder));
 		assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
@@ -648,7 +648,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $newname
 	 */
-	public function renameFile($newname)
+	function renameFile($newname)
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WRITE);
 
@@ -672,7 +672,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $newname
 	 */
-	public function change_document_type($documenttype)
+	function change_document_type($documenttype)
 	{
 		$user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
 
@@ -727,7 +727,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $newname
 	 */
-	public function rename($newname)
+	function rename($newname)
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WRITE);
 
@@ -757,7 +757,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $reason
 	 */
-	public function archive($reason)
+	function archive($reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
 
@@ -800,7 +800,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $workflow
 	 */
-	public function start_workflow($workflow)
+	function start_workflow($workflow)
 	{
 		$user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
 
@@ -836,7 +836,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * This deletes the workflow on the document.
 	 *
 	 */
-	public function delete_workflow()
+	function delete_workflow()
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WORKFLOW);
 
@@ -867,7 +867,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $transition
 	 * @param string $reason
 	 */
-	public function perform_workflow_transition($transition, $reason)
+	function perform_workflow_transition($transition, $reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WORKFLOW);
 
@@ -905,7 +905,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_metadata()
+	function get_metadata()
 	{
 		 $doctypeid = $this->document->getDocumentTypeID();
 		 $fieldsets = (array) KTMetadataUtil::fieldsetsForDocument($this->document, $doctypeid);
@@ -977,7 +977,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		 return $results;
 	}
 
-	public function get_packed_metadata($metadata=null)
+	function get_packed_metadata($metadata=null)
 	{
 		global $default;
 
@@ -1052,7 +1052,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param array This is an array containing the metadata to be associated with the file.
 	 */
-	public function update_metadata($metadata)
+	function update_metadata($metadata)
 	{
 		global $default;
 		 $packed = $this->get_packed_metadata($metadata);
@@ -1094,7 +1094,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param array $sysdata
 	 */
-	public function update_sysdata($sysdata)
+	function update_sysdata($sysdata)
 	{
 		if (empty($sysdata))
 		{
@@ -1238,7 +1238,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 	}
 
-	private function clearCache()
+	function clearCache()
 	{
 		// TODO: we should only clear the cache for the document we are working on
 		// this is a quick fix but not optimal!!
@@ -1260,7 +1260,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		$this->document = &Document::get($this->documentid);
 	}
 
-	public function mergeWithLastMetadataVersion()
+	function mergeWithLastMetadataVersion()
 	{
 		// keep latest metadata version
 		$metadata_version = $this->document->getMetadataVersion();
@@ -1320,7 +1320,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_workflow_transitions()
+	function get_workflow_transitions()
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WORKFLOW);
 
@@ -1355,7 +1355,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return string
 	 */
-	public function get_workflow_state()
+	function get_workflow_state()
 	{
 		$user = $this->can_user_access_object_requiring_permission(  $this->document, KTAPI_PERMISSION_WORKFLOW);
 
@@ -1389,7 +1389,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_detail()
+	function get_detail()
 	{
 		global $default;
 		// make sure we ge tthe latest
@@ -1518,7 +1518,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		return $detail;
 	}
 
-	public function get_title()
+	function get_title()
 	{
 		return $this->document->getDescription();
 	}
@@ -1528,7 +1528,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @param string $version
 	 */
-	public function download($version=null)
+	function download($version=null)
 	{
 		$storage =& KTStorageManagerUtil::getSingleton();
         $options = array();
@@ -1543,7 +1543,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_transaction_history()
+	function get_transaction_history()
 	{
         $sQuery = 'SELECT DTT.name AS transaction_name, U.name AS username, DT.version AS version, DT.comment AS comment, DT.datetime AS datetime ' .
             'FROM ' . KTUtil::getTableName('document_transactions') . ' AS DT INNER JOIN ' . KTUtil::getTableName('users') . ' AS U ON DT.user_id = U.id ' .
@@ -1565,7 +1565,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_version_history()
+	function get_version_history()
 	{
 		$metadata_versions = KTDocumentMetadataVersion::getByDocument($this->document);
 
@@ -1601,7 +1601,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @access public
 	 */
-	public function expunge()
+	function expunge()
 	{
 		if ($this->document->getStatusID() != 3)
 		{
@@ -1629,7 +1629,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 *
 	 * @access public
 	 */
-	public function restore()
+	function restore()
 	{
 		DBUtil::startTransaction();
 
diff --git a/ktapi/KTAPIFolder.inc.php b/ktapi/KTAPIFolder.inc.php
index 3a07bf0..4984dd8 100644
--- a/ktapi/KTAPIFolder.inc.php
+++ b/ktapi/KTAPIFolder.inc.php
@@ -61,7 +61,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param int $folderid
 	 * @return KTAPI_Folder
 	 */
-	public static function &get(&$ktapi, $folderid)
+	function &get(&$ktapi, $folderid)
 	{
 		assert(!is_null($ktapi));
 		assert(is_a($ktapi, 'KTAPI'));
@@ -93,7 +93,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param Folder $folder
 	 * @return KTAPI_Folder
 	 */
-	public function KTAPI_Folder(&$ktapi, &$folder)
+	function KTAPI_Folder(&$ktapi, &$folder)
 	{
 		$this->ktapi = &$ktapi;
 		$this->folder = &$folder;
@@ -106,7 +106,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @access protected
 	 * @return Folder
 	 */
-	public function &get_folder()
+	function &get_folder()
 	{
 		return $this->folder;
 	}
@@ -117,7 +117,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @return array
 	 */
-	public function get_detail()
+	function get_detail()
 	{
 		$detail = array(
 			'id'=>(int) $this->folderid,
@@ -129,12 +129,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		return $detail;
 	}
 
-	public function get_parent_folder_id()
+	function get_parent_folder_id()
 	{
 		return (int) $this->folder->getParentID();
 	}
 
-	public function get_folder_name()
+	function get_folder_name()
 	{
 		return $this->folder->getFolderName($this->folderid);
 	}
@@ -145,12 +145,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @return int
 	 */
-	public function get_folderid()
+	function get_folderid()
 	{
 		return (int) $this->folderid;
 	}
 
-	public static function &_get_folder_by_name($ktapi, $foldername, $folderid)
+	function &_get_folder_by_name($ktapi, $foldername, $folderid)
 	{
 		$foldername=trim($foldername);
 		if (empty($foldername))
@@ -189,12 +189,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $foldername
 	 * @return KTAPI_Folder
 	 */
-	public function &get_folder_by_name($foldername)
+	function &get_folder_by_name($foldername)
 	{
 		return KTAPI_Folder::_get_folder_by_name($this->ktapi, $foldername, $this->folderid);
 	}
 
-	public function get_full_path()
+	function get_full_path()
 	{
 		$path = $this->folder->getFullPath() . '/' . $this->folder->getName();
 
@@ -209,7 +209,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $function
 	 * @return KTAPI_Document
 	 */
-	public function &_get_document_by_name($documentname, $function='getByNameAndFolder')
+	function &_get_document_by_name($documentname, $function='getByNameAndFolder')
 	{
 		$documentname=trim($documentname);
 		if (empty($documentname))
@@ -272,7 +272,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $documentname
 	 * @return KTAPI_Document
 	 */
-	public function &get_document_by_name($documentname)
+	function &get_document_by_name($documentname)
 	{
 		return $this->_get_document_by_name($documentname,'getByNameAndFolder');
 	}
@@ -284,12 +284,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $documentname
 	 * @return KTAPI_Document
 	 */
-	public function &get_document_by_filename($documentname)
+	function &get_document_by_filename($documentname)
 	{
 		return $this->_get_document_by_name($documentname,'getByFilenameAndFolder');
 	}
 
-	public function _resolve_user($userid)
+	function _resolve_user($userid)
 	{
 		$user=null;
 
@@ -304,7 +304,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		return $user;
 	}
 
-	public function get_listing($depth=1, $what='DF')
+	function get_listing($depth=1, $what='DF')
 	{
 		if ($depth < 1)
 		{
@@ -456,7 +456,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $tempfilename This is a reference to the file that is accessible locally on the file system.
 	 * @return KTAPI_Document
 	 */
-	public function &add_document($title, $filename, $documenttype, $tempfilename)
+	function &add_document($title, $filename, $documenttype, $tempfilename)
 	{
 		if (!is_file($tempfilename))
 		{
@@ -514,7 +514,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param string $foldername
 	 * @return KTAPI_Folder
 	 */
-	public function &add_folder($foldername)
+	function &add_folder($foldername)
 	{
 		$user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_ADD_FOLDER);
 
@@ -542,7 +542,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @param string $reason
 	 */
-	public function delete($reason)
+	function delete($reason)
 	{
 		$user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_DELETE);
 		if (PEAR::isError($user))
@@ -571,7 +571,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 *
 	 * @param string $newname
 	 */
-	public function rename($newname)
+	function rename($newname)
 	{
 		$user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_RENAME_FOLDER);
 		if (PEAR::isError($user))
@@ -596,7 +596,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param KTAPI_Folder $ktapi_target_folder
 	 * @param string $reason
 	 */
-	public function move($ktapi_target_folder, $reason='')
+	function move($ktapi_target_folder, $reason='')
 	{
 		assert(!is_null($ktapi_target_folder));
 		assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
@@ -628,7 +628,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @param KTAPI_Folder $ktapi_target_folder
 	 * @param string $reason
 	 */
-	public function copy($ktapi_target_folder, $reason='')
+	function copy($ktapi_target_folder, $reason='')
 	{
 		assert(!is_null($ktapi_target_folder));
 		assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
@@ -661,7 +661,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @access public
 	 * @return array
 	 */
-	public function get_permissions()
+	function get_permissions()
 	{
 		return new PEAR_Error('TODO');
 	}
@@ -672,7 +672,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @access public
 	 * @return array
 	 */
-	public function get_transaction_history()
+	function get_transaction_history()
 	{
 		return new PEAR_Error('TODO');
 	}
diff --git a/ktapi/KTAPISession.inc.php b/ktapi/KTAPISession.inc.php
index c0a85f8..4fafb88 100644
--- a/ktapi/KTAPISession.inc.php
+++ b/ktapi/KTAPISession.inc.php
@@ -163,7 +163,7 @@ class KTAPI_UserSession extends KTAPI_Session
 	 * @static
 	 * @param User $user
 	 */
-	private function _check_session(&$user)
+	function _check_session(&$user)
 	{
         $user_id = $user->getId();
 
--
libgit2 0.21.4