EGroupware / egroupware

api/src/Json/Response.php

Doc Comments +1 added lines, -2 removed lines

@@ -180,7 +180,6 @@ 
 	/**
 	 * Init responseArray
 	 *
-	 * @param array $arr
 	 * @return array previous content
 	 */
 	public function initResponseArray()
@@ -264,7 +263,7 @@ 
 	 *
 	 * @param midex $var
 	 * @param string $prefix =''
-	 * @return mixed
+	 * @return midex|null
 	 */
 	public static function fix_content($var, $prefix='')
 	{

api/src/Ldap.php

Doc Comments +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
 	/**
 	 * Returns information about connected ldap server
 	 *
-	 * @return Ldap\ServerInfo|null
+	 * @return Ldap\ServerInfo
 	 */
 	function getLDAPServerInfo()
 	{
@@ -217,7 +217,7 @@ 
 	 * @param string $host ldap host
 	 * @param string $dn ldap dn
 	 * @param string $passwd ldap pw
-	 * @return resource|boolean resource from ldap_connect() or false on error
+	 * @return boolean resource from ldap_connect() or false on error
 	 */
 	private function _connect($host, $dn, $passwd)
 	{

api/src/Ldap/ServerInfo.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	/**
 	* gets the version
 	*
-	* @return integer the supported ldap version
+	* @return string the supported ldap version
 	*/
 	function getVersion()
 	{
@@ -159,7 +159,7 @@ 
 	 * @param resource $ds
 	 * @param string $host
 	 * @param int $version 2 or 3
-	 * @return ldapserverinfo
+	 * @return ServerInfo
 	 */
 	public static function get($ds, $host, $version=3)
 	{

api/src/Link.php

Doc Comments +3 added lines, -5 removed lines

@@ -433,7 +433,7 @@ 
 	 * generate temporary link_id used as array-key
 	 *
 	 * @param string $app app-name
-	 * @param mixed $id
+	 * @param string $id
 	 * @return string
 	 */
 	static function temp_link_id($app,$id)
@@ -579,7 +579,7 @@ 
 	 * @param string|array $id ='' id if $app_link_id is an appname or array with links, if 1. entry not yet created
 	 * @param string $app2 ='' second app
 	 * @param string $id2 ='' id in $app2
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{
@@ -734,7 +734,6 @@ 
 	 *
 	 * @param string $app app to search
 	 * @param string $pattern pattern to search
-	 * @param string $type Search only a certain sub-type of records (optional)
 	 * @return array with $id => $title pairs of matching entries of app
 	 */
 	static function query($app,$pattern, &$options = array())
@@ -1232,7 +1231,6 @@ 
 	 * @param string $app appname to link the file to
 	 * @param string $id id in $app
 	 * @param string $file VFS path to link to
-	 * @param string $comment ='' comment to add to the link
 	 */
 	static function link_file($app,$id,$file)//,$comment='')
 	{
@@ -1259,7 +1257,7 @@ 
 	 * @param int|string $app > 0: file_id of an attchemnt or $app/$id entry which linked to
 	 * @param string $id ='' id in app
 	 * @param string $fname ='' filename
-	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
+	 * @return boolean false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{

api/src/Link/Storage.php

Doc Comments +6 added lines, -1 removed lines

@@ -176,6 +176,11 @@ 
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
+	/**
+	 * @param boolean $left
+	 * @param string $only_app
+	 * @param boolean $not_only
+	 */
 	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
@@ -206,7 +211,7 @@ 
 	 * @param string $id ='' id in $app, if no integer link_id given in $app_link_id
 	 * @param string $app2 ='' appname of 2. endpoint of the link, if no integer link_id given in $app_link_id
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{

api/src/Mail.php

Doc Comments +17 added lines, -13 removed lines

@@ -429,7 +429,7 @@ 
 	 * forceEAProfileLoad
 	 * used to force the load of a specific emailadmin profile; we assume administrative use only (as of now)
 	 * @param int $_profile_id
-	 * @return object instance of Mail (by reference)
+	 * @return Mail instance of Mail (by reference)
 	 */
 	public static function &forceEAProfileLoad($_profile_id)
 	{
@@ -704,7 +704,7 @@ 
 	/**
 	 * Get all identities of given mailaccount
 	 *
-	 * @param int|Mail\Account $account account-object or acc_id
+	 * @param integer $account account-object or acc_id
 	 * @return array - array(email=>realname)
 	 */
 	function getAccountIdentities($account)
@@ -1289,7 +1289,7 @@ 
 	 * @param array $_filter filter to apply to getSortedList
 	 * @param mixed $_thisUIDOnly = null, if given fetch the headers of this uid only (either one, or array of uids)
 	 * @param boolean $_cacheResult = true try touse the cache of getSortedList
-	 * @param mixed $_fetchPreviews = false (boolean/int) fetch part of the body of the messages requested (if integer the number is assumed to be the number of chars to be returned for preview; if set to true 300 chars are returned (when available))
+	 * @param boolean $_fetchPreviews = false (boolean/int) fetch part of the body of the messages requested (if integer the number is assumed to be the number of chars to be returned for preview; if set to true 300 chars are returned (when available))
 	 * @return array result as array(header=>array,total=>int,first=>int,last=>int)
 	 */
 	function getHeaders($_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true, $_fetchPreviews=false)
@@ -1866,6 +1866,7 @@ 
 	 *
 	 * @param mixed _sort the integer sort order / or a valid and handeled SORTSTRING (right now: UID/ARRIVAL/INTERNALDATE (->ARRIVAL))
 	 * @param bool _reverse wether to add REVERSE to the Sort String or not
+	 * @param integer $_sort
 	 * @return the sort sequence for horde search
 	 */
 	function _getSortString($_sort, $_reverse=false)
@@ -2375,7 +2376,7 @@ 
 	 * @param string _parent the parent foldername
 	 * @param string _folderName the new foldername
 	 *
-	 * @return mixed name of the newly created folder or false on error
+	 * @return string name of the newly created folder or false on error
 	 * @throws Exception
 	 */
 	function renameFolder($_oldFolderName, $_parent, $_folderName)
@@ -3247,7 +3248,7 @@ 
 	 * @param string $_mailbox
 	 * @param string $delimiter
 	 * @param string $prefix
-	 * @param string $reclevel 0, counter to keep track of the current recursionlevel
+	 * @param integer $reclevel 0, counter to keep track of the current recursionlevel
 	 * @return array of mailboxes
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
@@ -3297,7 +3298,7 @@ 
 	 * abstraction layer for getDraftFolder, getTemplateFolder, getTrashFolder and getSentFolder
 	 * @param string $_type the type to fetch (Drafts|Template|Trash|Sent)
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @param boolean& $created =null on return true: if folder was just created, false if not
+	 * @param boolean $created =null on return true: if folder was just created, false if not
 	 * @return mixed string or false
 	 */
 	function _getSpecialUseFolder($_type, $_checkexistance=TRUE, &$created=null)
@@ -3429,7 +3430,7 @@ 
 	/**
 	 * getTemplateFolder wrapper for _getSpecialUseFolder Type Template
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @return mixed string or false
+	 * @return string string or false
 	 */
 	function getTemplateFolder($_checkexistance=TRUE)
 	{
@@ -3459,7 +3460,7 @@ 
 	/**
 	 * getOutboxFolder wrapper for _getSpecialUseFolder Type Outbox
 	 * @param boolean $_checkexistance trigger check for existance
-	 * @return mixed string or false
+	 * @return string string or false
 	 */
 	function getOutboxFolder($_checkexistance=TRUE)
 	{
@@ -4298,7 +4299,7 @@ 
 	/**
 	 * get part of the message, if its stucture is indicating its of multipart alternative style
 	 * a wrapper for multipartmixed
-	 * @param string/int $_uid the messageuid,
+	 * @param integer $_uid the messageuid,
 	 * @param Horde_Mime_Part $_structure structure for parsing
 	 * @param string $_htmlMode how to display a message, html, plain text, ...
 	 * @param boolean $_preserveSeen flag to preserve the seenflag by using body.peek
@@ -4948,6 +4949,9 @@ 
 		return $message;
 	}
 
+	/**
+	 * @param integer $cols
+	 */
 	static function wordwrap($str, $cols, $cut, $dontbreaklinesstartingwith=false)
 	{
 		$lines = explode("\n", $str);
@@ -5396,7 +5400,6 @@ 
 	 * @param string $_partID = null
 	 * @param string $_folder = null
 	 * @param boolean $_preserveSeen = false flag to preserve the seenflag by using body.peek
-	 * @param Horde_Imap_Client_Fetch_Query $fquery=null default query just structure
 	 * @return Horde_Mime_Part
 	 */
 	function getStructure($_uid, $_partID=null, $_folder=null, $_preserveSeen=false)
@@ -5987,6 +5990,7 @@ 
 	 * @param preserveHTML flag to pass through to getdisplayableBody
 	 * @param addHeaderSection flag to be able to supress headersection
 	 * @param includeAttachments flag to be able to supress possible attachments
+	 * @param Mail $mailClass
 	 * @return array/bool with 'mailaddress'=>$mailaddress,
 	 *				'subject'=>$subject,
 	 *				'message'=>$message,
@@ -6440,7 +6444,7 @@ 
 	 *
 	 * @param Mailer $_mailObject instance of the Mailer Object to be used
 	 * @param string $_html2parse the html to parse and to be altered, if conditions meet
-	 * @param $mail_bo mail bo object
+	 * @param Mail $mail_bo mail bo object
 	 * @return void
 	 */
 	static function processURL2InlineImages(Mailer $_mailObject, &$_html2parse, $mail_bo)
@@ -6556,7 +6560,7 @@ 
 	 * @param Storage\Merge Storage\Merge bo_merge object
 	 * @param string $document the full filename
 	 * @param array $SendAndMergeTocontacts array of contact ids
-	 * @param string& $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
+	 * @param string|null $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
 	 *					folder is modified
 	 * @param string& $importID ID for the imported message, used by attachments to identify them unambiguously
 	 * @return mixed array of messages with success and failed messages or exception
@@ -6800,7 +6804,7 @@ 
 	/**
 	 * Parses a message/rfc mail from file to the mailobject
 	 *
-	 * @param object $mailer instance of the SMTP Mailer Object
+	 * @param Mailer $mailer instance of the SMTP Mailer Object
 	 * @param string $tmpFileName string that points/leads to the file to be imported
 	 * @throws Exception\NotFound if $fle is not found
 	 */

api/src/Mail/Account.php

Doc Comments +6 added lines, -6 removed lines

@@ -486,7 +486,7 @@ 
 	 * @param boolean $replace_placeholders =false should placeholders like {{n_fn}} be replaced
 	 * @param string $field ='name' what to return as value: "ident_(realname|org|email|signature)" or default "name"=result from identity_name
 	 * @param int $user =null account_id to use if not current user
-	 * @return Iterator ident_id => identity_name of identity
+	 * @return Api\Db\CallbackIterator ident_id => identity_name of identity
 	 */
 	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
 	{
@@ -795,7 +795,7 @@ 
 	 *
 	 * To get $this->params you need to call getUserData before! It is never automatically loaded.
 	 *
-	 * @param type $name
+	 * @param string $name
 	 * @return mixed
 	 */
 	public function __get($name)
@@ -819,8 +819,8 @@ 
 	/**
 	 * Give read access to protected parameters in $this->params
 	 *
-	 * @param type $name
-	 * @return mixed
+	 * @param string $name
+	 * @return boolean
 	 */
 	public function __isset($name)
 	{
@@ -1340,10 +1340,10 @@ 
 	 * @param boolean|string $just_name =true true: return self::identity_name, false: return Account objects,
 	 *	string with attribute-name: return that attribute, eg. acc_imap_host or 'params' to return all attributes as array
 	 * @param string $order_by ='acc_name ASC'
-	 * @param int|boolean $offset =false offset or false to return all
+	 * @param boolean $offset =false offset or false to return all
 	 * @param int $num_rows =0 number of rows to return, 0=default from prefs (if $offset !== false)
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
-	 * @return Iterator with acc_id => acc_name or Account objects
+	 * @return Api\Db\CallbackIterator with acc_id => acc_name or Account objects
 	 */
 	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
 	{

api/src/Mail/Credentials.php

Doc Comments +1 added lines

@@ -322,6 +322,7 @@
 	 * @param int $account_id user-account password is for
 	 * @param int &$pw_enc on return encryption used
 	 * @param ressource $mcrypt =null mcrypt ressource for user, default calling self::init_crypt(true)
+	 * @param integer $pw_enc
 	 * @return string encrypted password
 	 */
 	protected static function encrypt($password, $account_id, &$pw_enc, $mcrypt=null)

api/src/Mail/Hooks.php

Doc Comments -8 removed lines

@@ -36,9 +36,6 @@ 
      * Hook called before an account get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
      */
 	static function deleteaccount(array $data)
 	{
@@ -52,8 +49,6 @@ 
      * Hook called before a group get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
      */
 	static function deletegroup(array $data)
 	{
@@ -64,9 +59,6 @@ 
      * Hook called when an account get added or edited
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{