Completed
Push — master ( 9d054b...106a1b )
by Klaus
23:45 queued 04:19
created
infolog/inc/class.infolog_bo.inc.php 1 patch
Doc Comments   +2 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1226,7 +1226,7 @@  discard block
 block discarded – undo
1226 1226
 	 * Is called as hook to participate in the linking
1227 1227
 	 *
1228 1228
 	 * @param int|array $info int info_id or array with infolog entry
1229
-	 * @return string|boolean string with the title, null if $info not found, false if no perms to view
1229
+	 * @return string string with the title, null if $info not found, false if no perms to view
1230 1230
 	 */
1231 1231
 	function link_title($info)
1232 1232
 	{
@@ -1324,9 +1324,6 @@  discard block
 block discarded – undo
1324 1324
 	/**
1325 1325
 	 * hook called be calendar to include events or todos in the cal-dayview
1326 1326
 	 *
1327
-	 * @param int $args[year], $args[month], $args[day] date of the events
1328
-	 * @param int $args[owner] owner of the events
1329
-	 * @param string $args[location] calendar_include_{events|todos}
1330 1327
 	 * @return array of events (array with keys starttime, endtime, title, view, icon, content)
1331 1328
 	 */
1332 1329
 	function cal_to_include($args)
@@ -1515,7 +1512,7 @@  discard block
 block discarded – undo
1515 1512
 	 * Get names for categories specified by their id's
1516 1513
 	 *
1517 1514
 	 * @param array|string $cat_id_list array or comma-sparated list of id's
1518
-	 * @return array with names
1515
+	 * @return string|boolean with names
1519 1516
 	 */
1520 1517
 	function get_categories($cat_id_list)
1521 1518
 	{
Please login to merge, or discard this patch.
infolog/inc/class.infolog_groupdav.inc.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @param array &$options
142 142
 	 * @param array &$files
143 143
 	 * @param int $user account_id
144
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
144
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
145 145
 	 */
146 146
 	function propfind($path,&$options,&$files,$user,$id='')
147 147
 	{
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	 *
222 222
 	 * @param string $path
223 223
 	 * @param array $filter
224
-	 * @param array|boolean $start =false false=return all or array(start,num)
224
+	 * @param integer[] $start =false false=return all or array(start,num)
225 225
 	 * @return array with "files" array with values for keys path and props
226 226
 	 */
227 227
 	function &propfind_callback($path,array $filter,$start=false)
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
 	 * @param array &$options
522 522
 	 * @param int $id
523 523
 	 * @param int $user =null account_id
524
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
524
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
525 525
 	 */
526 526
 	function get(&$options,$id,$user=null)
527 527
 	{
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 	 * @param int $id
547 547
 	 * @param int $user =null account_id of owner, default null
548 548
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
549
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
549
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
550 550
 	 */
551 551
 	function put(&$options,$id,$user=null,$prefix=null)
552 552
 	{
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
 	 *
683 683
 	 * @param array &$options
684 684
 	 * @param int $id
685
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
685
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
686 686
 	 */
687 687
 	function delete(&$options,$id)
688 688
 	{
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 	 * etag currently uses the modifcation time (info_datemodified), 1.9.002 adds etag column, but it's not yet used!
758 758
 	 *
759 759
 	 * @param array|int $info array with infolog entry or info_id
760
-	 * @return string|boolean string with etag or false
760
+	 * @return false|string string with etag or false
761 761
 	 */
762 762
 	function get_etag($info)
763 763
 	{
Please login to merge, or discard this patch.
infolog/inc/class.infolog_ical.inc.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1042,8 +1042,7 @@
 block discarded – undo
1042 1042
 	 * Search a matching infolog entry for the VNOTE data
1043 1043
 	 *
1044 1044
 	 * @param string $_vcalData		VNOTE
1045
-	 * @param int $contentID=null 	infolog_id (or null, if unkown)
1046
-	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
1045
+	 * @param int $contentID 	infolog_id (or null, if unkown)
1047 1046
 	 * @param string $charset  The encoding charset for $text. Defaults to
1048 1047
      *                         utf-8 for new format, iso-8859-1 for old format.
1049 1048
 	 *
Please login to merge, or discard this patch.
infolog/inc/class.infolog_import_infologs_csv.inc.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,8 +108,7 @@  discard block
 block discarded – undo
108 108
 	/**
109 109
 	 * imports entries according to given definition object.
110 110
 	 * @param resource $_stream
111
-	 * @param string $_charset
112
-	 * @param definition $_definition
111
+	 * @param importexport_definition $_definition
113 112
 	 */
114 113
 	public function import( $_stream, importexport_definition $_definition ) {
115 114
 		$import_csv = new importexport_import_csv( $_stream, array(
@@ -527,6 +526,7 @@  discard block
 block discarded – undo
527 526
 	 *
528 527
 	 * This is a copy of what's in importexport_basic_import_csv, and can go
529 528
 	 * away if this is changed to extend it
529
+	 * @param integer $record_num
530 530
 	 */
531 531
 	protected function link_by_cf($record_num, $app, $fieldname, $_value)
532 532
 	{
Please login to merge, or discard this patch.
infolog/inc/class.infolog_so.inc.php 1 patch
Doc Comments   +1 added lines, -14 removed lines patch added patch discarded remove patch
@@ -85,6 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * Check if user is responsible for an entry: he or one of his memberships is in responsible
86 86
 	 *
87 87
 	 * @param array $info infolog entry as array
88
+	 * @param integer $user
88 89
 	 * @return boolean
89 90
 	 */
90 91
 	function is_responsible($info,$user=null)
@@ -476,8 +477,6 @@  discard block
 block discarded – undo
476 477
 	 * changes or deletes entries with a spezified owner (for hook_delete_account)
477 478
 	 *
478 479
 	 * @param array $args hook arguments
479
-	 * @param int $args['account_id'] account to delete
480
-	 * @param int $args['new_owner']=0 new owner
481 480
 	 */
482 481
 	function change_delete_owner(array $args)  // new_owner=0 means delete
483 482
 	{
@@ -659,19 +658,7 @@  discard block
 block discarded – undo
659 658
 	/**
660 659
 	 * searches InfoLog for a certain pattern in $query
661 660
 	 *
662
-	 * @param string $query[order] column-name to sort after
663
-	 * @param string $query[sort] sort-order DESC or ASC
664
-	 * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
665
-	 * @param int $query[cat_id] category to use or 0 or unset
666
-	 * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des
667
-	 * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
668 661
 	 * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
669
-	 * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
670
-	 * @param boolean $query[subs] return subs or not, if unset the user preference is used
671
-	 * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
672
-	 * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
673
-	 * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
674
-	 * @param boolean $query['custom_fields']=false query custom-fields too, default not
675 662
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
676 663
 	 */
677 664
 	function search(&$query)
Please login to merge, or discard this patch.
infolog/inc/class.infolog_tracking.inc.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,6 @@
 block discarded – undo
125 125
 	/**
126 126
 	 * Constructor
127 127
 	 *
128
-	 * @param botracker $botracker
129 128
 	 * @return tracker_tracking
130 129
 	 */
131 130
 	function __construct(&$infolog_bo)
Please login to merge, or discard this patch.
infolog/inc/class.infolog_ui.inc.php 1 patch
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -295,6 +295,8 @@  discard block
 block discarded – undo
295 295
 	 * @param array &$query
296 296
 	 * @param array &$rows
297 297
 	 * @param array &$readonlys
298
+	 * @param type|null $rows
299
+	 * @param type|null $readonlys
298 300
 	 * @return int
299 301
 	 */
300 302
 	function get_rows(&$query,&$rows,&$readonlys)
@@ -574,7 +576,6 @@  discard block
 block discarded – undo
574 576
 	 * Hook for timesheet to set some extra data and links
575 577
 	 *
576 578
 	 * @param array $data
577
-	 * @param int $data[id] info_id
578 579
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
579 580
 	 */
580 581
 	function timesheet_set($data)
@@ -600,7 +601,6 @@  discard block
 block discarded – undo
600 601
 	 * Hook for calendar to set some extra data and links
601 602
 	 *
602 603
 	 * @param array $data event-array preset by calendar plus
603
-	 * @param int $data[entry_id] info_id
604 604
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
605 605
 	 */
606 606
 	function calendar_set($data)
@@ -688,11 +688,11 @@  discard block
 block discarded – undo
688 688
 	/**
689 689
 	 * Shows the infolog list
690 690
 	 *
691
-	 * @param array/string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
691
+	 * @param integer $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
692 692
 	 * @param string $action if set only entries liked to that $action:$action_id are shown
693 693
 	 * @param string $action_id if set only entries liked to that $action:$action_id are shown
694
-	 * @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
695
-	 * @param boolean $e$extra_app_header * @param boolean $return_html=false
694
+	 * @param integer $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
695
+	 * @param boolean $extra_app_header * @param boolean $return_html
696 696
 	 * @param string $own_referer='' this is our own referer
697 697
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
698 698
 	 */
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
1288 1288
 	 * @param array $query get_rows parameter
1289 1289
 	 * @param string &$msg on return user feedback
1290 1290
 	 * @param boolean $skip_notifications true to NOT notify users about changes
1291
-	 * @return boolean true if all actions succeded, false otherwise
1291
+	 * @return boolean|null true if all actions succeded, false otherwise
1292 1292
 	 */
1293 1293
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg,
1294 1294
 		array $query, &$msg, $skip_notifications = false)
@@ -1526,9 +1526,9 @@  discard block
 block discarded – undo
1526 1526
 	/**
1527 1527
 	 * Closes an infolog
1528 1528
 	 *
1529
-	 * @param int|array $values=0 info_id (default _GET[info_id])
1529
+	 * @param int|array $values info_id (default _GET[info_id])
1530 1530
 	 * @param string $_referer=''
1531
-	 * @param boolean $closesingle=false
1531
+	 * @param boolean $closesingle
1532 1532
 	 */
1533 1533
 	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
1534 1534
 	{
@@ -1576,7 +1576,7 @@  discard block
 block discarded – undo
1576 1576
 	/**
1577 1577
 	 * Deletes an InfoLog entry
1578 1578
 	 *
1579
-	 * @param array|int $values info_id (default _GET[info_id])
1579
+	 * @param integer $values info_id (default _GET[info_id])
1580 1580
 	 * @param string $_referer
1581 1581
 	 * @param string $called_by
1582 1582
 	 * @param boolean $skip_notification Do not send notification of deletion
Please login to merge, or discard this patch.
json.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
  * callback if the session-check fails, redirects to login.php, if no valid basic auth credentials given
19 19
  *
20 20
  * @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type'
21
- * @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise
21
+ * @return string|null true if we allow anon access and anon_account is set, a sessionid or false otherwise
22 22
  */
23 23
 function login_redirect(&$anon_account)
24 24
 {
Please login to merge, or discard this patch.
mail/inc/class.mail_acl.inc.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -277,8 +277,6 @@
 block discarded – undo
277 277
 	 * Update ACL rights of a folder or including subfolders for an account(s)
278 278
 	 *
279 279
 	 * @param array $content content including the acl rights
280
-	 * @param Boolean $recursive boolean flag FALSE|TRUE. If it is FALSE, only the folder take in to account, but in case of TRUE
281
-	 *		the mailbox including all its subfolders will be considered.
282 280
 	 * @param string $msg Message
283 281
 	 *
284 282
 	 */
Please login to merge, or discard this patch.