Peter M. Groen / knowledgetree

Commit 1d0288e1b612bfa6ad7aa9f8139b6818c470ae52

Authored by Conrad Vermeulen
1 parent 79f78242

WSA-65 

"Remove php5 specific modifiers on functions so that web services works on both 3.4.x and 3.5.x"
Updated.

Committed By: Conrad Vermeulen
Reviewed By: Martin Kirsten

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7690 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 61 additions and 61 deletions
ktapi/KTAPIDocument.inc.php
  View file @1d0288e
... ... @@ -56,7 +56,7 @@ class KTAPI_Document extends KTAPI_FolderItem
56 56 */
57 57 var $ktapi_folder;
58 58  
59   - public function get_documentid()
  59 + function get_documentid()
60 60 {
61 61 return $this->documentid;
62 62 }
... ... @@ -70,7 +70,7 @@ class KTAPI_Document extends KTAPI_FolderItem
70 70 * @param int $documentid
71 71 * @return KTAPI_Document
72 72 */
73   - public static function &get(&$ktapi, $documentid)
  73 + function &get(&$ktapi, $documentid)
74 74 {
75 75 assert(!is_null($ktapi));
76 76 assert(is_a($ktapi, 'KTAPI'));
... ... @@ -106,7 +106,7 @@ class KTAPI_Document extends KTAPI_FolderItem
106 106 return new KTAPI_Document($ktapi, $ktapi_folder, $document);
107 107 }
108 108  
109   - public function is_deleted()
  109 + function is_deleted()
110 110 {
111 111 return ($this->document->getStatusID() == 3);
112 112 }
... ... @@ -119,7 +119,7 @@ class KTAPI_Document extends KTAPI_FolderItem
119 119 * @param Document $document
120 120 * @return KTAPI_Document
121 121 */
122   - public function KTAPI_Document(&$ktapi, &$ktapi_folder, &$document)
  122 + function KTAPI_Document(&$ktapi, &$ktapi_folder, &$document)
123 123 {
124 124 assert(is_a($ktapi,'KTAPI'));
125 125 assert(is_null($ktapi_folder) || is_a($ktapi_folder,'KTAPI_Folder'));
... ... @@ -138,7 +138,7 @@ class KTAPI_Document extends KTAPI_FolderItem
138 138 * @param string $tempfilename
139 139 * @param bool $major_update
140 140 */
141   - public function checkin($filename, $reason, $tempfilename, $major_update=false)
  141 + function checkin($filename, $reason, $tempfilename, $major_update=false)
142 142 {
143 143 if (!is_file($tempfilename))
144 144 {
... ... @@ -190,7 +190,7 @@ class KTAPI_Document extends KTAPI_FolderItem
190 190 *
191 191 * @param KTAPI_Document $document
192 192 */
193   - public function link_document($document, $type)
  193 + function link_document($document, $type)
194 194 {
195 195 $typeid = $this->ktapi->get_link_type_id($type);
196 196 if (PEAR::isError($typeid))
... ... @@ -211,7 +211,7 @@ class KTAPI_Document extends KTAPI_FolderItem
211 211 *
212 212 * @param KTAPI_Document $document
213 213 */
214   - public function unlink_document($document)
  214 + function unlink_document($document)
215 215 {
216 216 $sql = "DELETE FROM document_link WHERE parent_document_id=$this->documentid AND child_document_id=$document->documentid";
217 217 $result = DBUtil::runQuery($sql);
... ... @@ -226,7 +226,7 @@ class KTAPI_Document extends KTAPI_FolderItem
226 226 *
227 227 * @return boolean
228 228 */
229   - public function is_checked_out()
  229 + function is_checked_out()
230 230 {
231 231 return ($this->document->getIsCheckedOut());
232 232 }
... ... @@ -236,7 +236,7 @@ class KTAPI_Document extends KTAPI_FolderItem
236 236 *
237 237 * @param string $reason
238 238 */
239   - public function undo_checkout($reason)
  239 + function undo_checkout($reason)
240 240 {
241 241 $user = $this->can_user_access_object_requiring_permission($this->document, KTAPI_PERMISSION_WRITE);
242 242  
... ... @@ -271,7 +271,7 @@ class KTAPI_Document extends KTAPI_FolderItem
271 271 DBUtil::commit();
272 272 }
273 273  
274   - public function get_linked_documents()
  274 + function get_linked_documents()
275 275 {
276 276 $sql = "
277 277 SELECT
... ... @@ -336,7 +336,7 @@ class KTAPI_Document extends KTAPI_FolderItem
336 336 *
337 337 * @param string $reason
338 338 */
339   - public function checkout($reason)
  339 + function checkout($reason)
340 340 {
341 341 $user = $this->can_user_access_object_requiring_permission($this->document, KTAPI_PERMISSION_WRITE);
342 342  
... ... @@ -366,7 +366,7 @@ class KTAPI_Document extends KTAPI_FolderItem
366 366 *
367 367 * @param string $reason
368 368 */
369   - public function delete($reason)
  369 + function delete($reason)
370 370 {
371 371 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_DELETE);
372 372  
... ... @@ -396,7 +396,7 @@ class KTAPI_Document extends KTAPI_FolderItem
396 396 *
397 397 * @param string $ktapi_newuser
398 398 */
399   - public function change_owner($newusername, $reason='Changing of owner.')
  399 + function change_owner($newusername, $reason='Changing of owner.')
400 400 {
401 401 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_CHANGE_OWNERSHIP);
402 402  
... ... @@ -452,7 +452,7 @@ class KTAPI_Document extends KTAPI_FolderItem
452 452 * @param string $newfilename
453 453 * @return KTAPI_Document
454 454 */
455   - public function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
  455 + function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
456 456 {
457 457 assert(!is_null($ktapi_target_folder));
458 458 assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
... ... @@ -555,7 +555,7 @@ class KTAPI_Document extends KTAPI_FolderItem
555 555 * @param string $newname
556 556 * @param string $newfilename
557 557 */
558   - public function move(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
  558 + function move(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
559 559 {
560 560 assert(!is_null($ktapi_target_folder));
561 561 assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
... ... @@ -648,7 +648,7 @@ class KTAPI_Document extends KTAPI_FolderItem
648 648 *
649 649 * @param string $newname
650 650 */
651   - public function renameFile($newname)
  651 + function renameFile($newname)
652 652 {
653 653 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
654 654  
... ... @@ -672,7 +672,7 @@ class KTAPI_Document extends KTAPI_FolderItem
672 672 *
673 673 * @param string $newname
674 674 */
675   - public function change_document_type($documenttype)
  675 + function change_document_type($documenttype)
676 676 {
677 677 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
678 678  
... ... @@ -727,7 +727,7 @@ class KTAPI_Document extends KTAPI_FolderItem
727 727 *
728 728 * @param string $newname
729 729 */
730   - public function rename($newname)
  730 + function rename($newname)
731 731 {
732 732 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
733 733  
... ... @@ -757,7 +757,7 @@ class KTAPI_Document extends KTAPI_FolderItem
757 757 *
758 758 * @param string $reason
759 759 */
760   - public function archive($reason)
  760 + function archive($reason)
761 761 {
762 762 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WRITE);
763 763  
... ... @@ -800,7 +800,7 @@ class KTAPI_Document extends KTAPI_FolderItem
800 800 *
801 801 * @param string $workflow
802 802 */
803   - public function start_workflow($workflow)
  803 + function start_workflow($workflow)
804 804 {
805 805 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
806 806  
... ... @@ -836,7 +836,7 @@ class KTAPI_Document extends KTAPI_FolderItem
836 836 * This deletes the workflow on the document.
837 837 *
838 838 */
839   - public function delete_workflow()
  839 + function delete_workflow()
840 840 {
841 841 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
842 842  
... ... @@ -867,7 +867,7 @@ class KTAPI_Document extends KTAPI_FolderItem
867 867 * @param string $transition
868 868 * @param string $reason
869 869 */
870   - public function perform_workflow_transition($transition, $reason)
  870 + function perform_workflow_transition($transition, $reason)
871 871 {
872 872 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
873 873  
... ... @@ -905,7 +905,7 @@ class KTAPI_Document extends KTAPI_FolderItem
905 905 *
906 906 * @return array
907 907 */
908   - public function get_metadata()
  908 + function get_metadata()
909 909 {
910 910 $doctypeid = $this->document->getDocumentTypeID();
911 911 $fieldsets = (array) KTMetadataUtil::fieldsetsForDocument($this->document, $doctypeid);
... ... @@ -977,7 +977,7 @@ class KTAPI_Document extends KTAPI_FolderItem
977 977 return $results;
978 978 }
979 979  
980   - public function get_packed_metadata($metadata=null)
  980 + function get_packed_metadata($metadata=null)
981 981 {
982 982 global $default;
983 983  
... ... @@ -1052,7 +1052,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1052 1052 *
1053 1053 * @param array This is an array containing the metadata to be associated with the file.
1054 1054 */
1055   - public function update_metadata($metadata)
  1055 + function update_metadata($metadata)
1056 1056 {
1057 1057 global $default;
1058 1058 $packed = $this->get_packed_metadata($metadata);
... ... @@ -1094,7 +1094,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1094 1094 *
1095 1095 * @param array $sysdata
1096 1096 */
1097   - public function update_sysdata($sysdata)
  1097 + function update_sysdata($sysdata)
1098 1098 {
1099 1099 if (empty($sysdata))
1100 1100 {
... ... @@ -1238,7 +1238,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1238 1238 }
1239 1239 }
1240 1240  
1241   - private function clearCache()
  1241 + function clearCache()
1242 1242 {
1243 1243 // TODO: we should only clear the cache for the document we are working on
1244 1244 // this is a quick fix but not optimal!!
... ... @@ -1260,7 +1260,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1260 1260 $this->document = &Document::get($this->documentid);
1261 1261 }
1262 1262  
1263   - public function mergeWithLastMetadataVersion()
  1263 + function mergeWithLastMetadataVersion()
1264 1264 {
1265 1265 // keep latest metadata version
1266 1266 $metadata_version = $this->document->getMetadataVersion();
... ... @@ -1320,7 +1320,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1320 1320 *
1321 1321 * @return array
1322 1322 */
1323   - public function get_workflow_transitions()
  1323 + function get_workflow_transitions()
1324 1324 {
1325 1325 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
1326 1326  
... ... @@ -1355,7 +1355,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1355 1355 *
1356 1356 * @return string
1357 1357 */
1358   - public function get_workflow_state()
  1358 + function get_workflow_state()
1359 1359 {
1360 1360 $user = $this->can_user_access_object_requiring_permission( $this->document, KTAPI_PERMISSION_WORKFLOW);
1361 1361  
... ... @@ -1389,7 +1389,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1389 1389 *
1390 1390 * @return array
1391 1391 */
1392   - public function get_detail()
  1392 + function get_detail()
1393 1393 {
1394 1394 global $default;
1395 1395 // make sure we ge tthe latest
... ... @@ -1518,7 +1518,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1518 1518 return $detail;
1519 1519 }
1520 1520  
1521   - public function get_title()
  1521 + function get_title()
1522 1522 {
1523 1523 return $this->document->getDescription();
1524 1524 }
... ... @@ -1528,7 +1528,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1528 1528 *
1529 1529 * @param string $version
1530 1530 */
1531   - public function download($version=null)
  1531 + function download($version=null)
1532 1532 {
1533 1533 $storage =& KTStorageManagerUtil::getSingleton();
1534 1534 $options = array();
... ... @@ -1543,7 +1543,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1543 1543 *
1544 1544 * @return array
1545 1545 */
1546   - public function get_transaction_history()
  1546 + function get_transaction_history()
1547 1547 {
1548 1548 $sQuery = 'SELECT DTT.name AS transaction_name, U.name AS username, DT.version AS version, DT.comment AS comment, DT.datetime AS datetime ' .
1549 1549 '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
1565 1565 *
1566 1566 * @return array
1567 1567 */
1568   - public function get_version_history()
  1568 + function get_version_history()
1569 1569 {
1570 1570 $metadata_versions = KTDocumentMetadataVersion::getByDocument($this->document);
1571 1571  
... ... @@ -1601,7 +1601,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1601 1601 *
1602 1602 * @access public
1603 1603 */
1604   - public function expunge()
  1604 + function expunge()
1605 1605 {
1606 1606 if ($this->document->getStatusID() != 3)
1607 1607 {
... ... @@ -1629,7 +1629,7 @@ class KTAPI_Document extends KTAPI_FolderItem
1629 1629 *
1630 1630 * @access public
1631 1631 */
1632   - public function restore()
  1632 + function restore()
1633 1633 {
1634 1634 DBUtil::startTransaction();
1635 1635  
... ...
ktapi/KTAPIFolder.inc.php
  View file @1d0288e
... ... @@ -61,7 +61,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
61 61 * @param int $folderid
62 62 * @return KTAPI_Folder
63 63 */
64   - public static function &get(&$ktapi, $folderid)
  64 + function &get(&$ktapi, $folderid)
65 65 {
66 66 assert(!is_null($ktapi));
67 67 assert(is_a($ktapi, 'KTAPI'));
... ... @@ -93,7 +93,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
93 93 * @param Folder $folder
94 94 * @return KTAPI_Folder
95 95 */
96   - public function KTAPI_Folder(&$ktapi, &$folder)
  96 + function KTAPI_Folder(&$ktapi, &$folder)
97 97 {
98 98 $this->ktapi = &$ktapi;
99 99 $this->folder = &$folder;
... ... @@ -106,7 +106,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
106 106 * @access protected
107 107 * @return Folder
108 108 */
109   - public function &get_folder()
  109 + function &get_folder()
110 110 {
111 111 return $this->folder;
112 112 }
... ... @@ -117,7 +117,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
117 117 *
118 118 * @return array
119 119 */
120   - public function get_detail()
  120 + function get_detail()
121 121 {
122 122 $detail = array(
123 123 'id'=>(int) $this->folderid,
... ... @@ -129,12 +129,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
129 129 return $detail;
130 130 }
131 131  
132   - public function get_parent_folder_id()
  132 + function get_parent_folder_id()
133 133 {
134 134 return (int) $this->folder->getParentID();
135 135 }
136 136  
137   - public function get_folder_name()
  137 + function get_folder_name()
138 138 {
139 139 return $this->folder->getFolderName($this->folderid);
140 140 }
... ... @@ -145,12 +145,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
145 145 *
146 146 * @return int
147 147 */
148   - public function get_folderid()
  148 + function get_folderid()
149 149 {
150 150 return (int) $this->folderid;
151 151 }
152 152  
153   - public static function &_get_folder_by_name($ktapi, $foldername, $folderid)
  153 + function &_get_folder_by_name($ktapi, $foldername, $folderid)
154 154 {
155 155 $foldername=trim($foldername);
156 156 if (empty($foldername))
... ... @@ -189,12 +189,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
189 189 * @param string $foldername
190 190 * @return KTAPI_Folder
191 191 */
192   - public function &get_folder_by_name($foldername)
  192 + function &get_folder_by_name($foldername)
193 193 {
194 194 return KTAPI_Folder::_get_folder_by_name($this->ktapi, $foldername, $this->folderid);
195 195 }
196 196  
197   - public function get_full_path()
  197 + function get_full_path()
198 198 {
199 199 $path = $this->folder->getFullPath() . '/' . $this->folder->getName();
200 200  
... ... @@ -209,7 +209,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
209 209 * @param string $function
210 210 * @return KTAPI_Document
211 211 */
212   - public function &_get_document_by_name($documentname, $function='getByNameAndFolder')
  212 + function &_get_document_by_name($documentname, $function='getByNameAndFolder')
213 213 {
214 214 $documentname=trim($documentname);
215 215 if (empty($documentname))
... ... @@ -272,7 +272,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
272 272 * @param string $documentname
273 273 * @return KTAPI_Document
274 274 */
275   - public function &get_document_by_name($documentname)
  275 + function &get_document_by_name($documentname)
276 276 {
277 277 return $this->_get_document_by_name($documentname,'getByNameAndFolder');
278 278 }
... ... @@ -284,12 +284,12 @@ class KTAPI_Folder extends KTAPI_FolderItem
284 284 * @param string $documentname
285 285 * @return KTAPI_Document
286 286 */
287   - public function &get_document_by_filename($documentname)
  287 + function &get_document_by_filename($documentname)
288 288 {
289 289 return $this->_get_document_by_name($documentname,'getByFilenameAndFolder');
290 290 }
291 291  
292   - public function _resolve_user($userid)
  292 + function _resolve_user($userid)
293 293 {
294 294 $user=null;
295 295  
... ... @@ -304,7 +304,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
304 304 return $user;
305 305 }
306 306  
307   - public function get_listing($depth=1, $what='DF')
  307 + function get_listing($depth=1, $what='DF')
308 308 {
309 309 if ($depth < 1)
310 310 {
... ... @@ -456,7 +456,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
456 456 * @param string $tempfilename This is a reference to the file that is accessible locally on the file system.
457 457 * @return KTAPI_Document
458 458 */
459   - public function &add_document($title, $filename, $documenttype, $tempfilename)
  459 + function &add_document($title, $filename, $documenttype, $tempfilename)
460 460 {
461 461 if (!is_file($tempfilename))
462 462 {
... ... @@ -514,7 +514,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
514 514 * @param string $foldername
515 515 * @return KTAPI_Folder
516 516 */
517   - public function &add_folder($foldername)
  517 + function &add_folder($foldername)
518 518 {
519 519 $user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_ADD_FOLDER);
520 520  
... ... @@ -542,7 +542,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
542 542 *
543 543 * @param string $reason
544 544 */
545   - public function delete($reason)
  545 + function delete($reason)
546 546 {
547 547 $user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_DELETE);
548 548 if (PEAR::isError($user))
... ... @@ -571,7 +571,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
571 571 *
572 572 * @param string $newname
573 573 */
574   - public function rename($newname)
  574 + function rename($newname)
575 575 {
576 576 $user = $this->can_user_access_object_requiring_permission($this->folder, KTAPI_PERMISSION_RENAME_FOLDER);
577 577 if (PEAR::isError($user))
... ... @@ -596,7 +596,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
596 596 * @param KTAPI_Folder $ktapi_target_folder
597 597 * @param string $reason
598 598 */
599   - public function move($ktapi_target_folder, $reason='')
  599 + function move($ktapi_target_folder, $reason='')
600 600 {
601 601 assert(!is_null($ktapi_target_folder));
602 602 assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
... ... @@ -628,7 +628,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
628 628 * @param KTAPI_Folder $ktapi_target_folder
629 629 * @param string $reason
630 630 */
631   - public function copy($ktapi_target_folder, $reason='')
  631 + function copy($ktapi_target_folder, $reason='')
632 632 {
633 633 assert(!is_null($ktapi_target_folder));
634 634 assert(is_a($ktapi_target_folder,'KTAPI_Folder'));
... ... @@ -661,7 +661,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
661 661 * @access public
662 662 * @return array
663 663 */
664   - public function get_permissions()
  664 + function get_permissions()
665 665 {
666 666 return new PEAR_Error('TODO');
667 667 }
... ... @@ -672,7 +672,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
672 672 * @access public
673 673 * @return array
674 674 */
675   - public function get_transaction_history()
  675 + function get_transaction_history()
676 676 {
677 677 return new PEAR_Error('TODO');
678 678 }
... ...
ktapi/KTAPISession.inc.php
  View file @1d0288e
... ... @@ -163,7 +163,7 @@ class KTAPI_UserSession extends KTAPI_Session
163 163 * @static
164 164 * @param User $user
165 165 */
166   - private function _check_session(&$user)
  166 + function _check_session(&$user)
167 167 {
168 168 $user_id = $user->getId();
169 169  
... ...