chamilo / chamilo-lms

main/auth/cas/lib/CAS.php

Doc Comments +4 added lines, -4 removed lines

@@ -523,7 +523,7 @@ 
     /**

      * Logs a string in debug mode.

      *

-     * @param $str the string to write

+     * @param string $str the string to write

      *

      * @private

      */

@@ -545,7 +545,7 @@ 
      * This method is used by interface methods to print an error and where the function

      * was originally called from.

      *

-     * @param $msg the message to print

+     * @param string $msg the message to print

      *

      * @private

      */

@@ -678,7 +678,7 @@ 
     /**

      * This method returns the phpCAS version.

      *

-     * @return the phpCAS version.

+     * @return string phpCAS version.

      */

     function getVersion()

     {

@@ -1105,7 +1105,7 @@ 
      * @warning should not be called only after phpCAS::forceAuthentication()

      * or phpCAS::checkAuthentication().

      *

-     * @return the login name of the authenticated user

+     * @return string login name of the authenticated user

      */

     function getUser()

     {

main/auth/cas/lib/CAS/client.php

Doc Comments +41 added lines, -39 removed lines

@@ -73,7 +73,7 @@ 
      *
      * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter().
      *
-     * @param $str the string to filter and output
+     * @param string $str the string to filter and output
      *
      * @private
      */
@@ -185,7 +185,7 @@ 
     /**
      * This method returns the language used by phpCAS.
      *
-     * @return a string representing the language
+     * @return string string representing the language
      *
      * @private
      */
@@ -211,7 +211,7 @@ 
     /**
      * This method returns a string depending on the language.
      *
-     * @param $str the index of the string in $_string.
+     * @param integer $str the index of the string in $_string.
      *
      * @return the string corresponding to $index in $string.
      *
@@ -232,7 +232,7 @@ 
      * This method is used to set the language used by phpCAS.
      * @note Can be called only once.
      *
-     * @param $lang a string representing the language.
+     * @param string $lang a string representing the language.
      *
      * @public
      * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH
@@ -426,7 +426,7 @@ 
 
     /**
      * This method is used to retrieve the service validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerServiceValidateURL()
@@ -448,7 +448,7 @@ 
 
     /**
      * This method is used to retrieve the SAML validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerSamlValidateURL()
@@ -468,7 +468,7 @@ 
 
     /**
      * This method is used to retrieve the proxy validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerProxyValidateURL()
@@ -549,7 +549,7 @@ 
 
     /**
      * This method checks to see if the request is secured via HTTPS
-     * @return true if https, false otherwise
+     * @return boolean if https, false otherwise
      * @private
      */
     function isHttps()
@@ -570,7 +570,7 @@ 
      * CASClient constructor.
      *
      * @param $server_version the version of the CAS server
-     * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise
+     * @param boolean $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise
      * @param $server_hostname the hostname of the CAS server
      * @param $server_port the port the CAS server is running on
      * @param $server_uri the URI the CAS server is responding on
@@ -778,7 +778,7 @@ 
      * @warning should be called only after CASClient::forceAuthentication() or
      * CASClient::isAuthenticated(), otherwise halt with an error.
      *
-     * @return the login name of the authenticated user
+     * @return string login name of the authenticated user
      */
     function getUser()
     {
@@ -860,7 +860,7 @@ 
     /**
      * This method is called to be sure that the user is authenticated. When not
      * authenticated, halt by redirecting to the CAS server; otherwise return TRUE.
-     * @return TRUE when the user is authenticated; otherwise halt.
+     * @return boolean when the user is authenticated; otherwise halt.
      * @public
      */
     function forceAuthentication()
@@ -906,7 +906,7 @@ 
 
     /**
      * This method is called to check whether the user is authenticated or not.
-     * @return TRUE when the user is authenticated, FALSE otherwise.
+     * @return boolean when the user is authenticated, FALSE otherwise.
      * @public
      */
     function checkAuthentication()
@@ -960,7 +960,7 @@ 
      * This method is called to check if the user is authenticated (previously or by
      * tickets given in the URL).
      *
-     * @return TRUE when the user is authenticated. Also may redirect to the same URL without the ticket.
+     * @return boolean when the user is authenticated. Also may redirect to the same URL without the ticket.
      *
      * @public
      */
@@ -1026,7 +1026,7 @@ 
 
     /**
      * This method tells if the current session is authenticated.
-     * @return true if authenticated based soley on $_SESSION variable
+     * @return boolean if authenticated based soley on $_SESSION variable
      * @since 0.4.22 by Brendan Arnold
      */
     function isSessionAuthenticated()
@@ -1040,7 +1040,7 @@ 
      *
      * @note This function switches to callback mode when needed.
      *
-     * @return TRUE when the user has already been authenticated; FALSE otherwise.
+     * @return boolean when the user has already been authenticated; FALSE otherwise.
      *
      * @private
      */
@@ -1154,7 +1154,7 @@ 
     }
 
     /**
-     * @return true if the current request is a logout request.
+     * @return boolean if the current request is a logout request.
      * @private
      */
     function isLogoutRequest()
@@ -1270,7 +1270,7 @@ 
 
     /**
      * This method returns the Service Ticket provided in the URL of the request.
-     * @return The service ticket.
+     * @return string service ticket.
      * @private
      */
     function getST()
@@ -1290,7 +1290,7 @@ 
 
     /**
      * This method tells if a Service Ticket was stored.
-     * @return TRUE if a Service Ticket has been stored.
+     * @return boolean if a Service Ticket has been stored.
      * @private
      */
     function hasST()
@@ -1365,7 +1365,7 @@ 
      * $text_reponse and $tree_response on success. These parameters are used later
      * by CASClient::validatePGT() for CAS proxies.
      * Used for all CAS 1.0 validations
-     * @param $validate_url the URL of the request to the CAS server.
+     * @param string $validate_url the URL of the request to the CAS server.
      * @param $text_response the response of the CAS server, as is (XML text).
      * @param $tree_response the response of the CAS server, as a DOM XML tree.
      *
@@ -1497,7 +1497,7 @@ 
      * $text_reponse and $tree_response on success. These parameters are used later
      * by CASClient::validatePGT() for CAS proxies.
      *
-     * @param $validate_url the URL of the request to the CAS server.
+     * @param string $validate_url the URL of the request to the CAS server.
      * @param $text_response the response of the CAS server, as is (XML text).
      * @param $tree_response the response of the CAS server, as a DOM XML tree.
      *
@@ -1684,7 +1684,7 @@ 
 
     /**
      * This method returns the Proxy Granting Ticket given by the CAS server.
-     * @return The Proxy Granting Ticket.
+     * @return string Proxy Granting Ticket.
      * @private
      */
     function getPGT()
@@ -1704,7 +1704,7 @@ 
 
     /**
      * This method tells if a Proxy Granting Ticket was stored.
-     * @return TRUE if a Proxy Granting Ticket has been stored.
+     * @return boolean if a Proxy Granting Ticket has been stored.
      * @private
      */
     function hasPGT()
@@ -1739,7 +1739,7 @@ 
     /**
      * This method sets/unsets callback mode.
      *
-     * @param $callback_mode TRUE to set callback mode, FALSE otherwise.
+     * @param boolean $callback_mode TRUE to set callback mode, FALSE otherwise.
      *
      * @private
      */
@@ -1752,7 +1752,7 @@ 
      * This method returns TRUE when the CAs client is running i callback mode,
      * FALSE otherwise.
      *
-     * @return A boolean.
+     * @return boolean boolean.
      *
      * @private
      */
@@ -1776,7 +1776,7 @@ 
      * fact the URL of the current request without any CGI parameter, except if
      * phpCAS::setFixedCallbackURL() was used).
      *
-     * @return The callback URL
+     * @return string callback URL
      *
      * @private
      */
@@ -1820,6 +1820,7 @@ 
      * This method sets the callback url.
      *
      * @param $callback_url url to set callback
+     * @param string $url
      *
      * @private
      */
@@ -1904,7 +1905,7 @@ 
     /**
      * This method reads a PGT from its Iou and deletes the corresponding storage entry.
      *
-     * @param $pgt_iou the PGT Iou
+     * @param string $pgt_iou the PGT Iou
      *
      * @return The PGT corresponding to the Iou, FALSE when not found.
      *
@@ -2037,7 +2038,7 @@ 
      * @param $err_code an error code (PHPCAS_SERVICE_OK on success).
      * @param $err_msg an error message (empty on success).
      *
-     * @return a Proxy Ticket, or FALSE on error.
+     * @return false|string Proxy Ticket, or FALSE on error.
      *
      * @private
      */
@@ -2140,14 +2141,14 @@ 
     /**
      * This method is used to acces a remote URL.
      *
-     * @param $url the URL to access.
+     * @param string $url the URL to access.
      * @param $cookies an array containing cookies strings such as 'name=val'
      * @param $headers an array containing the HTTP header lines of the response
      * (an empty array on failure).
      * @param $body the body of the response, as a string (empty on failure).
      * @param $err_msg an error message, filled on failure.
      *
-     * @return TRUE on success, FALSE otherwise (in this later case, $err_msg
+     * @return boolean on success, FALSE otherwise (in this later case, $err_msg
      * contains an error message).
      *
      * @private
@@ -2250,7 +2251,7 @@ 
     /**
      * This method is used to build the SAML POST body sent to /samlValidate URL.
      *
-     * @return the SOAP-encased SAMLP artifact (the ticket).
+     * @return string SOAP-encased SAMLP artifact (the ticket).
      *
      * @private
      */
@@ -2289,7 +2290,7 @@ 
      * @param $output the output of the service (also used to give an error
      * message on failure).
      *
-     * @return TRUE on success, FALSE otherwise (in this later case, $err_code
+     * @return boolean on success, FALSE otherwise (in this later case, $err_code
      * gives the reason why it failed and $output contains an error message).
      *
      * @public
@@ -2436,7 +2437,7 @@ 
 
     /**
      * This method returns the Proxy Ticket provided in the URL of the request.
-     * @return The proxy ticket.
+     * @return string proxy ticket.
      * @private
      */
     function getPT()
@@ -2457,7 +2458,7 @@ 
 
     /**
      * This method tells if a Proxy Ticket was stored.
-     * @return TRUE if a Proxy Ticket has been stored.
+     * @return boolean if a Proxy Ticket has been stored.
      * @private
      */
     function hasPT()
@@ -2467,7 +2468,7 @@ 
 
     /**
      * This method returns the SAML Ticket provided in the URL of the request.
-     * @return The SAML ticket.
+     * @return string SAML ticket.
      * @private
      */
     function getSA()
@@ -2487,7 +2488,7 @@ 
 
     /**
      * This method tells if a SAML Ticket was stored.
-     * @return TRUE if a SAML Ticket has been stored.
+     * @return boolean if a SAML Ticket has been stored.
      * @private
      */
     function hasSA()
@@ -2507,6 +2508,7 @@ 
     /**
      * This method is used to validate a ST or PT; halt on failure
      * Used for all CAS 2.0 validations
+     * @param string $validate_url
      * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
      *
      * @private
@@ -2623,7 +2625,7 @@ 
      * This method returns the URL of the current request (without any ticket
      * CGI parameter).
      *
-     * @return The URL
+     * @return string URL
      *
      * @private
      */
@@ -2701,7 +2703,7 @@ 
     /**
      * This method sets the URL of the current request
      *
-     * @param $url url to set for service
+     * @param string $url url to set for service
      *
      * @private
      */
@@ -2716,9 +2718,9 @@ 
     /**
      * This method is used to print the HTML output when the user was not authenticated.
      *
-     * @param $failure the failure that occured
+     * @param string $failure the failure that occured
      * @param $cas_url the URL the CAS server was asked for
-     * @param $no_response the response from the CAS server (other
+     * @param boolean $no_response the response from the CAS server (other
      * parameters are ignored if TRUE)
      * @param $bad_response bad response from the CAS server ($err_code
      * and $err_msg ignored if TRUE)

main/auth/cas/lib/CAS/domxml-php4-to-php5.php

Doc Comments +7 added lines

@@ -811,6 +811,9 @@ 
         $this->myDOMXPath = new DOMXPath($this->myOwnerDocument->myDOMNode);
     }
 
+    /**
+     * @param string $eval_str
+     */
     function xpath_eval($eval_str, $contextnode = null)
     {
         if (method_exists($this->myDOMXPath, 'evaluate')) {
@@ -824,6 +827,10 @@ 
         return ($xp->type === XPATH_UNDEFINED) ? false : $xp;
     }
 
+    /**
+     * @param string $prefix
+     * @param string $namespaceURI
+     */
     function xpath_register_ns($prefix, $namespaceURI)
     {
         return $this->myDOMXPath->registerNamespace($prefix, $namespaceURI);

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
    * This method returns the name of the directory where PGT's should be stored 

    * on the filesystem.

    *

-   * @return the name of a directory (with leading and trailing '/')

+   * @return string name of a directory (with leading and trailing '/')

    *

    * @private

    */

@@ -81,7 +81,7 @@ 
   /**

    * This method returns the format to use when storing PGT's on the filesystem.

    *

-   * @return a string corresponding to the format used (plain or xml).

+   * @return string string corresponding to the format used (plain or xml).

    *

    * @private

    */

main/auth/cas/lib/CAS/PGTStorage/pgt-main.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
   /**

    * The constructor of the class, should be called only by inherited classes.

    *

-   * @param $cas_parent the CASclient instance that creates the current object.

+   * @param CASClient $cas_parent the CASclient instance that creates the current object.

    *

    * @protected

    */

main/auth/openid/openid.lib.php

Doc Comments +3 added lines

@@ -242,6 +242,9 @@
     return $hmac;
 }
 
+/**
+ * @param string|false $text
+ */
 function _openid_sha1($text) {
     $hex = sha1($text);
     $raw = '';

main/auth/shibboleth/app/model/scaffold/user.class.php

Doc Comments +3 added lines

@@ -33,6 +33,7 @@ 
         
     /**
      *
+     * @param ShibbolethUser $data
      * @return User 
      */
     public static function create($data = null)
@@ -133,6 +134,7 @@ 
     
     /**
      *
+     * @param string $value
      * @return User 
      */
     public function get_by_user_id($value)
@@ -169,6 +171,7 @@ 
     
     /**
      *
+     * @param string $value
      * @return bool 
      */
     public function username_exists($value)

main/inc/lib/exercise_show_functions.lib.php

Doc Comments +37 added lines, -4 removed lines

@@ -25,6 +25,7 @@ 
 	 * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
+     * @param boolean $showTotalScoreAndUserChoices
  *
 	 * @return void
 	 */
@@ -71,6 +72,11 @@ 
      * @param string    Answer text
      * @param int       Exercise ID
      * @param int       Question ID
+     * @param integer $feedback_type
+     * @param string $answer
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean|string $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_calculated_answer(
@@ -110,6 +116,9 @@ 
 	 * @param string    Answer text
 	 * @param int       Exercise ID
 	 * @param int       Question ID
+	 * @param integer $feedback_type
+	 * @param integer $exe_id
+	 * @param integer $questionId
 	 * @return void
 	 */
 	public static function display_free_answer(
@@ -139,11 +148,11 @@ 
 	}
 
     /**
-    * @param $feedback_type
+    * @param integer $feedback_type
     * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
+    * @param integer $id
+    * @param integer $questionId
+    * @param Nanogong|null $nano
     * @param int $results_disabled
      */
 	public static function display_oral_expression_answer(
@@ -195,6 +204,7 @@ 
      * @param string $answerComment
      * @param int $resultsDisabled
      * @param int $orderColor
+     * @param boolean $showTotalScoreAndUserChoices
      */
 	public static function display_hotspot_answer(
         $feedback_type,
@@ -279,6 +289,13 @@ 
 	 * @param integer Exercise ID
 	 * @param integer Question ID
 	 * @param boolean Whether to show the answer comment or not
+	 * @param integer $answerType
+	 * @param string $answer
+	 * @param string $answerComment
+	 * @param integer $answerCorrect
+	 * @param integer $id
+	 * @param integer $questionId
+	 * @param boolean $showTotalScoreAndUserChoices
 	 * @return void
 	 */
 	public static function display_unique_or_multiple_answer(
@@ -375,6 +392,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_true_false(
@@ -479,6 +504,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_combination_true_false(

main/inc/lib/internationalization.lib.php

Doc Comments +19 added lines, -13 removed lines

@@ -437,6 +437,7 @@ 
  * If null, the timezone will be determined based on user preference,
  * or timezone chosen by the admin for the platform.
  * @param string The timezone to be converted from. If null, UTC will be assumed.
+ * @param string $to_timezone
  * @return string The converted time formatted as Y-m-d H:i:s
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -793,6 +794,7 @@ 
  * @param mixed The time to be converted
  * @param mixed Format to be used (TIME_NO_SEC_FORMAT, DATE_FORMAT_SHORT, DATE_FORMAT_LONG, DATE_TIME_FORMAT_LONG)
  * @param string Timezone to be converted from. If null, UTC will be assumed.
+ * @param string $from_timezone
  * @return string Converted and localized date
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -862,7 +864,7 @@ 
  * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t %l, %f' or '%T %F %L', ...) or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return bool							The result is sort of full name of the person.
+ * @return string							The result is sort of full name of the person.
  * Sample results:
  * Peter Ustinoff or Dr. Peter Ustinoff     - the Western order
  * Ustinoff Peter or Dr. Ustinoff Peter     - the Eastern order
@@ -956,7 +958,7 @@ 
 
 /**
  * Checks whether a given format represents person name in Western order (for which first name is first).
- * @param int/string $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
+ * @param integer $format (optional)	The person name format. It may be a pattern-string (for example '%t. %l, %f') or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
  * @return bool							The result TRUE means that the order is first_name last_name, FALSE means last_name first_name.
  * Note: You may use this function for determing the order of the fields or columns "First name" and "Last name" in forms, tables and reports.
@@ -1184,8 +1186,8 @@ 
 
 /**
  * This function returns a string or an array with all occurrences of search in subject (ignoring case) replaced with the given replace value.
- * @param mixed $search					String or array of strings to be found.
- * @param mixed $replace				String or array of strings used for replacement.
+ * @param string $search					String or array of strings to be found.
+ * @param string $replace				String or array of strings used for replacement.
  * @param mixed $subject				String or array of strings being searched.
  * @param int $count (optional)			The number of matched and replaced needles will be returned in count, which is passed by reference.
  * @param string $encoding (optional)	The used internally by this function character encoding.
@@ -1248,10 +1250,10 @@ 
 /**
  * Finds first occurrence of a string within another, case insensitive.
  * @param string $haystack					The string from which to get the first occurrence.
- * @param mixed $needle						The string to be found.
+ * @param string $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1307,7 +1309,7 @@ 
  * @param mixed $needle						The string which first character is to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence.
@@ -1374,7 +1376,7 @@ 
  * @param mixed $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1517,7 +1519,7 @@ 
  * 										Note that this changes the return value in an array where every element is an array consisting of the matched string at index 0 and its string offset into subject at index 1.
  * @param int $offset (optional)		Normally, the search starts from the beginning of the subject string. The optional parameter offset can be used to specify the alternate place from which to start the search.
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return int|boolean					Returns the number of times pattern matches or FALSE if an error occurred.
+ * @return integer					Returns the number of times pattern matches or FALSE if an error occurred.
  * @link http://php.net/preg_match
  */
 function api_preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0, $encoding = null) {
@@ -1540,7 +1542,7 @@ 
  * If no order flag is given, PREG_PATTERN_ORDER is assumed.
  * @param int $offset (optional)		Normally, the search starts from the beginning of the subject string. The optional parameter offset can be used to specify the alternate place from which to start the search.
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return int|boolean					Returns the number of full pattern matches (which might be zero), or FALSE if an error occurred.
+ * @return integer					Returns the number of full pattern matches (which might be zero), or FALSE if an error occurred.
  * @link http://php.net/preg_match_all
  */
 function api_preg_match_all($pattern, $subject, &$matches, $flags = PREG_PATTERN_ORDER, $offset = 0, $encoding = null) {
@@ -1555,8 +1557,8 @@ 
 
 /**
  * Performs a regular expression search and replace, UTF-8 aware when it is applicable.
- * @param string|array $pattern			The pattern to search for. It can be either a string or an array with strings.
- * @param string|array $replacement		The string or an array with strings to replace.
+ * @param string $pattern			The pattern to search for. It can be either a string or an array with strings.
+ * @param string $replacement		The string or an array with strings to replace.
  * @param string|array $subject			The string or an array with strings to search and replace.
  * @param int $limit					The maximum possible replacements for each pattern in each subject string. Defaults to -1 (no limit).
  * @param int &$count					If specified, this variable will be filled with the number of replacements done.
@@ -1808,6 +1810,7 @@ 
 /**
  * Checks a string for UTF-8 validity.
  *
+ * @param string $string
  */
 function api_is_valid_utf8(&$string)
 {
@@ -1950,7 +1953,7 @@ 
 /**
  * Replaces non-valid formats for person names with the default (English) format.
  * @param string $format	The input format to be verified.
- * @return bool				Returns the same format if is is valid, otherwise returns a valid English format.
+ * @return string				Returns the same format if is is valid, otherwise returns a valid English format.
  */
 function _api_validate_person_name_format($format) {
     if (empty($format) || stripos($format, '%f') === false || stripos($format, '%l') === false) {
@@ -2077,6 +2080,9 @@ 
 
 // This function checks whether the function _api_convert_encoding() (the php-
 // implementation) is able to convert from/to a given encoding.
+/**
+ * @param string $encoding
+ */
 function _api_convert_encoding_supports($encoding) {
     static $supports = array();
     if (!isset($supports[$encoding])) {