@@ -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 | { |
@@ -150,7 +150,7 @@ |
||
150 | 150 | * Get a list of the user's portlets, and their associated values & settings, for display |
151 | 151 | * |
152 | 152 | * Actual portlet content is provided by each portlet. |
153 | - * @param template etemplate so attributes can be set |
|
153 | + * @param template etemplate_new so attributes can be set |
|
154 | 154 | */ |
155 | 155 | protected function get_user_portlets(etemplate_new &$template) |
156 | 156 | { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | /** |
77 | 77 | * List defined {im|ex}ports |
78 | 78 | * |
79 | - * @param array $content=null |
|
79 | + * @param array $content |
|
80 | 80 | */ |
81 | 81 | function index($content = null,$msg='') |
82 | 82 | { |
@@ -303,7 +303,8 @@ discard block |
||
303 | 303 | * @param int &$success number of succeded actions |
304 | 304 | * @param int &$failed number of failed actions (not enought permissions) |
305 | 305 | * @param string &$action_msg translated verb for the actions, to be used in a message like %1 entries 'deleted' |
306 | - * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup |
|
306 | + * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup |
|
307 | + * @param string $msg |
|
307 | 308 | * @return boolean true if all actions succeded, false otherwise |
308 | 309 | */ |
309 | 310 | function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg) |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * Currently we only return an own infolog |
71 | 71 | * |
72 | - * @param int $account=null account_id of addressbook or null to get array of all addressbooks |
|
72 | + * @param int $account account_id of addressbook or null to get array of all addressbooks |
|
73 | 73 | * @return string|array folder name of array with int account_id => folder name pairs |
74 | 74 | */ |
75 | 75 | private function get_folders($account=null) |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | * will work OK apart from that. |
184 | 184 | * |
185 | 185 | * @param string $id folder id |
186 | - * @param int $cutoffdate=null |
|
186 | + * @param int $cutoffdate |
|
187 | 187 | * @return array |
188 | 188 | */ |
189 | 189 | function GetMessageList($id, $cutoffdate=NULL) |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | * @param string $id |
221 | 221 | * @param int $truncsize |
222 | 222 | * @param int $bodypreference |
223 | - * @param bool $mimesupport |
|
223 | + * @param integer $mimesupport |
|
224 | 224 | * @return $messageobject|boolean false on error |
225 | 225 | */ |
226 | 226 | public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0) |
@@ -1240,7 +1240,7 @@ discard block |
||
1240 | 1240 | * Is called as hook to participate in the linking |
1241 | 1241 | * |
1242 | 1242 | * @param int|array $info int info_id or array with infolog entry |
1243 | - * @return string|boolean string with the title, null if $info not found, false if no perms to view |
|
1243 | + * @return string string with the title, null if $info not found, false if no perms to view |
|
1244 | 1244 | */ |
1245 | 1245 | function link_title($info) |
1246 | 1246 | { |
@@ -1338,9 +1338,6 @@ discard block |
||
1338 | 1338 | /** |
1339 | 1339 | * hook called be calendar to include events or todos in the cal-dayview |
1340 | 1340 | * |
1341 | - * @param int $args[year], $args[month], $args[day] date of the events |
|
1342 | - * @param int $args[owner] owner of the events |
|
1343 | - * @param string $args[location] calendar_include_{events|todos} |
|
1344 | 1341 | * @return array of events (array with keys starttime, endtime, title, view, icon, content) |
1345 | 1342 | */ |
1346 | 1343 | function cal_to_include($args) |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | * @param array &$options |
139 | 139 | * @param array &$files |
140 | 140 | * @param int $user account_id |
141 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
141 | + * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
142 | 142 | */ |
143 | 143 | function propfind($path,&$options,&$files,$user,$id='') |
144 | 144 | { |
@@ -217,7 +217,6 @@ discard block |
||
217 | 217 | * |
218 | 218 | * @param string $path |
219 | 219 | * @param array $filter |
220 | - * @param array|boolean $start=false false=return all or array(start,num) |
|
221 | 220 | * @return array with "files" array with values for keys path and props |
222 | 221 | */ |
223 | 222 | function &propfind_callback($path,array $filter,$start=false) |
@@ -517,8 +516,7 @@ discard block |
||
517 | 516 | * |
518 | 517 | * @param array &$options |
519 | 518 | * @param int $id |
520 | - * @param int $user=null account_id |
|
521 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
519 | + * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
522 | 520 | */ |
523 | 521 | function get(&$options,$id,$user=null) |
524 | 522 | { |
@@ -539,9 +537,8 @@ discard block |
||
539 | 537 | * |
540 | 538 | * @param array &$options |
541 | 539 | * @param int $id |
542 | - * @param int $user=null account_id of owner, default null |
|
543 | - * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook) |
|
544 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
540 | + * @param string $prefix user prefix from path (eg. /ralf from /ralf/addressbook) |
|
541 | + * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
545 | 542 | */ |
546 | 543 | function put(&$options,$id,$user=null,$prefix=null) |
547 | 544 | { |
@@ -609,7 +606,7 @@ discard block |
||
609 | 606 | * Callback for infolog_ical::importVTODO to implement infolog-cat-action |
610 | 607 | * |
611 | 608 | * @param array $task |
612 | - * @param array $oldTask=null |
|
609 | + * @param array $oldTask |
|
613 | 610 | * @return array modified task data |
614 | 611 | */ |
615 | 612 | public function cat_action(array $task, $oldTask=null) |
@@ -675,7 +672,7 @@ discard block |
||
675 | 672 | * |
676 | 673 | * @param array &$options |
677 | 674 | * @param int $id |
678 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
675 | + * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
679 | 676 | */ |
680 | 677 | function delete(&$options,$id) |
681 | 678 | { |
@@ -750,7 +747,7 @@ discard block |
||
750 | 747 | * etag currently uses the modifcation time (info_datemodified), 1.9.002 adds etag column, but it's not yet used! |
751 | 748 | * |
752 | 749 | * @param array|int $info array with infolog entry or info_id |
753 | - * @return string|boolean string with etag or false |
|
750 | + * @return false|string string with etag or false |
|
754 | 751 | */ |
755 | 752 | function get_etag($info) |
756 | 753 | { |
@@ -768,10 +765,8 @@ discard block |
||
768 | 765 | /** |
769 | 766 | * Add extra properties for calendar collections |
770 | 767 | * |
771 | - * @param array $props=array() regular props by the groupdav handler |
|
772 | 768 | * @param string $displayname |
773 | - * @param string $base_uri=null base url of handler |
|
774 | - * @param int $user=null account_id of owner of collection |
|
769 | + * @param string $base_uri base url of handler |
|
775 | 770 | * @return array |
776 | 771 | */ |
777 | 772 | public function extra_properties(array $props=array(), $displayname, $base_uri=null,$user=null) |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @param string $_version ='2.0' |
113 | 113 | * @param string $_method =null only set for iTip messages |
114 | 114 | * @param string $charset ='UTF-8' |
115 | - * @return string|boolean string with vCal or false on error (eg. no permission to read the event) |
|
115 | + * @return false|string string with vCal or false on error (eg. no permission to read the event) |
|
116 | 116 | */ |
117 | 117 | function exportVCalendar(array $tasks, $_version='2.0', $_method=null, $charset='UTF-8') |
118 | 118 | { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8 |
138 | 138 | * @param Horde_Icalendar $vcal =null optional iCalendar object to add vtodo to |
139 | 139 | * |
140 | - * @return string|boolean string with vCal or false on error (eg. no permission to read the event) |
|
140 | + * @return false|string string with vCal or false on error (eg. no permission to read the event) |
|
141 | 141 | */ |
142 | 142 | function exportVTODO($task, $_version='2.0',$_method='PUBLISH', $charset='UTF-8',Horde_Icalendar $vcal=null) |
143 | 143 | { |
@@ -916,7 +916,7 @@ discard block |
||
916 | 916 | * @param string $_type content type (e.g. text/plain) |
917 | 917 | * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8 |
918 | 918 | * |
919 | - * @return string|boolean VNOTE representation of the infolog entry or false on error |
|
919 | + * @return false|string VNOTE representation of the infolog entry or false on error |
|
920 | 920 | */ |
921 | 921 | function exportVNOTE($_noteID, $_type, $charset='UTF-8') |
922 | 922 | { |
@@ -1041,8 +1041,7 @@ discard block |
||
1041 | 1041 | * Search a matching infolog entry for the VNOTE data |
1042 | 1042 | * |
1043 | 1043 | * @param string $_vcalData VNOTE |
1044 | - * @param int $contentID=null infolog_id (or null, if unkown) |
|
1045 | - * @param boolean $relax=false if true, a weaker match algorithm is used |
|
1044 | + * @param int $contentID infolog_id (or null, if unkown) |
|
1046 | 1045 | * @param string $charset The encoding charset for $text. Defaults to |
1047 | 1046 | * utf-8 for new format, iso-8859-1 for old format. |
1048 | 1047 | * |
@@ -177,7 +177,6 @@ discard block |
||
177 | 177 | * |
178 | 178 | * @param string $sifData the SIF data |
179 | 179 | * @param string $_sifType type (note/task) |
180 | - * @param int $_id=-1 the infolog id |
|
181 | 180 | * @return array infolog entry or false on error |
182 | 181 | */ |
183 | 182 | function siftoegw($sifData, $_sifType, $_id=-1) |
@@ -407,10 +406,9 @@ discard block |
||
407 | 406 | /** |
408 | 407 | * Search for SIF data a matching infolog entry |
409 | 408 | * |
410 | - * @param string $sifData the SIF data |
|
409 | + * @param string $_sifData the SIF data |
|
411 | 410 | * @param string $_sifType type (note/task) |
412 | - * @param int $contentID=null infolog_id (or null, if unkown) |
|
413 | - * @param boolean $relax=false if true, a weaker match algorithm is used |
|
411 | + * @param int $contentID infolog_id (or null, if unkown) |
|
414 | 412 | * @return infolog_id of a matching entry or false, if nothing was found |
415 | 413 | */ |
416 | 414 | function searchSIF($_sifData, $_sifType, $contentID=null, $relax=false) |
@@ -427,9 +425,8 @@ discard block |
||
427 | 425 | /** |
428 | 426 | * Add SIF data entry |
429 | 427 | * |
430 | - * @param string $sifData the SIF data |
|
428 | + * @param string $_sifData the SIF data |
|
431 | 429 | * @param string $_sifType type (note/task) |
432 | - * @param boolean $merge=false reserved for future use |
|
433 | 430 | * @return infolog_id of the new entry or false, for errors |
434 | 431 | */ |
435 | 432 | function addSIF($_sifData, $_id, $_sifType, $merge=false) |
@@ -64,7 +64,6 @@ discard block |
||
64 | 64 | /** |
65 | 65 | * Constructor |
66 | 66 | * |
67 | - * @param array $grants=array() |
|
68 | 67 | * @return soinfolog |
69 | 68 | */ |
70 | 69 | function __construct( $grants=array() ) |
@@ -102,9 +101,9 @@ discard block |
||
102 | 101 | * |
103 | 102 | * @param array|int $info data or info_id of InfoLog entry |
104 | 103 | * @param int $required_rights EGW_ACL_xyz anded together |
105 | - * @param boolean $implicit_edit=false responsible has only implicit read and add rigths, unless this is set to true |
|
106 | - * @param array $grants=null grants to use, default (null) $this->grants |
|
107 | - * @param int $user=null user to check, default (null) $this->user |
|
104 | + * @param boolean $implicit_edit responsible has only implicit read and add rigths, unless this is set to true |
|
105 | + * @param array $grants grants to use, default (null) $this->grants |
|
106 | + * @param integer $user |
|
108 | 107 | * @return boolean True if access is granted else False |
109 | 108 | */ |
110 | 109 | function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null ) |
@@ -274,7 +273,7 @@ discard block |
||
274 | 273 | * generate sql to filter based on the status of the log-entry |
275 | 274 | * |
276 | 275 | * @param string $filter done = done or billed, open = not (done, billed, cancelled or deleted), offer = offer |
277 | - * @param boolean $prefix_and=true if true prefix the fileter with ' AND ' |
|
276 | + * @param boolean $prefix_and if true prefix the fileter with ' AND ' |
|
278 | 277 | * @return string the necesary sql |
279 | 278 | */ |
280 | 279 | function statusFilter($filter = '',$prefix_and=true) |
@@ -370,7 +369,7 @@ discard block |
||
370 | 369 | * some cacheing is done to prevent multiple reads of the same entry |
371 | 370 | * |
372 | 371 | * @param array $where where clause for entry to read |
373 | - * @return array|boolean the entry as array or False on error (eg. entry not found) |
|
372 | + * @return boolean the entry as array or False on error (eg. entry not found) |
|
374 | 373 | */ |
375 | 374 | function read(array $where) // did _not_ ensure ACL |
376 | 375 | { |
@@ -474,8 +473,6 @@ discard block |
||
474 | 473 | * changes or deletes entries with a spezified owner (for hook_delete_account) |
475 | 474 | * |
476 | 475 | * @param array $args hook arguments |
477 | - * @param int $args['account_id'] account to delete |
|
478 | - * @param int $args['new_owner']=0 new owner |
|
479 | 476 | */ |
480 | 477 | function change_delete_owner(array $args) // new_owner=0 means delete |
481 | 478 | { |
@@ -508,8 +505,8 @@ discard block |
||
508 | 505 | * writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0 |
509 | 506 | * |
510 | 507 | * @param array $values with the data of the log-entry |
511 | - * @param int $check_modified=0 old modification date to check before update (include in WHERE) |
|
512 | - * @param string $purge_cfs=null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs |
|
508 | + * @param int $check_modified old modification date to check before update (include in WHERE) |
|
509 | + * @param string $purge_cfs null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs |
|
513 | 510 | * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime |
514 | 511 | */ |
515 | 512 | function write($values, $check_modified=0, $purge_cfs=null) // did _not_ ensure ACL |
@@ -662,19 +659,7 @@ discard block |
||
662 | 659 | /** |
663 | 660 | * searches InfoLog for a certain pattern in $query |
664 | 661 | * |
665 | - * @param string $query[order] column-name to sort after |
|
666 | - * @param string $query[sort] sort-order DESC or ASC |
|
667 | - * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or '' |
|
668 | - * @param int $query[cat_id] category to use or 0 or unset |
|
669 | - * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des |
|
670 | - * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used |
|
671 | 662 | * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries |
672 | - * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!) |
|
673 | - * @param boolean $query[subs] return subs or not, if unset the user preference is used |
|
674 | - * @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 |
|
675 | - * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned |
|
676 | - * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY |
|
677 | - * @param boolean $query['custom_fields']=false query custom-fields too, default not |
|
678 | 663 | * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set |
679 | 664 | */ |
680 | 665 | function search(&$query) |