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 1260cb4b4c926b60ee00b1825daade99646aba6d (commit)
via 3fe9dd3d0818a80ed9e8436c01aae93f164f9c3c (commit)
via 3ea1eb9b601f44cae163ea51c19b853115157d49 (commit)
via 775a00cbbef799202b175776e260dc34ebdc4236 (commit)
via aae90ab08e0c70e9cc4f126eb8da3afb67a9f789 (commit)
via 8d721e5db24da876e5da2b6a4d0f545b92da9d7d (commit)
via ee691561dd9945f438ece9556387aa4b2d7d47b3 (commit)
via 5ae3e267d8445865a2622da942651b60fad5b506 (commit)
via 2e0e716bd1f689231cb125d97620b2369a0eb1b8 (commit)
via e44ce87d68dcd3f0dcc5ea2c8c91ed2d0b286b3d (commit)
via b0003eb2db2ff6c2310f643105aba4a4d4cfff64 (commit)
from d118657f591fa1bbba63c9ed65a1290c410a534d (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=1260cb4b4c926b60ee00b1825daade99646aba6d
commit 1260cb4b4c926b60ee00b1825daade99646aba6d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 19:01:40 2017 +0200
PHP Doc
diff --git a/src/common/valid/Valid.class.php b/src/common/valid/Valid.class.php
index c393f1a..735b46c 100644
--- a/src/common/valid/Valid.class.php
+++ b/src/common/valid/Valid.class.php
@@ -86,6 +86,7 @@ class Valid {
*
* ou can add a custom error message that will bypass the default one
that
* comes with the rule.
+ *
* @param Rule $rule Reference on rule.
* @param string|bool $message Error message.
*/
@@ -117,7 +118,7 @@ class Valid {
*
* Note: If no error, no message raised. The message is raised with
either
* 'warning' or 'error' level according to required();
- * @param String Error message
+ * @param string $msg Error message
*/
function setErrorMessage($msg) {
$this->globalErrorMessage = $msg;
@@ -136,7 +137,10 @@ class Valid {
/**
* Append feedback in the global Response object.
+ *
* @access private
+ * @param string $level
+ * @param string $error
*/
function addFeedback($level, $error) {
global $feedback, $error_msg, $warning_msg;
@@ -161,6 +165,7 @@ class Valid {
*
* Takes in account user requirement 'required' and
* 'disableFeedback'. Empty error messages are discarded.
+ *
* @access private
*/
function populateFeedback() {
@@ -186,6 +191,7 @@ class Valid {
*
* If the test succeeded, the error message is cleared (either custom or
* built-in messages).
+ *
* @access private
* @param int $i Index of the Rule that was applied.
* @param bool $result Result of the test.
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3fe9dd3d0818a80ed9e8436c01aae93f164f9c3c
commit 3fe9dd3d0818a80ed9e8436c01aae93f164f9c3c
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:58:10 2017 +0200
PHP Doc; use __construct
diff --git a/src/common/valid/Rule.class.php b/src/common/valid/Rule.class.php
index 95cee2b..954bf53 100644
--- a/src/common/valid/Rule.class.php
+++ b/src/common/valid/Rule.class.php
@@ -32,8 +32,8 @@ class Rule {
/**
* Check if $val is a valid not.
*
- * @param String $val Value to check.
- * @return Boolean
+ * @param string $val Value to check.
+ * @return bool
*/
function isValid($val) {
trigger_error(get_class($this).'::isValid() => Not yet
implemented', E_USER_ERROR);
@@ -43,7 +43,7 @@ class Rule {
* Default error message if rule is not apply on value.
*
* @param string $key Value to check.
- * @return boolean
+ * @return bool
*/
function getErrorMessage($key) {
return $this->error;
@@ -74,6 +74,7 @@ class Rule_Comparator extends Rule {
* @access private
*/
var $ref;
+
function __construct($ref) {
$this->ref = $ref;
}
@@ -152,8 +153,11 @@ class Rule_WhiteList extends Rule_Comparator {
class Rule_Int extends Rule {
/**
* Check the format according to PHP definition of a decimal integer.
+ *
* @see http://php.net/int
* @access private
+ * @param string $val
+ * @return bool
*/
function checkFormat($val) {
if(preg_match('/^([+-]?[1-9][0-9]*|[+-]?0)$/', $val)) {
@@ -213,7 +217,7 @@ class Rule_NoCr extends Rule {
class Rule_Email extends Rule {
var $separator;
- function Rule_Email($separator = null) {
+ function __construct($separator = null) {
$this->separator = $separator;
}
@@ -240,6 +244,9 @@ class Rule_Email extends Rule {
* email address.
*
* Spaces are allowed at the beginning and the end of the address.
+ *
+ * @param string $email
+ * @return int
*/
function validEmail($email) {
$valid_chars='-!#$%&\'*+0-9=?A-Z^_`a-z{|}~\.';
@@ -307,7 +314,7 @@ class Rule_File extends Rule {
var $maxSize;
var $i18nPageName;
- function Rule_File() {
+ function __construct() {
$this->maxSize = $GLOBALS['sys_max_size_upload'];
$this->i18nPageName = 'rule_valid';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3ea1eb9b601f44cae163ea51c19b853115157d49
commit 3ea1eb9b601f44cae163ea51c19b853115157d49
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:51:13 2017 +0200
PHP Doc
diff --git a/src/common/mail/MailingList.class.php
b/src/common/mail/MailingList.class.php
index 603dad9..8de7b2f 100644
--- a/src/common/mail/MailingList.class.php
+++ b/src/common/mail/MailingList.class.php
@@ -95,12 +95,12 @@ class MailingList extends FFError {
/**
* create - use this function to create a new entry in the database.
*
- * @param $listName
- * @param $description
- * @param string $isPublic
- * @param bool $creator_id
- * @param int $is_external Pass (1) if it
should be public (0) for private.
- * @return bool success.
+ * @param string $listName
+ * @param string $description
+ * @param string $isPublic
+ * @param bool $creator_id
+ * @param int $is_external Pass (1) if it should be
public (0) for private.
+ * @return bool success.
*/
function create($listName, $description, $isPublic =
MAIL__MAILING_LIST_IS_PUBLIC, $creator_id = false, $is_external = 0) {
//
@@ -235,11 +235,11 @@ class MailingList extends FFError {
/**
* update - use this function to update an entry in the database.
*
- * @param $description
- * @param string $isPublic
- * @param string $status The description of the mailing
list
- * @param int $is_external Pass (1) if it should be
public (0) for private
- * @return boolean success.
+ * @param string $description
+ * @param string $isPublic
+ * @param string $status The description of the mailing list
+ * @param int $is_external Pass (1) if it should be public
(0) for private
+ * @return bool success.
*/
function update($description, $isPublic = MAIL__MAILING_LIST_IS_PUBLIC,
$status = 'xyzzy', $is_external=0) {
if(! forge_check_perm('project_admin', $this->Group->getID())) {
@@ -331,7 +331,7 @@ class MailingList extends FFError {
/**
* getListAdmin - get the user who is the admin of this mailing list
*
- * @return User The admin user
+ * @return FFUser The admin user
*/
function getListAdmin() {
return user_get_object($this->dataArray['list_admin']);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=775a00cbbef799202b175776e260dc34ebdc4236
commit 775a00cbbef799202b175776e260dc34ebdc4236
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:42:59 2017 +0200
PHP Doc; use __construct
diff --git a/src/common/mail/Mail.class.php b/src/common/mail/Mail.class.php
index 8a25c63..ba40e0b 100644
--- a/src/common/mail/Mail.class.php
+++ b/src/common/mail/Mail.class.php
@@ -34,7 +34,7 @@ class Mail {
var $_mimeType;
var $_additionalHeaders;
- function Mail() {
+ function __construct() {
$charset = _('UTF-8');
if (!$charset) {
$charset = 'UTF-8';
@@ -79,14 +79,18 @@ class Mail {
}
/**
- * Function to encode a header if necessary
- * according to RFC2047
- * Filename.......: class.html.mime.mail.inc
- * Project........: HTML Mime mail class
- * Last Modified..: Date: 2002/07/24 13:14:10
- * CVS Revision...: Revision: 1.4
- * Copyright......: 2001, 2002 Richard Heyes
- */
+ * Function to encode a header if necessary
+ * according to RFC2047
+ * Filename.......: class.html.mime.mail.inc
+ * Project........: HTML Mime mail class
+ * Last Modified..: Date: 2002/07/24 13:14:10
+ * CVS Revision...: Revision: 1.4
+ * Copyright......: 2001, 2002 Richard Heyes
+ *
+ * @param string $input
+ * @param string $charset
+ * @return string
+ */
function _encodeHeader($input, $charset) {
preg_match_all('/(\s?\w*[\x80-\xFF]+\w*\s?)/', $input,
$matches);
foreach ($matches[1] as $value) {
@@ -257,9 +261,12 @@ class Mail {
}
/**
- * Perform effective email send.
- * @access protected
- */
+ * Perform effective email send.
+ *
+ * @access protected
+ * @param string $mail
+ * @return bool
+ */
function _sendmail($mail) {
$from = $this->getFrom();
$handle = popen(forge_get_config('sendmail_path')." -f'$from'
-t -i", 'w');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=aae90ab08e0c70e9cc4f126eb8da3afb67a9f789
commit aae90ab08e0c70e9cc4f126eb8da3afb67a9f789
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:36:41 2017 +0200
PHP Doc
diff --git a/src/common/mail/MailingListFactory.class.php
b/src/common/mail/MailingListFactory.class.php
index 86b5ee5..ec03c0b 100644
--- a/src/common/mail/MailingListFactory.class.php
+++ b/src/common/mail/MailingListFactory.class.php
@@ -44,6 +44,7 @@ class MailingListFactory extends FFError {
/**
* @param Group $Group The Group object to which these mailing
lists are associated.
+ * @param bool $skip_check
*/
function __construct(&$Group, $skip_check=false) {
parent::__construct();
@@ -76,7 +77,7 @@ class MailingListFactory extends FFError {
/**
* getMailingLists - get an array of MailingList objects for this Group.
*
- * @return array The array of MailingList objects.
+ * @return array|bool The array of MailingList objects.
*/
function getMailingLists() {
if (isset($this->mailingLists) &&
is_array($this->mailingLists)) {
diff --git a/src/common/pm/ProjectGroupFactory.class.php
b/src/common/pm/ProjectGroupFactory.class.php
index e7d52c1..601a9bc 100644
--- a/src/common/pm/ProjectGroupFactory.class.php
+++ b/src/common/pm/ProjectGroupFactory.class.php
@@ -44,7 +44,8 @@ class ProjectGroupFactory extends FFError {
/**
* @param Group $Group The Group object to which this
ProjectGroupFactory is associated.
- */
+ * @param bool $skip_check
+ */
function __construct(&$Group, $skip_check = false) {
parent::__construct();
if (!$Group || !is_object($Group)) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8d721e5db24da876e5da2b6a4d0f545b92da9d7d
commit 8d721e5db24da876e5da2b6a4d0f545b92da9d7d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:27:18 2017 +0200
PHP Doc
diff --git a/src/common/frs/FRSRelease.class.php
b/src/common/frs/FRSRelease.class.php
index 968301b..525c8e7 100644
--- a/src/common/frs/FRSRelease.class.php
+++ b/src/common/frs/FRSRelease.class.php
@@ -48,8 +48,8 @@ function get_frs_releases($package) {
* Factory method which creates a FRSRelease from an release id
*
* @param int $release_id The release id
- * @param array $data The result array, if it's passed in
- * @return object FRSRelease object
+ * @param array $data The result array, if it's passed in
+ * @return object|bool FRSRelease object
*/
function frsrelease_get_object($release_id, $data = array()) {
global $FRSRELEASE_OBJ;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ee691561dd9945f438ece9556387aa4b2d7d47b3
commit ee691561dd9945f438ece9556387aa4b2d7d47b3
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:21:35 2017 +0200
PHP Doc
diff --git a/src/common/forum/ForumFactory.class.php
b/src/common/forum/ForumFactory.class.php
index 28eeeeb..373ea36 100644
--- a/src/common/forum/ForumFactory.class.php
+++ b/src/common/forum/ForumFactory.class.php
@@ -42,7 +42,8 @@ class ForumFactory extends FFError {
var $forums;
/**
- * @param object $Group The Group object to which this forum is
associated.
+ * @param object $Group The Group object to which this forum is
associated.
+ * @param bool $skip_check
*/
function __construct(&$Group, $skip_check=false) {
parent::__construct();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5ae3e267d8445865a2622da942651b60fad5b506
commit 5ae3e267d8445865a2622da942651b60fad5b506
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:18:21 2017 +0200
PHP Doc
diff --git a/src/common/forum/AttachManager.class.php
b/src/common/forum/AttachManager.class.php
index 2b7e42f..4811840 100644
--- a/src/common/forum/AttachManager.class.php
+++ b/src/common/forum/AttachManager.class.php
@@ -58,6 +58,8 @@ class AttachManager extends FFError {
* Function SetForumMsg
*
* Sets the forum message associated with the attachment
+ *
+ * @param $ForumMsg
*/
function SetForumMsg(&$ForumMsg) {
$this->ForumMsg =& $ForumMsg;
@@ -67,6 +69,9 @@ class AttachManager extends FFError {
* Function GetAttachId
*
* Returns the attach id for the message id passed as a parameter or
false if error
+ *
+ * @param int $msg_id
+ * @return bool|mixed
*/
function GetAttachId($msg_id) {
$res = db_query_params ('SELECT attachmentid FROM
forum_attachment WHERE msg_id=$1',
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2e0e716bd1f689231cb125d97620b2369a0eb1b8
commit 2e0e716bd1f689231cb125d97620b2369a0eb1b8
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:04:28 2017 +0200
PHP Doc
diff --git a/src/common/forum/Forum.class.php b/src/common/forum/Forum.class.php
index 847a817..bb5cabd 100644
--- a/src/common/forum/Forum.class.php
+++ b/src/common/forum/Forum.class.php
@@ -97,6 +97,7 @@ class Forum extends FFError {
* @param $Group
* @param bool $group_forum_id
* @param bool $arr
+ * @param bool $is_news
*/
function __construct(&$Group, $group_forum_id = false, $arr = false,
$is_news = false) {
parent::__construct();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e44ce87d68dcd3f0dcc5ea2c8c91ed2d0b286b3d
commit e44ce87d68dcd3f0dcc5ea2c8c91ed2d0b286b3d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:03:34 2017 +0200
PHP Doc
diff --git a/src/common/docman/include/utils.php
b/src/common/docman/include/utils.php
index 9e5184a..0ff98a2 100644
--- a/src/common/docman/include/utils.php
+++ b/src/common/docman/include/utils.php
@@ -30,6 +30,13 @@
* tooling library
*/
+/**
+ * doc_get_state_box
+ *
+ * @param string $checkedval
+ * @param array $removedval
+ */
+
function doc_get_state_box($checkedval = 'xzxz', $removedval = array()) {
if (count($removedval)) {
//TODO: find an easier way to get != ANY($1)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b0003eb2db2ff6c2310f643105aba4a4d4cfff64
commit b0003eb2db2ff6c2310f643105aba4a4d4cfff64
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri May 5 18:01:35 2017 +0200
CHANGES: use HTML 5 <header>, <main> and <footer> tags in Funky theme
(Nokia)
diff --git a/src/CHANGES b/src/CHANGES
index 8bd4bb7..29a7a52 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,5 @@
FusionForge 6.X:
-* HTML 5 Doctype (Nokia)
+* HTML 5 Doctype; use HTML 5 <header>, <main> and <footer> tags in Funky theme
(Nokia)
* Accounts: minimum password length is now 8 (Sylvain Beucler)
* Accounts: add minimal constraints to password (upper-case, lower-case,
non-alphanumeric check) [#826] (Inria)
* Core System: support object association n-n, bidirectional (Artifact,
Document, FRSRelease) (TrivialDev)
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 +-
src/common/docman/include/utils.php | 7 +++++++
src/common/forum/AttachManager.class.php | 5 +++++
src/common/forum/Forum.class.php | 1 +
src/common/forum/ForumFactory.class.php | 3 ++-
src/common/frs/FRSRelease.class.php | 4 ++--
src/common/mail/Mail.class.php | 31 +++++++++++++++++-----------
src/common/mail/MailingList.class.php | 24 ++++++++++-----------
src/common/mail/MailingListFactory.class.php | 3 ++-
src/common/pm/ProjectGroupFactory.class.php | 3 ++-
src/common/valid/Rule.class.php | 17 ++++++++++-----
src/common/valid/Valid.class.php | 8 ++++++-
12 files changed, 72 insertions(+), 36 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
