@@ -254,6 +254,7 @@ discard block |
||
254 | 254 | * |
255 | 255 | * @param string program name |
256 | 256 | * @param string optional search path, defaults to $PATH |
257 | + * @param string $name |
|
257 | 258 | * @return bool true if executable program found in path |
258 | 259 | */ |
259 | 260 | function _can_execute($name, $path = false) |
@@ -319,6 +320,7 @@ discard block |
||
319 | 320 | * try to detect the mime type of a file |
320 | 321 | * |
321 | 322 | * @param string file path |
323 | + * @param string $fspath |
|
322 | 324 | * @return string guessed mime type |
323 | 325 | */ |
324 | 326 | function _mimetype($fspath) |
@@ -416,7 +418,7 @@ discard block |
||
416 | 418 | * GET method handler |
417 | 419 | * |
418 | 420 | * @param array parameter passing array |
419 | - * @return bool true on success |
|
421 | + * @return null|boolean true on success |
|
420 | 422 | */ |
421 | 423 | function GET(&$options) |
422 | 424 | { |
@@ -446,7 +448,7 @@ discard block |
||
446 | 448 | * See RFC 2518, Section 8.4 on GET/HEAD for collections |
447 | 449 | * |
448 | 450 | * @param string directory path |
449 | - * @return void function has to handle HTTP response itself |
|
451 | + * @return null|false function has to handle HTTP response itself |
|
450 | 452 | */ |
451 | 453 | function GetDir($fspath, &$options) |
452 | 454 | { |
@@ -533,7 +535,7 @@ discard block |
||
533 | 535 | * MKCOL method handler |
534 | 536 | * |
535 | 537 | * @param array general parameter passing array |
536 | - * @return bool true on success |
|
538 | + * @return string true on success |
|
537 | 539 | */ |
538 | 540 | function MKCOL($options) |
539 | 541 | { |
@@ -570,7 +572,7 @@ discard block |
||
570 | 572 | * DELETE method handler |
571 | 573 | * |
572 | 574 | * @param array general parameter passing array |
573 | - * @return bool true on success |
|
575 | + * @return string true on success |
|
574 | 576 | */ |
575 | 577 | function DELETE($options) |
576 | 578 | { |
@@ -600,7 +602,7 @@ discard block |
||
600 | 602 | * MOVE method handler |
601 | 603 | * |
602 | 604 | * @param array general parameter passing array |
603 | - * @return bool true on success |
|
605 | + * @return string true on success |
|
604 | 606 | */ |
605 | 607 | function MOVE($options) |
606 | 608 | { |
@@ -611,7 +613,7 @@ discard block |
||
611 | 613 | * COPY method handler |
612 | 614 | * |
613 | 615 | * @param array general parameter passing array |
614 | - * @return bool true on success |
|
616 | + * @return string true on success |
|
615 | 617 | */ |
616 | 618 | function COPY($options, $del=false) |
617 | 619 | { |
@@ -751,7 +753,7 @@ discard block |
||
751 | 753 | * PROPPATCH method handler |
752 | 754 | * |
753 | 755 | * @param array general parameter passing array |
754 | - * @return bool true on success |
|
756 | + * @return string true on success |
|
755 | 757 | */ |
756 | 758 | function PROPPATCH(&$options) |
757 | 759 | { |
@@ -790,7 +792,7 @@ discard block |
||
790 | 792 | * LOCK method handler |
791 | 793 | * |
792 | 794 | * @param array general parameter passing array |
793 | - * @return bool true on success |
|
795 | + * @return string|boolean true on success |
|
794 | 796 | */ |
795 | 797 | function LOCK(&$options) |
796 | 798 | { |
@@ -848,7 +850,7 @@ discard block |
||
848 | 850 | * UNLOCK method handler |
849 | 851 | * |
850 | 852 | * @param array general parameter passing array |
851 | - * @return bool true on success |
|
853 | + * @return string true on success |
|
852 | 854 | */ |
853 | 855 | function UNLOCK(&$options) |
854 | 856 | { |
@@ -87,6 +87,7 @@ |
||
87 | 87 | * constructor |
88 | 88 | * |
89 | 89 | * @param string path of stream to read |
90 | + * @param string $path |
|
90 | 91 | * @access public |
91 | 92 | */ |
92 | 93 | function __construct($path) |
@@ -95,6 +95,7 @@ |
||
95 | 95 | * |
96 | 96 | * @param string path of input stream |
97 | 97 | * @param boolean $store_request =false if true whole request data will be made available in $this->request |
98 | + * @param string $path |
|
98 | 99 | * @access public |
99 | 100 | */ |
100 | 101 | function __construct($path, $store_request=false) |
@@ -80,6 +80,7 @@ |
||
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Returns the maximum width/height of a thumbnail |
83 | + * @return integer|null |
|
83 | 84 | */ |
84 | 85 | function get_maxsize() |
85 | 86 | { |
@@ -94,7 +94,6 @@ |
||
94 | 94 | /** |
95 | 95 | * imports entries according to given definition object. |
96 | 96 | * @param resource $_stream |
97 | - * @param string $_charset |
|
98 | 97 | * @param definition $_definition |
99 | 98 | */ |
100 | 99 | public function import( $_stream, definition $_definition ) { |
@@ -519,6 +519,7 @@ discard block |
||
519 | 519 | * @param array $new_event Event after the change |
520 | 520 | * @param string $role we treat CHAIR like event owners |
521 | 521 | * @param string $status of current user |
522 | + * @param integer $msg_type |
|
522 | 523 | * @return boolean true = update requested, false otherwise |
523 | 524 | */ |
524 | 525 | public static function update_requested($userid, $part_prefs, &$msg_type, $old_event ,$new_event, $role, $status=null) |
@@ -594,7 +595,7 @@ discard block |
||
594 | 595 | /** |
595 | 596 | * Check calendar prefs, if a given user (integer account_id) or email (user or externals) should get notified |
596 | 597 | * |
597 | - * @param int|string $user_or_email |
|
598 | + * @param string $user_or_email |
|
598 | 599 | * @param string $ical_method ='REQUEST' |
599 | 600 | * @param string $role ='REQ-PARTICIPANT' |
600 | 601 | * @return boolean true if user requested to be notified, false if not |
@@ -645,8 +646,7 @@ discard block |
||
645 | 646 | * Get iCal/iMip method from internal nummeric msg-type plus optional notification message and verbose name |
646 | 647 | * |
647 | 648 | * @param int $msg_type see MSG_* defines |
648 | - * @param string& $action=null on return verbose name |
|
649 | - * @param string& $msg=null on return notification message |
|
649 | + * @param string& $action on return verbose name |
|
650 | 650 | */ |
651 | 651 | function msg_type2ical_method($msg_type, &$action=null, &$msg=null) |
652 | 652 | { |
@@ -1011,6 +1011,9 @@ discard block |
||
1011 | 1011 | return true; |
1012 | 1012 | } |
1013 | 1013 | |
1014 | + /** |
|
1015 | + * @param integer $added |
|
1016 | + */ |
|
1014 | 1017 | function get_update_message($event,$added) |
1015 | 1018 | { |
1016 | 1019 | $nul = null; |
@@ -1300,8 +1303,8 @@ discard block |
||
1300 | 1303 | * |
1301 | 1304 | * @param int $right self::CAT_ACL_{ADD|STATUS} |
1302 | 1305 | * @param int|array $event |
1303 | - * @return boolean true if use has the right, false if not |
|
1304 | - * @return boolean false=access denied because of cat acl, true access granted because of cat acl, |
|
1306 | + * @return null|boolean true if use has the right, false if not |
|
1307 | + * @return null|boolean false=access denied because of cat acl, true access granted because of cat acl, |
|
1305 | 1308 | * null = cat has no acl |
1306 | 1309 | */ |
1307 | 1310 | function check_cat_acl($right,$event) |
@@ -1386,6 +1389,8 @@ discard block |
||
1386 | 1389 | * Check if current user has a given right on a category (if it's restricted!) |
1387 | 1390 | * |
1388 | 1391 | * @param int $cat_id |
1392 | + * @param integer $right |
|
1393 | + * @param integer $user |
|
1389 | 1394 | * @return boolean false=access denied because of cat acl, true access granted because of cat acl, |
1390 | 1395 | * null = cat has no acl |
1391 | 1396 | */ |
@@ -1647,7 +1652,7 @@ discard block |
||
1647 | 1652 | * @param string $action |
1648 | 1653 | * @param array $event_arr |
1649 | 1654 | * @param array $disinvited |
1650 | - * @return array |
|
1655 | + * @return string |
|
1651 | 1656 | */ |
1652 | 1657 | function _get_event_details($event,$action,&$event_arr,$disinvited=array()) |
1653 | 1658 | { |
@@ -27,7 +27,7 @@ |
||
27 | 27 | /** |
28 | 28 | * Exports records as defined in $_definition |
29 | 29 | * |
30 | - * @param egw_record $_definition |
|
30 | + * @param importexport_definition $_definition |
|
31 | 31 | */ |
32 | 32 | public function export( $_stream, importexport_definition $_definition) { |
33 | 33 | $options = $_definition->plugin_options; |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * default 0 => export whole series (or events, if not recurring) |
195 | 195 | * @param string $principalURL ='' Used for CalDAV exports |
196 | 196 | * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8 |
197 | - * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY |
|
197 | + * @param integer $current_user =0 uid of current user to only export that one as participant for method=REPLY |
|
198 | 198 | * @return string|boolean string with iCal or false on error (e.g. no permission to read the event) |
199 | 199 | */ |
200 | 200 | function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0) |
@@ -1094,16 +1094,15 @@ discard block |
||
1094 | 1094 | * Import an iCal |
1095 | 1095 | * |
1096 | 1096 | * @param string|resource $_vcalData |
1097 | - * @param int $cal_id=-1 must be -1 for new entries! |
|
1098 | - * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail |
|
1099 | - * @param boolean $merge=false merge data with existing entry |
|
1100 | - * @param int $recur_date=0 if set, import the recurrence at this timestamp, |
|
1097 | + * @param int $cal_id must be -1 for new entries! |
|
1098 | + * @param int $recur_date if set, import the recurrence at this timestamp, |
|
1101 | 1099 | * default 0 => import whole series (or events, if not recurring) |
1102 | 1100 | * @param string $principalURL='' Used for CalDAV imports |
1103 | - * @param int $user=null account_id of owner, default null |
|
1104 | 1101 | * @param string $charset The encoding charset for $text. Defaults to |
1105 | 1102 | * utf-8 for new format, iso-8859-1 for old format. |
1106 | - * @param string $caldav_name=null name from CalDAV client or null (to use default) |
|
1103 | + * @param string $caldav_name name from CalDAV client or null (to use default) |
|
1104 | + * @param integer $etag |
|
1105 | + * @param integer $user |
|
1107 | 1106 | * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden" |
1108 | 1107 | */ |
1109 | 1108 | function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false) |
@@ -3182,6 +3181,10 @@ discard block |
||
3182 | 3181 | return $event; |
3183 | 3182 | } |
3184 | 3183 | |
3184 | + /** |
|
3185 | + * @param integer $contentID |
|
3186 | + * @param string $charset |
|
3187 | + */ |
|
3185 | 3188 | function search($_vcalData, $contentID=null, $relax=false, $charset=null) |
3186 | 3189 | { |
3187 | 3190 | if (($events = $this->icaltoegw($_vcalData, $charset))) |
@@ -3221,6 +3224,7 @@ discard block |
||
3221 | 3224 | * @param string $method ='PUBLISH' or eg. 'REPLY' |
3222 | 3225 | * @param array $extra =null extra attributes to add |
3223 | 3226 | * X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy |
3227 | + * @return string|null |
|
3224 | 3228 | */ |
3225 | 3229 | function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null) |
3226 | 3230 | { |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @param importepport_iface_egw_record record The egw_record object being imported |
75 | 75 | * @param importexport_iface_import_record import_csv Import object contains current state |
76 | 76 | * |
77 | - * @return boolean success |
|
77 | + * @return null|boolean success |
|
78 | 78 | */ |
79 | 79 | public function import_record(\importexport_iface_egw_record &$record, &$import_csv) |
80 | 80 | { |
@@ -254,7 +254,6 @@ discard block |
||
254 | 254 | * perform the required action |
255 | 255 | * |
256 | 256 | * @param int $_action one of $this->actions |
257 | - * @param array $_data record data for the action |
|
258 | 257 | * @return bool success or not |
259 | 258 | */ |
260 | 259 | protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) |
@@ -343,7 +342,7 @@ discard block |
||
343 | 342 | /** |
344 | 343 | * Alter a row for preview to show multiple participants instead of Array |
345 | 344 | * |
346 | - * @param egw_record $row_entry |
|
345 | + * @param importexport_iface_egw_record $row_entry |
|
347 | 346 | */ |
348 | 347 | protected function row_preview(importexport_iface_egw_record &$row_entry) |
349 | 348 | { |