@@ -30,14 +30,12 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * Shows the contactform and stores the submitted data |
32 | 32 | * |
33 | - * @param array $content=null submitted eTemplate content |
|
34 | - * @param int $addressbook=null int owner-id of addressbook to save contacts too |
|
35 | - * @param array $fields=null field-names to show |
|
36 | - * @param string $msg=null message to show after submitting the form |
|
37 | - * @param string $email=null comma-separated email addresses |
|
38 | - * @param string $tpl_name=null custom etemplate to use |
|
39 | - * @param string $subject=null subject for email |
|
40 | - * @param string $copytoreceiver=false send a copy of notification to receiver |
|
33 | + * @param array $content submitted eTemplate content |
|
34 | + * @param int $addressbook int owner-id of addressbook to save contacts too |
|
35 | + * @param array $fields field-names to show |
|
36 | + * @param string $tpl_name custom etemplate to use |
|
37 | + * @param string $subject subject for email |
|
38 | + * @param string $copytoreceiver send a copy of notification to receiver |
|
41 | 39 | * @return string html content |
42 | 40 | */ |
43 | 41 | function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array()) |
@@ -49,13 +47,11 @@ discard block |
||
49 | 47 | * Shows the contactform and stores the submitted data ($content is a var parameter, eg. for extending classes) |
50 | 48 | * |
51 | 49 | * @param array &$content=null submitted eTemplate content |
52 | - * @param int $addressbook=null int owner-id of addressbook to save contacts too |
|
53 | - * @param array $fields=null field-names to show |
|
54 | - * @param string $msg=null message to show after submitting the form |
|
55 | - * @param string $email=null comma-separated email addresses |
|
56 | - * @param string $tpl_name=null custom etemplate to use |
|
57 | - * @param string $subject=null subject for email |
|
58 | - * @param string $copytoreceiver=false send a copy of notification to receiver |
|
50 | + * @param int $addressbook int owner-id of addressbook to save contacts too |
|
51 | + * @param array $fields field-names to show |
|
52 | + * @param string $tpl_name custom etemplate to use |
|
53 | + * @param string $subject subject for email |
|
54 | + * @param string $copytoreceiver send a copy of notification to receiver |
|
59 | 55 | * @return string html content |
60 | 56 | */ |
61 | 57 | function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array()) |
@@ -79,8 +79,6 @@ |
||
79 | 79 | * Here we need to handle any incoming data. Setup is done in the constructor, |
80 | 80 | * output is handled by parent. |
81 | 81 | * |
82 | - * @param type $id |
|
83 | - * @param Etemplate $etemplate |
|
84 | 82 | */ |
85 | 83 | public static function process($values = array()) |
86 | 84 | { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * @param array &$files |
107 | 107 | * @param int $user account_id |
108 | 108 | * @param string $id ='' |
109 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
109 | + * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
110 | 110 | */ |
111 | 111 | function propfind($path,&$options,&$files,$user,$id='') |
112 | 112 | { |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * |
189 | 189 | * @param string $path |
190 | 190 | * @param array& $filter |
191 | - * @param array|boolean $start =false false=return all or array(start,num) |
|
191 | + * @param integer[] $start =false false=return all or array(start,num) |
|
192 | 192 | * @return array with "files" array with values for keys path and props |
193 | 193 | */ |
194 | 194 | function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true) |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | * @param array &$options |
540 | 540 | * @param int $id |
541 | 541 | * @param int $user =null account_id |
542 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
542 | + * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
543 | 543 | */ |
544 | 544 | function get(&$options,$id,$user=null) |
545 | 545 | { |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | * @param int $id |
567 | 567 | * @param int $user =null account_id of owner, default null |
568 | 568 | * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook) |
569 | - * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
569 | + * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found') |
|
570 | 570 | */ |
571 | 571 | function put(&$options,$id,$user=null,$prefix=null) |
572 | 572 | { |
@@ -1024,7 +1024,7 @@ discard block |
||
1024 | 1024 | * |
1025 | 1025 | * @param int $acl Acl::READ, Acl::EDIT or Acl::DELETE |
1026 | 1026 | * @param array|int $contact contact-array or id |
1027 | - * @return boolean null if entry does not exist, false if no access, true if access permitted |
|
1027 | + * @return null|boolean null if entry does not exist, false if no access, true if access permitted |
|
1028 | 1028 | */ |
1029 | 1029 | function check_access($acl,$contact) |
1030 | 1030 | { |
@@ -532,7 +532,6 @@ |
||
532 | 532 | /** |
533 | 533 | * Read the IMAP ACLs |
534 | 534 | * |
535 | - * @param array $args admin-account[@domain],admin-password,accout_lid[,pw] |
|
536 | 535 | * @return int 0 on success |
537 | 536 | */ |
538 | 537 | function do_subscribe_other($account_lid,$pw=null) |
@@ -255,11 +255,10 @@ |
||
255 | 255 | * |
256 | 256 | * @param type $action |
257 | 257 | * @param type $checked |
258 | - * @param type $use_all |
|
259 | 258 | * @param type $success |
260 | 259 | * @param int $failed |
261 | 260 | * @param type $action_msg |
262 | - * @return type number of failed |
|
261 | + * @return boolean number of failed |
|
263 | 262 | */ |
264 | 263 | function action($action,$checked,&$success,&$failed,&$action_msg) |
265 | 264 | { |
@@ -679,6 +679,8 @@ |
||
679 | 679 | * @param int &$failed number of failed actions (not enought permissions) |
680 | 680 | * @param string &$action_msg translated verb for the actions, to be used in a message like '%1 entries deleted' |
681 | 681 | * @param array $query get_rows parameter |
682 | + * @param integer $success |
|
683 | + * @param integer $failed |
|
682 | 684 | * @return boolean true if all actions succeded, false otherwise |
683 | 685 | */ |
684 | 686 | function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg, array $query) |
@@ -443,10 +443,10 @@ discard block |
||
443 | 443 | * |
444 | 444 | * @static |
445 | 445 | * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!) |
446 | - * @param boolean|string|array $only_keys =true True returns only keys, False returns all cols. or |
|
446 | + * @param boolean $only_keys =true True returns only keys, False returns all cols. or |
|
447 | 447 | * comma seperated list or array of columns to return |
448 | 448 | * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY) |
449 | - * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num" |
|
449 | + * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num" |
|
450 | 450 | * @param string $wildcard ='' appended befor and after each criteria |
451 | 451 | * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row |
452 | 452 | * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | * |
697 | 697 | * @param string|boolean|int $value |
698 | 698 | * @param boolean $default =null |
699 | - * @return boolean |
|
699 | + * @return boolean|null |
|
700 | 700 | * @throws Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998); |
701 | 701 | */ |
702 | 702 | static function parse_boolean($value,$default=null) |
@@ -925,7 +925,7 @@ discard block |
||
925 | 925 | * Read data of a remote instance |
926 | 926 | * |
927 | 927 | * @param array|int $keys |
928 | - * @return array |
|
928 | + * @return string |
|
929 | 929 | */ |
930 | 930 | static function read_remote($keys) |
931 | 931 | { |
@@ -1005,7 +1005,7 @@ discard block |
||
1005 | 1005 | * Check if string is a md5 hash (32 chars of 0-9 or a-f) |
1006 | 1006 | * |
1007 | 1007 | * @param string $str |
1008 | - * @return boolean |
|
1008 | + * @return integer |
|
1009 | 1009 | */ |
1010 | 1010 | static function is_md5($str) |
1011 | 1011 | { |
@@ -20,7 +20,7 @@ |
||
20 | 20 | /** |
21 | 21 | * Constructor |
22 | 22 | * |
23 | - * @param boolean|array $allow true=give rights, false=remove rights, or array with all 3 params |
|
23 | + * @param boolean $allow true=give rights, false=remove rights, or array with all 3 params |
|
24 | 24 | * @param string|int $account =null account name or id |
25 | 25 | * @param array|string $apps =null app-names |
26 | 26 | */ |
@@ -77,8 +77,7 @@ |
||
77 | 77 | /** |
78 | 78 | * imports entries according to given definition object. |
79 | 79 | * @param resource $_stream |
80 | - * @param string $_charset |
|
81 | - * @param definition $_definition |
|
80 | + * @param importexport_definition $_definition |
|
82 | 81 | */ |
83 | 82 | public function import( $_stream, importexport_definition $_definition ) { |
84 | 83 | $import_csv = new importexport_import_csv( $_stream, array( |