Completed
Push — master ( 9d054b...106a1b )
by Klaus
23:45 queued 04:19
created
api/src/WebDAV/Server/Filesystem.php 1 patch
Doc Comments   +11 added lines, -9 removed lines patch added patch discarded remove patch
@@ -254,6 +254,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
api/src/WebDAV/Tools/_parse_proppatch.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -95,6 +95,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
api/thumbnail.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -80,6 +80,7 @@
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
calendar/importexport/class.import_events_csv.inc.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,6 @@
 block discarded – undo
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 ) {
Please login to merge, or discard this patch.
calendar/inc/class.calendar_bo.inc.php 1 patch
Doc Comments   +8 added lines, -13 removed lines patch added patch discarded remove patch
@@ -626,8 +626,8 @@  discard block
 block discarded – undo
626 626
 	 * or an ExecMethod callback with parameters $id,$event
627 627
 	 *
628 628
 	 * @param string $app
629
-	 * @param int|string $id
630
-	 * @return string
629
+	 * @param string $id
630
+	 * @return boolean
631 631
 	 */
632 632
 	static function integration_get_private($app,$id,$event)
633 633
 	{
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * This methods operates in usertime, while $this->config['horizont'] is in servertime!
757 757
 	 *
758 758
 	 * @param array $event
759
-	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
759
+	 * @param integer $start =0 minimum start-time for new recurrences or !$start = since the start of the event
760 760
 	 */
761 761
 	function set_recurrences($event,$start=0)
762 762
 	{
@@ -976,10 +976,9 @@  discard block
 block discarded – undo
976 976
 	 * Recurrences get calculated by rrule iterator implemented in calendar_rrule class.
977 977
 	 *
978 978
 	 * @param array $event repeating event whos repetions should be inserted
979
-	 * @param mixed $start start-date
979
+	 * @param mixed $_start start-date
980 980
 	 * @param mixed $end end-date
981 981
 	 * @param array $events where the repetions get inserted
982
-	 * @param array $recur_exceptions with date (in Ymd) as key (and True as values), seems not to be used anymore
983 982
 	 */
984 983
 	function insert_all_recurrences($event,$_start,$end,&$events)
985 984
 	{
@@ -1133,7 +1132,7 @@  discard block
 block discarded – undo
1133 1132
 	 *	even if you have no general read-grant from that user.
1134 1133
 	 *
1135 1134
 	 * @param int $needed necessary ACL right: Acl::{READ|EDIT|DELETE}
1136
-	 * @param mixed $event event as array or the event-id or 0 for a general check
1135
+	 * @param integer $event event as array or the event-id or 0 for a general check
1137 1136
 	 * @param int $other uid to check (if event==0) or 0 to check against $this->user
1138 1137
 	 * @param string $date_format ='ts' date-format used for reading: 'ts'=timestamp, 'array'=array, 'string'=iso8601 string for xmlrpc
1139 1138
 	 * @param mixed $date_to_read =null date used for reading, internal param for the caching
@@ -1306,8 +1305,6 @@  discard block
 block discarded – undo
1306 1305
 	 * @param string $msg message with parameters/variables like lang(), eg. '%1'
1307 1306
 	 * @param boolean $backtrace =True include a function-backtrace, default True=On
1308 1307
 	 *	should only be set to False=Off, if your code ensures a call with backtrace=On was made before !!!
1309
-	 * @param mixed $param a variable number of parameters, to be inserted in $msg
1310
-	 *	arrays get serialized with print_r() !
1311 1308
 	 */
1312 1309
 	static function debug_message($msg,$backtrace=True)
1313 1310
 	{
@@ -1370,7 +1367,7 @@  discard block
 block discarded – undo
1370 1367
 	 * Formats one or two dates (range) as long date (full monthname), optionaly with a time
1371 1368
 	 *
1372 1369
 	 * @param mixed $_first first date
1373
-	 * @param mixed $last =0 last date if != 0 (default)
1370
+	 * @param integer $last =0 last date if != 0 (default)
1374 1371
 	 * @param boolean $display_time =false should a time be displayed too
1375 1372
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
1376 1373
 	 * @return string with formated date
@@ -1839,7 +1836,6 @@  discard block
 block discarded – undo
1839 1836
 	 *
1840 1837
 	 * Is called as hook to participate in the linking
1841 1838
 	 *
1842
-	 * @param int|array $entry int cal_id or array with event
1843 1839
 	 * @param string|boolean string with title, null if not found or false if not read perms
1844 1840
 	 */
1845 1841
 	function link_title($event)
@@ -2028,7 +2024,8 @@  discard block
 block discarded – undo
2028 2024
 	 *
2029 2025
 	 * @param array|int|string $entry array with event or cal_id, or cal_id:recur_date for virtual exceptions
2030 2026
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
2031
-	 * @return string|boolean string with etag or false
2027
+	 * @param string $schedule_tag
2028
+	 * @return string string with etag or false
2032 2029
 	 */
2033 2030
 	function get_etag($entry, &$schedule_tag=null)
2034 2031
 	{
@@ -2068,7 +2065,6 @@  discard block
 block discarded – undo
2068 2065
 	 * Hook for infolog  to set some extra data and links
2069 2066
 	 *
2070 2067
 	 * @param array $data event-array preset by infolog plus
2071
-	 * @param int $data[id] cal_id
2072 2068
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
2073 2069
 	 */
2074 2070
 	function infolog_set($data)
@@ -2120,7 +2116,6 @@  discard block
 block discarded – undo
2120 2116
 	 * Hook for timesheet to set some extra data and links
2121 2117
 	 *
2122 2118
 	 * @param array $data
2123
-	 * @param int $data[id] cal_id:recurrence
2124 2119
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
2125 2120
 	 */
2126 2121
 	function timesheet_set($data)
Please login to merge, or discard this patch.
calendar/inc/class.calendar_boupdate.inc.php 1 patch
Doc Comments   +11 added lines, -6 removed lines patch added patch discarded remove patch
@@ -519,6 +519,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	{
Please login to merge, or discard this patch.
calendar/inc/class.calendar_groupdav.inc.php 1 patch
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 	 *
316 316
 	 * @param string $path
317 317
 	 * @param array $filter
318
-	 * @param array|boolean $start =false false=return all or array(start,num)
318
+	 * @param integer[] $start =false false=return all or array(start,num)
319 319
 	 * @return array with "files" array with values for keys path and props
320 320
 	 */
321 321
 	function propfind_callback($path,array $filter,$start=false)
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
 	 * @param array &$options
621 621
 	 * @param int $id
622 622
 	 * @param int $user =null account_id
623
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
623
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
624 624
 	 */
625 625
 	function get(&$options,$id,$user=null)
626 626
 	{
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 	 * Check if $user is a participant of given $event incl. group-invitations
794 794
 	 *
795 795
 	 * @param array $event
796
-	 * @param int|string $user
796
+	 * @param integer $user
797 797
 	 * @return boolean
798 798
 	 */
799 799
 	public static function isParticipant(array $event, $user)
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
 	 * @param int $id
811 811
 	 * @param int $user =null account_id of owner, default null
812 812
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
813
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
813
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
814 814
 	 */
815 815
 	function put(&$options,$id,$user=null,$prefix=null)
816 816
 	{
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
 	 * @param array &$options
1039 1039
 	 * @param int $id
1040 1040
 	 * @param int $user =null account_id of owner, default null
1041
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1041
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1042 1042
 	 */
1043 1043
 	function post(&$options,$id,$user=null)
1044 1044
 	{
@@ -1112,7 +1112,7 @@  discard block
 block discarded – undo
1112 1112
 	 * @param string $charset of ical
1113 1113
 	 * @param int $user account_id of owner
1114 1114
 	 * @param array &$options
1115
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1115
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1116 1116
 	 */
1117 1117
 	protected function outbox_freebusy_request($ical, $charset, $user, array &$options)
1118 1118
 	{
@@ -1187,7 +1187,7 @@  discard block
 block discarded – undo
1187 1187
 	 * @param string $path
1188 1188
 	 * @param array $options
1189 1189
 	 * @param int $user account_id
1190
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1190
+	 * @return string|null boolean true on success, false on failure or string with http status (eg. '404 Not Found')
1191 1191
 	 */
1192 1192
 	function free_busy_report($path,$options,$user)
1193 1193
 	{
@@ -1416,7 +1416,7 @@  discard block
 block discarded – undo
1416 1416
 	/**
1417 1417
 	 * Query ctag for calendar
1418 1418
 	 *
1419
-	 * @return string
1419
+	 * @return integer
1420 1420
 	 */
1421 1421
 	public function getctag($path,$user)
1422 1422
 	{
@@ -1432,7 +1432,7 @@  discard block
 block discarded – undo
1432 1432
 	 *
1433 1433
 	 * @param array|int $entry array with event or cal_id
1434 1434
 	 * @param string $schedule_tag =null on return schedule-tag
1435
-	 * @return string|boolean string with etag or false
1435
+	 * @return string string with etag or false
1436 1436
 	 */
1437 1437
 	function get_etag($entry, &$schedule_tag=null)
1438 1438
 	{
@@ -1449,7 +1449,7 @@  discard block
 block discarded – undo
1449 1449
 	 *
1450 1450
 	 * @param int|array $entry id or array of new created entry
1451 1451
 	 * @param string $path
1452
-	 * @param int|string $retval
1452
+	 * @param string|boolean $retval
1453 1453
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
1454 1454
 	 */
1455 1455
 	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true)
Please login to merge, or discard this patch.
calendar/inc/class.calendar_holidays.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -135,6 +135,9 @@
 block discarded – undo
135 135
 		return $until_year ? $years : $years[$year];
136 136
 	}
137 137
 
138
+	/**
139
+	 * @param string $url
140
+	 */
138 141
 	protected static function is_url($url)
139 142
 	{
140 143
 		return $url[0] == '/' || strpos($url, '://') !== false;
Please login to merge, or discard this patch.
calendar/inc/class.calendar_ical.inc.php 1 patch
Doc Comments   +11 added lines, -7 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	{
Please login to merge, or discard this patch.