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 83c7648c427185bf88a664cddca476a3bb48f2da (commit)
via 5ff0b0f737f045e792b62b3054df8a683f5e69f4 (commit)
via 26aa1f59a1f3fd46507b380f15412f1b9da45ab1 (commit)
via fe434eff649425e3ddc7363cba288de99eca4bdd (commit)
via fe55cd762fb5158f8ba8623e2251c52ac388ac2f (commit)
from 1ac177618f3eb036ff3381a8f9f38a6ce0c7efc1 (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=83c7648c427185bf88a664cddca476a3bb48f2da
commit 83c7648c427185bf88a664cddca476a3bb48f2da
Author: Franck Villaume <[email protected]>
Date: Fri Jul 14 18:11:44 2017 +0200
space & tabs
diff --git a/src/common/search/ExportProjectSearchQuery.class.php
b/src/common/search/ExportProjectSearchQuery.class.php
index 95d30b4..4e006c8 100644
--- a/src/common/search/ExportProjectSearchQuery.class.php
+++ b/src/common/search/ExportProjectSearchQuery.class.php
@@ -62,7 +62,7 @@ class ExportProjectSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm ('project_read', $row['group_id']);
+ return forge_check_perm('project_read', $row['group_id']);
}
}
diff --git a/src/common/search/ForumSearchQuery.class.php
b/src/common/search/ForumSearchQuery.class.php
index 311dcad..dc6a6b0 100644
--- a/src/common/search/ForumSearchQuery.class.php
+++ b/src/common/search/ForumSearchQuery.class.php
@@ -75,9 +75,7 @@ class ForumSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm('forum',
-
$row['group_forum_id'],
- 'read');
+ return forge_check_perm('forum', $row['group_forum_id'],
'read');
}
}
diff --git a/src/common/search/ForumsSearchQuery.class.php
b/src/common/search/ForumsSearchQuery.class.php
index 2599bd7..92b3611 100644
--- a/src/common/search/ForumsSearchQuery.class.php
+++ b/src/common/search/ForumsSearchQuery.class.php
@@ -50,7 +50,7 @@ class ForumsSearchQuery extends SearchQuery {
* @param string $sections sections to search in
* @param bool $showNonPublic flag if private sections are
searched too
*/
- function __construct($words, $offset, $isExact, $groupId,
$sections=SEARCH__ALL_SECTIONS, $showNonPublic=false) {
+ function __construct($words, $offset, $isExact, $groupId, $sections =
SEARCH__ALL_SECTIONS, $showNonPublic = false) {
$this->groupId = $groupId;
$this->showNonPublic = $showNonPublic;
@@ -101,7 +101,7 @@ class ForumsSearchQuery extends SearchQuery {
* @param boolean $showNonPublic if we should consider non
public sections
* @return array
*/
- static function getSections($groupId, $showNonPublic=false) {
+ static function getSections($groupId, $showNonPublic = false) {
$sql = 'SELECT group_forum_id, forum_name FROM forum_group_list
WHERE group_id = $1 AND ';
$sql .= 'group_forum_id NOT IN (SELECT forum_id FROM
news_bytes) ORDER BY forum_name';
@@ -117,9 +117,7 @@ class ForumsSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm('forum',
-
$row['group_forum_id'],
- 'read');
+ return forge_check_perm('forum', $row['group_forum_id'],
'read');
}
}
diff --git a/src/common/search/NewsSearchQuery.class.php
b/src/common/search/NewsSearchQuery.class.php
index 98c8c3a..11b8b13 100644
--- a/src/common/search/NewsSearchQuery.class.php
+++ b/src/common/search/NewsSearchQuery.class.php
@@ -90,9 +90,7 @@ class NewsSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm('forum',
-
$row['forum_id'],
- 'read');
+ return forge_check_perm('forum', $row['forum_id'], 'read');
}
}
diff --git a/src/common/search/TasksSearchQuery.class.php
b/src/common/search/TasksSearchQuery.class.php
index 99a9d89..f4fa305 100644
--- a/src/common/search/TasksSearchQuery.class.php
+++ b/src/common/search/TasksSearchQuery.class.php
@@ -49,7 +49,7 @@ class TasksSearchQuery extends SearchQuery {
* @param string $sections sections to search in
* @param bool $showNonPublic flag if private sections are
searched too
*/
- function __construct($words, $offset, $isExact, $groupId,
$sections=SEARCH__ALL_SECTIONS, $showNonPublic=false) {
+ function __construct($words, $offset, $isExact, $groupId, $sections =
SEARCH__ALL_SECTIONS, $showNonPublic = false) {
$this->groupId = $groupId;
$this->showNonPublic = $showNonPublic;
@@ -118,9 +118,7 @@ class TasksSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm('pm',
-
$row['group_project_id'],
- 'read');
+ return forge_check_perm('pm', $row['group_project_id'], 'read');
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5ff0b0f737f045e792b62b3054df8a683f5e69f4
commit 5ff0b0f737f045e792b62b3054df8a683f5e69f4
Author: Franck Villaume <[email protected]>
Date: Fri Jul 14 18:11:07 2017 +0200
wrong test. check against frs not project
diff --git a/src/common/search/FrsSearchQuery.class.php
b/src/common/search/FrsSearchQuery.class.php
index 9d2eeba..af9eebd 100644
--- a/src/common/search/FrsSearchQuery.class.php
+++ b/src/common/search/FrsSearchQuery.class.php
@@ -49,7 +49,7 @@ class FrsSearchQuery extends SearchQuery {
* @param string $sections sections to search in
* @param bool $showNonPublic
*/
- function __construct($words, $offset, $isExact, $groupId,
$sections=SEARCH__ALL_SECTIONS, $showNonPublic=false) {
+ function __construct($words, $offset, $isExact, $groupId, $sections =
SEARCH__ALL_SECTIONS, $showNonPublic = false) {
$this->groupId = $groupId;
$this->showNonPublic = $showNonPublic;
@@ -64,7 +64,7 @@ class FrsSearchQuery extends SearchQuery {
* @return array query+params array
*/
function getQuery() {
- $qpa = db_construct_qpa(false, 'SELECT
ts_headline(frs_package.name, q) AS package_name, ts_headline(frs_release.name,
q) as release_name, frs_release.release_date, frs_release.release_id,
users.realname FROM frs_file, frs_release, users, frs_package, to_tsquery($1)
AS q, frs_release_idx r, frs_file_idx f WHERE frs_release.released_by =
users.user_id AND r.release_id = frs_release.release_id AND f.file_id =
frs_file.file_id AND frs_package.package_id = frs_release.package_id AND
frs_file.release_id=frs_release.release_id AND frs_package.group_id=$2 ',
+ $qpa = db_construct_qpa(false, 'SELECT
ts_headline(frs_package.name, q) AS package_name, ts_headline(frs_release.name,
q) as release_name, frs_release.release_date, frs_release.release_id,
users.realname, frs_release.package_id FROM frs_file, frs_release, users,
frs_package, to_tsquery($1) AS q, frs_release_idx r, frs_file_idx f WHERE
frs_release.released_by = users.user_id AND r.release_id =
frs_release.release_id AND f.file_id = frs_file.file_id AND
frs_package.package_id = frs_release.package_id AND
frs_file.release_id=frs_release.release_id AND frs_package.group_id=$2 ',
array($this->getFTIwords(),
$this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
$qpa = db_construct_qpa($qpa, 'AND
frs_package.package_id = ANY ($1) ',
@@ -115,7 +115,7 @@ class FrsSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm ('project_read', $row['group_id']);
+ return forge_check_perm('frs', $row['package_id'], 'read');
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=26aa1f59a1f3fd46507b380f15412f1b9da45ab1
commit 26aa1f59a1f3fd46507b380f15412f1b9da45ab1
Author: Franck Villaume <[email protected]>
Date: Fri Jul 14 16:58:05 2017 +0200
remove unused var
diff --git
a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
index 6c92a92..86ea414 100644
--- a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
+++ b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
@@ -22,8 +22,6 @@ require_once $gfcommon.'include/Activity.class.php';
class Widget_HomeDetailActivityMostActiveProjectWeek extends Widget {
- var $cached_perms = array();
-
function __construct() {
parent::__construct('homedetailactivitymostactiveprojectweek');
if (forge_get_config('use_activity')) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=fe434eff649425e3ddc7363cba288de99eca4bdd
commit fe434eff649425e3ddc7363cba288de99eca4bdd
Author: Franck Villaume <[email protected]>
Date: Fri Jul 14 16:52:02 2017 +0200
missing description
diff --git a/src/common/widget/Widget_HomeLatestNews.class.php
b/src/common/widget/Widget_HomeLatestNews.class.php
index 312cc8b..74dc8bc 100644
--- a/src/common/widget/Widget_HomeLatestNews.class.php
+++ b/src/common/widget/Widget_HomeLatestNews.class.php
@@ -29,4 +29,8 @@ class Widget_HomeLatestNews extends Widget {
function getContent() {
return news_show_latest(forge_get_config('news_group'), 5,
true, false, false, 5);
}
+
+ function getDescription() {
+ return _('Display last 5 validated news for frontpage.');
+ }
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=fe55cd762fb5158f8ba8623e2251c52ac388ac2f
commit fe55cd762fb5158f8ba8623e2251c52ac388ac2f
Author: Franck Villaume <[email protected]>
Date: Fri Jul 14 16:51:48 2017 +0200
space
diff --git a/src/www/news/news_utils.php b/src/www/news/news_utils.php
index d05860b..523858f 100644
--- a/src/www/news/news_utils.php
+++ b/src/www/news/news_utils.php
@@ -86,7 +86,7 @@ function news_footer($params = array()) {
* @param bool $show_forum
* @return string
*/
-function
news_show_latest($group_id=0,$limit=10,$show_summaries=true,$allow_submit=true,$flat=false,$tail_headlines=0,$show_forum=true)
{
+function news_show_latest($group_id = 0, $limit = 10, $show_summaries = true,
$allow_submit = true, $flat = false, $tail_headlines = 0, $show_forum = true) {
if (!$group_id) {
$group_id=forge_get_config('news_group');
-----------------------------------------------------------------------
Summary of changes:
src/common/search/ExportProjectSearchQuery.class.php | 2 +-
src/common/search/ForumSearchQuery.class.php | 4 +---
src/common/search/ForumsSearchQuery.class.php | 8 +++-----
src/common/search/FrsSearchQuery.class.php | 6 +++---
src/common/search/NewsSearchQuery.class.php | 4 +---
src/common/search/TasksSearchQuery.class.php | 6 ++----
.../Widget_HomeDetailActivityMostActiveProjectWeek.class.php | 2 --
src/common/widget/Widget_HomeLatestNews.class.php | 4 ++++
src/www/news/news_utils.php | 2 +-
9 files changed, 16 insertions(+), 22 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
