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 2564a188ec1a95755ac09743a8f28725eb2581e0 (commit)
from 679c8093c7a28e32677b0b045e083fb4a6ec60a6 (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=2564a188ec1a95755ac09743a8f28725eb2581e0
commit 2564a188ec1a95755ac09743a8f28725eb2581e0
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Mar 24 11:34:23 2017 +0100
PHP Doc
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index 4231671..61c184b 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -44,7 +44,7 @@ $DOCUMENT_OBJ = array();
* You should always use this instead of instantiating the object directly
*
* @param int $doc_id The ID of the document -
required
- * @param int $group_id Group ID of the project -
required
+ * @param int|bool $group_id Group ID of the project -
required
* @param int|bool $res The result set handle ("SELECT
* FROM docdata_vw WHERE docid=$1")
* @return Document a document object or false on failure
*/
diff --git a/src/common/forum/ForumMessageFactory.class.php
b/src/common/forum/ForumMessageFactory.class.php
index 616d54a..88ccd18 100644
--- a/src/common/forum/ForumMessageFactory.class.php
+++ b/src/common/forum/ForumMessageFactory.class.php
@@ -68,7 +68,7 @@ class ForumMessageFactory extends FFError {
* @param int $offset The number of rows to skip.
* @param string $style The style of forum, whether
it's nested, ultimate, etc.
* @param int $max_rows The maximum number of rows to
return.
- * @param int $set Whether to set these prefs into
the database - use "custom".
+ * @param string $set Whether to set these prefs into
the database - use "custom".
*/
function setup($offset = 0, $style = 'ultimate', $max_rows = 25, $set =
'no') {
//echo "<br />offset: $offset| style: $style|max_rows: $max_rows|set: $set+";
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 08b2bea..f45addc 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -797,10 +797,10 @@ function human_readable_bytes($bytes, $base10 = false,
$round = 0, $labels = arr
/**
* ls - lists a specified directory and returns an array of files
- * @param string $dir the path of the directory to list
- * @param bool $filter whether to filter out directories and illegal
filenames
- * @param string $regex filter filename based on this regex
- * @return array array of file names.
+ * @param string $dir the path of the directory to list
+ * @param bool $filter whether to filter out directories and
illegal filenames
+ * @param string|bool $regex filter filename based on this regex
+ * @return array array of file names.
*/
function &ls($dir, $filter = false, $regex = false) {
$out = array();
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 10c476c..a7dce82 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -862,7 +862,7 @@ function html_build_multiple_select_box($result, $name,
$checked_array, $size =
* @param array $vals
* @param array $texts Text to be displayed
* @param string $name id of the items selected
- * @param string $checked_array The item that should be checked
+ * @param array $checked_array The item that should be checked
* @param int $size The size of this box
* @param bool $show_100 Whether or not to show the '100 row'
* @param string $text_100 What to call the '100 row' defaults to
none.
@@ -924,7 +924,7 @@ function html_build_multiple_select_box_from_arrays($vals,
$texts, $name, $check
if ($withGroup && $vals[$i]!='100' &&
$optgroup[$i]!=$currentGroup) {
if ($currentGroup!='' && $groupOpen) {
$return .= html_ac(html_ap() - 1);
- $groupOpen = false;
+ $groupOpen = false; // @fixme see
$groupOpen below
}
$return .= html_ao('optgroup',
array('label'=>$optgroup[$i]));
$groupOpen = true;
@@ -969,6 +969,11 @@ function html_build_checkbox($name, $value, $checked,
$attrs = array()) {
* @param array $checked
* @param bool $checkall
* @param bool $show_100
+ * @param string $text_100
+ * @param bool $allowed
+ * @param array $attrs
+ * @param array $checkbox_attrs
+ * @param array $attrs_100
* @return string html code for checkbox control
*/
function html_build_checkboxes_from_array($vals, $check_name,
$checked=array(), $checkall=false, $show_100=true, $text_100='none',
$allowed=false, $attrs=array(), $checkbox_attrs=array(), $attrs_100=array()) {
diff --git a/src/www/survey/admin/show_results.php
b/src/www/survey/admin/show_results.php
index 06c3c4d..a0b758c 100644
--- a/src/www/survey/admin/show_results.php
+++ b/src/www/survey/admin/show_results.php
@@ -132,15 +132,18 @@ $sh->footer();
* showResult - Get Result from Survey and Question. Pass the result to Show
Result HTML class
*
* @param object $SurveyHTML a survey object
- * @param object $Question a question object
- * @param int whether print out export(csv) format
+ * @param object $Survey
+ * @param object $Question a question object
+ * @param int $show_comment whether print out export(csv) format
+ * @param string $q_num
+ * @param int $graph
*/
function showResult(&$SurveyHTML, &$Survey, &$Question, $show_comment=0,
$q_num="", $graph=0) {
/* Get results */
$srf = new SurveyResponseFactory($Survey, $Question);
if (!$srf || !is_object($srf)) {
echo $HTML->error_msg(_('Error'). ' ' . _('Cannot get Survey
Response Factory'));
- } elseif ( $srf->isError()) {
+ } elseif ($srf->isError()) {
echo $HTML->error_msg(_('Error'). $srf->getErrorMessage());
} else {
/* Show result in HTML*/
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 2 +-
src/common/forum/ForumMessageFactory.class.php | 2 +-
src/common/include/utils.php | 8 ++++----
src/www/include/html.php | 9 +++++++--
src/www/survey/admin/show_results.php | 9 ++++++---
5 files changed, 19 insertions(+), 11 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
