Completed
Push — 14.2 ( 5702a1...375f73 )
by Nathan
38:22
created
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_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.
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.
mail/inc/class.mail_sieve.inc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1278,7 +1278,7 @@
 block discarded – undo
1278 1278
 	 * int $_searchStringLength
1279 1279
 	 * @param boolean $_returnList
1280 1280
 	 * @param int $_mailaccountToSearch
1281
-	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
1281
+	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
1282 1282
 	 */
1283 1283
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
1284 1284
 	{
Please login to merge, or discard this patch.
mail/inc/class.mail_ui.inc.php 1 patch
Doc Comments   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1541,7 +1541,7 @@  discard block
 block discarded – undo
1541 1541
 	 * function splitRowID - split the rowID into its parts
1542 1542
 	 *
1543 1543
 	 * @param string $_rowID string - a colon separated string in the form accountID:profileID:folder:message_uid
1544
-	 * @return array populated named result array (accountID,profileID,folder,msgUID)
1544
+	 * @return string populated named result array (accountID,profileID,folder,msgUID)
1545 1545
 	 */
1546 1546
 	static function splitRowID($_rowID)
1547 1547
 	{
@@ -1623,9 +1623,9 @@  discard block
 block discarded – undo
1623 1623
 	 * function header2gridelements - to populate the grid elements with the collected Data
1624 1624
 	 *
1625 1625
 	 * @param array $_headers headerdata to process
1626
-	 * @param array $cols cols to populate
1626
+	 * @param string[] $cols cols to populate
1627 1627
 	 * @param array $_folderName to ensure the uniqueness of the uid over all folders
1628
-	 * @param array $_folderType used to determine if we need to populate from/to
1628
+	 * @param integer $_folderType used to determine if we need to populate from/to
1629 1629
 	 * @return array populated result array
1630 1630
 	 */
1631 1631
 	public function header2gridelements($_headers, $cols, $_folderName, $_folderType=0)
@@ -2863,6 +2863,9 @@  discard block
 block discarded – undo
2863 2863
 		return $GLOBALS['egw']->framework->header();
2864 2864
 	}
2865 2865
 
2866
+	/**
2867
+	 * @param string $body
2868
+	 */
2866 2869
 	function showBody(&$body, $print=true,$fullPageTags=true)
2867 2870
 	{
2868 2871
 		$BeginBody = '<div class="mailDisplayBody">
@@ -3099,9 +3102,9 @@  discard block
 block discarded – undo
3099 3102
 	 * Replace CID with proper type of content understandable by browser
3100 3103
 	 *
3101 3104
 	 * @param type $_body content of message
3102
-	 * @param type $_mailbox mail box
3103
-	 * @param type $_uid uid
3104
-	 * @param type $_partID part id
3105
+	 * @param string $_mailbox mail box
3106
+	 * @param string $_uid uid
3107
+	 * @param string $_partID part id
3105 3108
 	 * @param type $_type = 'src' type of inline image that needs to be resolved and replaced
3106 3109
 	 *	- types: {plain|src|url|background}
3107 3110
 	 * @return string returns body content including all CID replacements
@@ -3283,7 +3286,7 @@  discard block
 block discarded – undo
3283 3286
 	 * @param string $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
3284 3287
 	 *					folder is modified
3285 3288
 	 * @param string $importID ID for the imported message, used by attachments to identify them unambiguously
3286
-	 * @return mixed $messageUID or exception
3289
+	 * @return string $messageUID or exception
3287 3290
 	 */
3288 3291
 	function importMessageToFolder($_formData,&$_folder,$importID='')
3289 3292
 	{
@@ -3444,7 +3447,7 @@  discard block
 block discarded – undo
3444 3447
 	 *
3445 3448
 	 * @param string _messageID UID
3446 3449
 	 *
3447
-	 * @return xajax response
3450
+	 * @return string|null response
3448 3451
 	 */
3449 3452
 	function loadEmailBody($_messageID=null,$_partID=null,$_htmloptions=null)
3450 3453
 	{
@@ -3995,7 +3998,7 @@  discard block
 block discarded – undo
3995 3998
 	 * ajax_deleteFolder - its called via json, so the function must start with ajax (or the class-name must contain ajax)
3996 3999
 	 * @param string $_folderName folder to delete
3997 4000
 	 * @param boolean $_return = false wheter return the success value (true) or send response to client (false)
3998
-	 * @return nothing
4001
+	 * @return null|boolean
3999 4002
 	 */
4000 4003
 	function ajax_deleteFolder($_folderName, $_return = false)
4001 4004
 	{
Please login to merge, or discard this patch.
notifications/inc/class.notifications_email.inc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 	 * @param array $_links
132 132
 	 * @param boolean $_render_html
133 133
 	 * @param boolean $_render_external
134
-	 * @return plain or html rendered link(s) as complete string
134
+	 * @return false|string or html rendered link(s) as complete string
135 135
 	 */
136 136
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
137 137
 		if(!is_array($_links) || count($_links) == 0) { return false; }
Please login to merge, or discard this patch.
notifications/inc/class.notifications_winpopup.inc.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 * checks for a valid IPv4-address without CIDR notation
156 156
 	 *
157 157
 	 * @param string $_ip
158
-	 * @return true or false
158
+	 * @return integer or false
159 159
 	 */
160 160
 	private function valid_ip($_ip) {
161 161
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * renders additional info from subject
166 166
 	 *
167 167
 	 * @param string $_subject
168
-	 * @return plain rendered info as complete string
168
+	 * @return string|false rendered info as complete string
169 169
 	 */
170 170
 	private function render_infos($_subject = false) {
171 171
 		$newline = "\n";
Please login to merge, or discard this patch.
redirect.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -24,6 +24,10 @@
 block discarded – undo
24 24
 
25 25
 	if(!function_exists('html_entity_decode'))
26 26
 	{
27
+
28
+		/**
29
+		 * @param integer $quote_style
30
+		 */
27 31
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
28 32
 		{
29 33
 			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));
Please login to merge, or discard this patch.