[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1805-gd27c201

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Tue May 9 15:58:01 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  d27c201d8181600fcfa97b90590ad3d961a59da7 (commit)
      from  50f0a5907f6c9ab6085c6bdf2ad6d651976c296f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d27c201d8181600fcfa97b90590ad3d961a59da7

commit d27c201d8181600fcfa97b90590ad3d961a59da7
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Tue May 9 15:57:56 2017 +0200

    PHP Doc

diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index 0d55bb6..088ccd7 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -53,7 +53,7 @@ function &user_get_object_by_name($user_name, $res = false) {
  *
  * @param string    $email The unix username - required
  * @param bool|int  $res   The result set handle ("SELECT * FROM USERS WHERE user_id=xx")
- * @return FFUser User object or false on failure
+ * @return FFUser|bool User object or false on failure
  */
 function user_get_object_by_email($email, $res = false) {
 	if (!validate_email($email)
diff --git a/src/common/include/sqlparser.php b/src/common/include/sqlparser.php
index eacf1b4..9ba5a93 100644
--- a/src/common/include/sqlparser.php
+++ b/src/common/include/sqlparser.php
@@ -21,6 +21,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/**
+ * get_next_line()
+ *
+ * @param	$f
+ * @return	bool|string
+ */
 function get_next_line($f) {
 	$l = fgets($f);
 	if ($l === false) {
@@ -34,6 +40,12 @@ define ('GREEN', "\033[01;32m" );
 define ('NORMAL', "\033[00m" );
 define ('RED', "\033[01;31m" );
 
+/**
+ * parse_sql_file()
+ *
+ * @param	string	$filename
+ * @return	bool|array
+ */
 function parse_sql_file($filename) {
 	$f = fopen($filename, 'r');
 	if (!$f) {
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 5be905c..911e4a0 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1361,6 +1361,10 @@ function util_get_compressed_file_extension() {
  *
  * Do not use this function if $val is “magic”,
  * for example, an overloaded \ArrayAccess.
+ *
+ * @param	$val
+ * @param	bool	$default
+ * @return	bool
  */
 function util_ifsetor(&$val, $default = false) {
 	return (isset($val) ? $val : $default);
@@ -1728,7 +1732,11 @@ function getThemeIdFromName($dirname) {
 }
 
 /**
- * Generate attachment download headers, with security checks around the MIME type
+ * utils_headers_download() - Generate attachment download headers, with security checks around the MIME type
+ *
+ * @param	string	$filename
+ * @param	string	$mimetype
+ * @param	int		$size
  */
 function utils_headers_download($filename, $mimetype, $size) {
 	/* SECURITY: do not serve content with JavaScript execution (and e.g. cookie theft) */
diff --git a/src/common/include/utils_crossref.php b/src/common/include/utils_crossref.php
index c5a2251..a409495 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -26,6 +26,13 @@ require_once $gfcommon.'docman/Document.class.php';
 require_once $gfcommon.'tracker/Artifact.class.php';
 require_once $gfcommon.'frs/FRSRelease.class.php';
 
+/**
+ * util_gen_cross_ref()
+ *
+ * @param	string	$text
+ * @param	int		$group_id
+ * @return	mixed|string
+ */
 function util_gen_cross_ref($text, $group_id) {
 
 	// Handle URL in links, replace them with hyperlinks.

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/User.class.php     |  2 +-
 src/common/include/sqlparser.php      | 12 ++++++++++++
 src/common/include/utils.php          | 10 +++++++++-
 src/common/include/utils_crossref.php |  7 +++++++
 4 files changed, 29 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list