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 f9f96d15d79af1d67880e570c6ce7fa7e9f2d82e (commit)
from 12514f1450e02c1e5cb2f58c27237ec7c75fd429 (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=f9f96d15d79af1d67880e570c6ce7fa7e9f2d82e
commit f9f96d15d79af1d67880e570c6ce7fa7e9f2d82e
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu Apr 22 20:34:49 2021 +0200
clean-up. use global var project
diff --git a/src/common/widget/Widget_ProjectDescription.class.php
b/src/common/widget/Widget_ProjectDescription.class.php
index 3320fef..32f84f7 100644
--- a/src/common/widget/Widget_ProjectDescription.class.php
+++ b/src/common/widget/Widget_ProjectDescription.class.php
@@ -36,12 +36,8 @@ class Widget_ProjectDescription extends Widget {
}
public function getContent() {
- global $HTML;
+ global $HTML, $project;
$result = '';
- $group_id = getIntFromRequest('group_id');
- $pm = ProjectManager::instance();
- $project = $pm->getProject($group_id);
-
$pluginManager = plugin_manager_get_object();
if (! $pluginManager->PluginIsInstalled('blocks') ||
!plugin_hook ("blocks", 'summary_description')) {
$project_description = $project->getDescription();
diff --git a/src/common/widget/Widget_ProjectDocumentsActivity.class.php
b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
index 33d0a8b..c067308 100644
--- a/src/common/widget/Widget_ProjectDocumentsActivity.class.php
+++ b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
@@ -26,9 +26,12 @@ require_once 'Widget.class.php';
*/
class Widget_ProjectDocumentsActivity extends Widget {
+
var $content;
var $_statistic_show = 'FUD';
+
function __construct() {
+ global $project;
parent::__construct('projectdocumentsactivity');
if (session_loggedin()) {
$userPrefValue =
UserManager::instance()->getCurrentUser()->getPreference('my_docman_project_activitity_show');
@@ -36,8 +39,6 @@ class Widget_ProjectDocumentsActivity extends Widget {
$this->_statistic_show = $userPrefValue;
}
}
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project) &&
forge_check_perm('docman', $project->getID(), 'read')) {
$this->content['title'] = _('Last 4 weeks Documents
Manager Activity');
}
@@ -94,14 +95,12 @@ class Widget_ProjectDocumentsActivity extends Widget {
function getContent() {
require_once
$GLOBALS['gfcommon'].'docman/DocumentManager.class.php';
- $result = '';
- global $HTML;
+ global $HTML, $project;
html_use_jqueryjqplotpluginBar();
+ $result = '';
$result .= $HTML->getJavascripts();
$result .= $HTML->getStylesheets();
- $group_id = getIntFromRequest('group_id');
- $group = group_get_object($group_id);
- $dm = new DocumentManager($group);
+ $dm = new DocumentManager($project);
$begin1 = strtotime('monday this week');
$end1 = time();
$begin2 = strtotime('-1 week', $begin1);
@@ -230,7 +229,7 @@ class Widget_ProjectDocumentsActivity extends Widget {
} else {
$result .= $HTML->warning_msg(_('No activity to
display.'));
}
- $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/docman/?group_id='.$group_id, _('Browse Documents Manager')));
+ $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/docman/?group_id='.$project->getID(), _('Browse Documents
Manager')));
return $result;
}
diff --git a/src/common/widget/Widget_ProjectInfo.class.php
b/src/common/widget/Widget_ProjectInfo.class.php
index 27018c8..845fa21 100644
--- a/src/common/widget/Widget_ProjectInfo.class.php
+++ b/src/common/widget/Widget_ProjectInfo.class.php
@@ -33,21 +33,17 @@ class Widget_ProjectInfo extends Widget {
}
public function getContent() {
- global $HTML;
+ global $HTML, $project;
$result = '';
- $group_id = getIntFromRequest('group_id');
- $pm = ProjectManager::instance();
- $project = $pm->getProject($group_id);
// Tag list
if (forge_get_config('use_project_tags')) {
- $list_tag = list_project_tag($group_id);
+ $list_tag = list_project_tag($project->getID());
$result .= html_ao('p').$HTML->getTagPic().' ';
if ($list_tag) {
$result .= _('Tags')._(': '). $list_tag;
} else {
- $project = group_get_object($group_id);
if (forge_check_perm ('project_admin',
$project->getID())) {
- $result .=
util_make_link('/project/admin/?group_id='.$group_id, _('No tag defined for
this project'));
+ $result .=
util_make_link('/project/admin/?group_id='.$project->getID(), _('No tag defined
for this project'));
}
else {
$result .= html_e('span', array(),
_('No tag defined for this project'), false);
@@ -58,7 +54,7 @@ class Widget_ProjectInfo extends Widget {
if(forge_get_config('use_trove')) {
$result .= html_e('br');
- $result .=
stripslashes(trove_getcatlisting($group_id,0,1,1))."\n";
+ $result .=
stripslashes(trove_getcatlisting($project->getID(),0,1,1))."\n";
}
// registration date
@@ -70,7 +66,7 @@ class Widget_ProjectInfo extends Widget {
// CB hide stats if desired
if ($project->usesStats()) {
$actv = db_query_params ('SELECT ranking FROM
project_weekly_metric WHERE group_id=$1',
- array($group_id));
+ array($project->getID()));
if (db_numrows($actv) > 0){
$actv_res = db_result($actv,0,"ranking");
} else {
@@ -80,11 +76,11 @@ class Widget_ProjectInfo extends Widget {
$actv_res=0;
}
$result .= html_e('br').sprintf (_('Activity Ranking:
<strong>%d</strong>'), $actv_res)."\n";
- $result .= html_e('br')._('View project').'
'.util_make_link('/project/stats/?group_id='.$group_id, _('Statistics'));
+ $result .= html_e('br')._('View project').'
'.util_make_link('/project/stats/?group_id='.$project->getID(),
_('Statistics'));
if ( ($project->usesTracker() &&
forge_get_config('use_tracker')) || ($project->usesPM() &&
forge_get_config('use_pm')) ) {
- $result .= sprintf(_(' or <a
href="%s">Activity</a>'),util_make_uri('/project/report/?group_id='.$group_id))."\n";
+ $result .= sprintf(_(' or <a
href="%s">Activity</a>'),util_make_uri('/project/report/?group_id='.$project->getID()))."\n";
}
- $result .= html_e('br').sprintf(_('View list of <a
href="%s">RSS feeds</a> available for this project.'),
util_make_uri('/export/rss_project.php?group_id='.$group_id)). ' ' .
html_image('ic/rss.png',16,16,array());
+ $result .= html_e('br').sprintf(_('View list of <a
href="%s">RSS feeds</a> available for this project.'),
util_make_uri('/export/rss_project.php?group_id='.$project->getID())). ' ' .
html_image('ic/rss.png',16,16,array());
}
if(forge_get_config('use_people')) {
@@ -94,7 +90,7 @@ class Widget_ProjectInfo extends Widget {
AND people_job.status_id=1
AND group_id=$1
GROUP BY name',
- array ($group_id),
+ array ($project->getID()),
2);
if ($jobs_res) {
$num=db_numrows($jobs_res);
@@ -104,7 +100,7 @@ class Widget_ProjectInfo extends Widget {
ngettext('HELP WANTED:
This project is looking for a <a href="%1$s">"%2$s"</a>.',
'HELP WANTED:
This project is looking for people to fill <a href="%1$s">several different
positions</a>.',
$num),
-
util_make_uri('/people/?group_id='.$group_id),
+
util_make_uri('/people/?group_id='.$project->getID()),
db_result($jobs_res,0,"name"));
$result .= "</p>\n";
//$result .= '<div
rel="fusionforge:has_job" typeof="fusionforge:Job"
xmlns:fusionforge="http://fusionforge.org/fusionforge#";>';
@@ -128,15 +124,15 @@ class Widget_ProjectInfo extends Widget {
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- $content .=
util_make_link('/project/?group_id='.$group_id.'&action='.$key,
html_image('ic/'.$key.'.png', 16, 16), array('id' => 'group-vote', 'alt' =>
$txt));
+ $content .=
util_make_link('/project/?group_id='.$project->getID().'&action='.$key,
html_image('ic/'.$key.'.png', 16, 16), array('id' => 'group-vote', 'alt' =>
$txt));
}
$result .= $content;
}
$hook_params = array();
- $hook_params['group_id'] = $group_id;
+ $hook_params['group_id'] = $project->getID();
plugin_hook("project_after_description",$hook_params);
- plugin_hook('hierarchy_views', array($group_id, 'home'));
+ plugin_hook('hierarchy_views', array($project->getID(),
'home'));
return $result;
}
diff --git a/src/common/widget/Widget_ProjectLatestArtifacts.class.php
b/src/common/widget/Widget_ProjectLatestArtifacts.class.php
index a72d322..ec23e7f 100644
--- a/src/common/widget/Widget_ProjectLatestArtifacts.class.php
+++ b/src/common/widget/Widget_ProjectLatestArtifacts.class.php
@@ -28,9 +28,8 @@ class Widget_ProjectLatestArtifacts extends Widget {
const NB_ARTIFACTS_TO_DISPLAY = 5;
public function __construct() {
+ global $project;
parent::__construct('projectlatestartifacts');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project)) {
$atf = new ArtifactTypeFactory($project);
$ats = $atf->getArtifactTypes();
@@ -50,10 +49,8 @@ class Widget_ProjectLatestArtifacts extends Widget {
}
public function getContent() {
- global $HTML;
+ global $HTML, $project;
$html = '';
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
$atf = new ArtifactTypeFactory($project);
$artifacts = array();
$ats = $atf->getArtifactTypes();
diff --git a/src/common/widget/Widget_ProjectLatestCommits.class.php
b/src/common/widget/Widget_ProjectLatestCommits.class.php
index 232159f..2b50940 100644
--- a/src/common/widget/Widget_ProjectLatestCommits.class.php
+++ b/src/common/widget/Widget_ProjectLatestCommits.class.php
@@ -28,9 +28,8 @@ class Widget_ProjectLatestCommits extends Widget {
const NB_COMMITS_TO_DISPLAY = 5;
public function __construct() {
+ global $project;
parent::__construct('projectlatestcommits');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project) &&
forge_check_perm('scm', $project->getID(), 'read')) {
$this->content['title'] = _('5 Latest Commits');
}
@@ -52,10 +51,8 @@ class Widget_ProjectLatestCommits extends Widget {
}
public function getContent() {
- global $HTML;
+ global $HTML, $project;
$html = '';
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
$revisions = array();
if ($project->usesPlugin('scmsvn') && forge_check_perm('scm',
$project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmsvn');
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php
b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index 0b8aa22..ca0e58f 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -31,9 +31,8 @@ require_once $gfcommon.'docman/DocumentFactory.class.php';
class Widget_ProjectLatestDocuments extends Widget {
var $content;
function __construct() {
+ global $project;
parent::__construct('projectlatestdocuments');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project) &&
forge_check_perm('docman', $project->getID(), 'read')) {
$this->content['title'] = _('5 Latest Published
Documents');
}
@@ -44,20 +43,19 @@ class Widget_ProjectLatestDocuments extends Widget {
}
function getContent() {
- global $HTML;
- $group_id = getIntFromRequest('group_id');
+ global $HTML, $project;
$result = '';
$qpa = db_construct_qpa();
$qpa = db_construct_qpa($qpa, 'SELECT docid FROM doc_data,
doc_groups WHERE doc_data.group_id = $1',
- array($group_id));
+ array($project->getID()));
$stateIdDg = 1;
$stateIdDocuments = array(1);
- if (forge_check_perm('docman', $group_id, 'approve')) {
+ if (forge_check_perm('docman', $project->getID(), 'approve')) {
$stateIdDg = 5;
$stateIdDocuments = array(1, 2, 3, 4, 5);
}
- $df = new DocumentFactory(group_get_object($group_id));
+ $df = new DocumentFactory(group_get_object($project->getID()));
$df->setDocGroupState($stateIdDg);
$df->setStateID($stateIdDocuments);
$df->setLimit(5);
@@ -91,14 +89,14 @@ class Widget_ProjectLatestDocuments extends Widget {
$filetype = $doc->getFileType();
$docid = $doc->getID();
$docgroup = $doc->getDocGroupID();
- $ndg =
documentgroup_get_object($docgroup, $group_id);
+ $ndg =
documentgroup_get_object($docgroup, $project->getID());
switch ($filetype) {
case "URL": {
$docurl =
util_make_link($filename, html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())), array(), true);
break;
}
default: {
- $docurl =
util_make_link('/docman/view.php/'.$group_id.'/'.$docid,
html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())));
+ $docurl =
util_make_link('/docman/view.php/'.$project->getID().'/'.$docid,
html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())));
}
}
$cells = array();
@@ -121,9 +119,9 @@ class Widget_ProjectLatestDocuments extends Widget {
$titleMonitor =
_('Start monitoring this document');
$image =
$HTML->getStartMonitoringPic($titleMonitor, $titleMonitor);
}
- $action .=
util_make_link('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$docgroup.'&action=monitorfile&option='.$option.'&fileid='.$doc->getID(),
$image, array('title' => $titleMonitor));
- if
(forge_check_perm('docman', $group_id, 'approve') && !$doc->getLocked()) {
- $action .=
util_make_link('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$docgroup.'&action=trashfile&fileid='.$doc->getID(),
$HTML->getDeletePic('', _('Move this document to trash')), array('title' =>
_('Move this document to trash')));
+ $action .=
util_make_link('/docman/?group_id='.$project->getID().'&view=listfile&dirid='.$docgroup.'&action=monitorfile&option='.$option.'&fileid='.$doc->getID(),
$image, array('title' => $titleMonitor));
+ if
(forge_check_perm('docman', $project->getID(), 'approve') &&
!$doc->getLocked()) {
+ $action .=
util_make_link('/docman/?group_id='.$project->getID().'&view=listfile&dirid='.$docgroup.'&action=trashfile&fileid='.$doc->getID(),
$HTML->getDeletePic('', _('Move this document to trash')), array('title' =>
_('Move this document to trash')));
$action .=
util_make_link($doc->getPermalink(), $HTML->getEditFilePic(_('Edit this
document')), array('title' => _('Edit this document')));
}
}
@@ -134,7 +132,7 @@ class Widget_ProjectLatestDocuments extends Widget {
}
$result .= $HTML->listTableBottom();
}
- $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/docman/?group_id='.$group_id, _('Browse Documents Manager')));
+ $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/docman/?group_id='.$project->getID(), _('Browse Documents
Manager')));
return $result;
}
diff --git a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
index b23dbb7..612e6ab 100644
--- a/src/common/widget/Widget_ProjectLatestFileReleases.class.php
+++ b/src/common/widget/Widget_ProjectLatestFileReleases.class.php
@@ -29,9 +29,8 @@ require_once $gfcommon.'frs/FRSReleaseFactory.class.php';
class Widget_ProjectLatestFileReleases extends Widget {
var $content;
function __construct() {
+ global $project;
parent::__construct('projectlatestfilereleases');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project) &&
forge_check_perm('frs_admin', $project->getID(), 'read')) {
$this->content['title'] = _('Latest File Releases');
}
@@ -42,11 +41,8 @@ class Widget_ProjectLatestFileReleases extends Widget {
}
function getContent() {
- global $HTML;
+ global $HTML, $project;
$result = '';
- $pm = ProjectManager::instance();
- $group_id = getIntFromRequest('group_id');
- $project = $pm->getProject($group_id);
$frsrf = new FRSReleaseFactory($project);
$frsrnrs = $frsrf->getFRSRNewReleases(true);
@@ -87,12 +83,12 @@ class Widget_ProjectLatestFileReleases extends Widget {
// -> notes
// accessibility: image is a link, so alt must
be unique in page => construct a unique alt
$tmp_alt = $package_name . " - " . _('Release
Notes');
- $link = '/frs/?group_id=' . $group_id .
'&view=shownotes&release_id='.$frsrnr->getID();
+ $link = '/frs/?group_id=' . $project->getID() .
'&view=shownotes&release_id='.$frsrnr->getID();
$link_content =
$HTML->getReleaseNotesPic($tmp_alt, $tmp_alt);
$cells[][] = util_make_link($link,
$link_content);
// -> monitor
if (session_loggedin()) {
- $url =
'/frs/?group_id='.$group_id.'&package_id='.$frsrnr->FRSPackage->getID().'&action=monitor';
+ $url =
'/frs/?group_id='.$project->getID().'&package_id='.$frsrnr->FRSPackage->getID().'&action=monitor';
if($frsrnr->FRSPackage->isMonitoring())
{
$title = $package_name . " - "
. _('Stop monitoring this package');
$url .= '&status=0';
@@ -108,13 +104,13 @@ class Widget_ProjectLatestFileReleases extends Widget {
$tmp_alt = $package_name." ".$package_release."
- ". _('Download');
$link_content = $HTML->getDownloadPic($tmp_alt,
$tmp_alt);
$t_link_anchor =
$HTML->toSlug($package_name)."-".$HTML->toSlug($package_release)."-title-content";
- $link = '/frs/?group_id=' . $group_id .
'&release_id='.$frsrnr->getID()."#".$t_link_anchor;
+ $link = '/frs/?group_id=' . $project->getID() .
'&release_id='.$frsrnr->getID()."#".$t_link_anchor;
$cells[][] = util_make_link($link,
$link_content);
$result .= $HTML->multiTableRow(array(),
$cells);
}
$result .= $HTML->listTableBottom();
}
- $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/frs/?group_id='.$group_id, _('View All Project Files')));
+ $result .= html_e('div', array('class' => 'underline-link'),
util_make_link('/frs/?group_id='.$project->getID(), _('View All Project
Files')));
return $result;
}
diff --git a/src/common/widget/Widget_ProjectLatestNews.class.php
b/src/common/widget/Widget_ProjectLatestNews.class.php
index 0e28d61..1a86c31 100644
--- a/src/common/widget/Widget_ProjectLatestNews.class.php
+++ b/src/common/widget/Widget_ProjectLatestNews.class.php
@@ -28,10 +28,8 @@ class Widget_ProjectLatestNews extends Widget {
var $content;
function __construct() {
- global $gfwww;
+ global $project;
parent::__construct('projectlatestnews');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project)) {
require_once 'www/news/news_utils.php';
$this->content = news_show_latest($project->getID(),
10, false);
diff --git a/src/common/widget/Widget_ProjectMembers.class.php
b/src/common/widget/Widget_ProjectMembers.class.php
index 4f4f2c9..a38fa39 100644
--- a/src/common/widget/Widget_ProjectMembers.class.php
+++ b/src/common/widget/Widget_ProjectMembers.class.php
@@ -35,12 +35,9 @@ class Widget_ProjectMembers extends Widget {
}
public function getContent() {
+ global $project;
$result = '';
- $group_id = getIntFromRequest('group_id');
- $pm = ProjectManager::instance();
- $project = $pm->getProject($group_id);
-
$admins = $project->getAdmins();
$members = $project->getUsers();
$seen = array();
@@ -144,14 +141,14 @@ class Widget_ProjectMembers extends Widget {
$result .= '<p><span rel="sioc:has_usergroup">';
$result .= '<span about="members/" typeof="sioc:UserGroup">';
$result .= '<span rel="http://www.w3.org/2002/07/owl#sameAs";>';
- $result .=
util_make_link('/project/memberlist.php?group_id='.$group_id,sprintf(_('View
the %d Member(s)'),count($members)));
+ $result .=
util_make_link('/project/memberlist.php?group_id='.$project->getID(),sprintf(_('View
the %d Member(s)'),count($members)));
$result .= '</span>';
$result .= '</span>';
$result .= '</span></p>';
// end of project usergroup description
if (!$iam_member) {
- $result .=
'<p>'.util_make_link('/project/request.php?group_id='.$group_id,_('Request to
join')).'</p>';
+ $result .=
'<p>'.util_make_link('/project/request.php?group_id='.$project->getID(),_('Request
to join')).'</p>';
}
return $result;
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php
b/src/common/widget/Widget_ProjectPublicAreas.class.php
index 538c48b..9d877cd 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -38,29 +38,25 @@ class Widget_ProjectPublicAreas extends Widget {
}
function getContent() {
- global $HTML;
+ global $HTML, $project;
$result = '';
- $group_id = getIntFromRequest('group_id');
- $pm = ProjectManager::instance();
- $project = $pm->getProject($group_id);
- // ################# Homepage Link
+ // ################# Homepage Link
$result .= html_e('div', array('class' => 'public-area-box',
'rel' => 'doap:homepage'),
util_make_link($project->getHomePage(),
$HTML->getHomePic(_('Home Page')). ' ' ._('Project Home Page'), false, true));
// ################## ArtifactTypes
-
if ($project->usesTracker()) {
$result .= '<div class="public-area-box">'."\n";
$link_content = $HTML->getFollowPic(_('Tracker')) . ' '
. _('Tracker');
- $result .= util_make_link('/tracker/?group_id=' .
$group_id, $link_content);
+ $result .=
util_make_link('/tracker/?group_id='.$project->getID(), $link_content);
$res = db_query_params ('SELECT
agl.*,aca.count,aca.open_count
FROM artifact_group_list agl
LEFT JOIN artifact_counts_agg aca USING
(group_artifact_id)
WHERE agl.group_id=$1
ORDER BY group_artifact_id ASC',
- array($group_id));
+ array($project->getID()));
$rows = array();
while ($row = db_fetch_array($res)) {
@@ -79,7 +75,7 @@ class Widget_ProjectPublicAreas extends Widget {
$group_artifact_id =
$row['group_artifact_id'];
$tracker_stdzd_uri =
util_make_url('/tracker/cm/project/'. $project->getUnixName() .'/atid/'.
$group_artifact_id);
$contentLi = '<span
rel="http://www.w3.org/2002/07/owl#sameAs";>'."\n";
- $contentLi .=
util_make_link('/tracker/?atid='. $group_artifact_id .
'&group_id='.$group_id.'&func=browse', $row['name']) . ' ' ;
+ $contentLi .=
util_make_link('/tracker/?atid='. $group_artifact_id .
'&group_id='.$project->getID().'&func=browse', $row['name']) . ' ' ;
$contentLi .= "</span>\n"; //
/owl:sameAs
$contentLi .=
sprintf(ngettext('(<strong>%1$s</strong> open / <strong>%2$s</strong> total)',
'(<strong>%1$s</strong> open / <strong>%2$s</strong> total)',
$row['open_count']), $row['open_count'], $row['count']);
$contentLi .= '<br />';
@@ -96,7 +92,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesForum()) {
$result .= '<div class="public-area-box">'."\n";
- // $result .= '<hr size="1" /><a
rel="sioc:container_of" href="'.util_make_url
('/forum/?group_id='.$group_id).'">';
+ // $result .= '<hr size="1" /><a
rel="sioc:container_of" href="'.util_make_url
('/forum/?group_id='.$project->getID()).'">';
$ff = new ForumFactory($project);
$f_arr = $ff->getForums();
$forums_count = count($f_arr);
@@ -106,7 +102,7 @@ class Widget_ProjectPublicAreas extends Widget {
}
$link_content = $HTML->getForumPic() . ' ' . _('Public
Forums');
- $result .= util_make_link('/forum/?group_id=' .
$group_id, $link_content);
+ $result .=
util_make_link('/forum/?group_id='.$project->getID(), $link_content);
$result .= ' (';
$result .= sprintf(ngettext("<strong>%d</strong>
message","<strong>%d</strong> messages",$messages_count),$messages_count);
$result .= ' ' . _('in') . ' ';
@@ -120,9 +116,9 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesDocman()) {
$result .= '<div class="public-area-box">';
$link_content = $HTML->getDocmanPic() . ' ' .
_('Document Manager');
- // <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/docman/?group_id='.$group_id).'">';
- $result .=
util_make_link('/docman/?group_id='.$group_id, $link_content);
- if (forge_check_perm('docman', $group_id, 'read')) {
+ // <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/docman/?group_id='.$project->getID()).'">';
+ $result .=
util_make_link('/docman/?group_id='.$project->getID(), $link_content);
+ if (forge_check_perm('docman', $project->getID(),
'read')) {
$docm = new DocumentManager($project);
$result .= ' ('.html_e('strong', array(),
$docm->getNbDocs(), true, false).' '._('documents').' '._('in').'
'.html_e('strong', array(), $docm->getNbFolders(), true, false).'
'._('directories').')';
}
@@ -134,8 +130,8 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesFRS()) {
$result .= '<div class="public-area-box">';
$link_content = $HTML->getPackagePic() . ' ' .
_('Files');
- // <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/frs/?group_id='.$group_id).'">';
- $result .= util_make_link('/frs/?group_id='.$group_id,
$link_content);
+ // <a rel="sioc:container_of"
xmlns:sioc="http://rdfs.org/sioc/ns#"; href="'.util_make_url
('/frs/?group_id='.$project->getID()).'">';
+ $result .=
util_make_link('/frs/?group_id='.$project->getID(), $link_content);
$frsm = new FRSManager($project);
$result .= ' ('.html_e('strong', array(),
$frsm->getNbReleases(), true, false).' '._('releases').' '._('in').'
'.html_e('strong', array(), $frsm->getNbPackages(), true, false).'
'._('packages').')';
$result .= '</div>';
@@ -146,8 +142,8 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesMail()) {
$result .= '<div class="public-area-box">';
$link_content = $HTML->getMailPic() . ' ' . _('Mailing
Lists');
- $result .= util_make_link('/mail/?group_id='.$group_id,
$link_content);
- $n = project_get_mail_list_count($group_id);
+ $result .=
util_make_link('/mail/?group_id='.$project->getID(), $link_content);
+ $n = project_get_mail_list_count($project->getID());
$result .= ' ';
$result .= sprintf(ngettext('(<strong>%s</strong>
public mailing list)', '(<strong>%s</strong> public mailing lists)', $n), $n);
$result .= "\n</div>\n";
@@ -158,7 +154,7 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesPM()) {
$result .= '<div class="public-area-box">';
$link_content = $HTML->getPmPic() . ' ' . _('Tasks');
- $result .= util_make_link('/pm/?group_id='.$group_id,
$link_content);
+ $result .=
util_make_link('/pm/?group_id='.$project->getID(), $link_content);
$pgf = new ProjectGroupFactory ($project);
$pgs = $pgf->getProjectGroups();
@@ -169,7 +165,7 @@ class Widget_ProjectPublicAreas extends Widget {
$result .= "\n".'<ul class="task-manager">';
foreach ($pgs as $pg) {
$result .= "\n\t<li>";
- $result .=
util_make_link('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$group_id.'&func=browse',$pg->getName()).'
('.html_e('strong', array(), $pg->getOpenCount(), true, false).' '._('open').'
/ '.html_e('strong', array(), $pg->getTotalCount()).' '._('total').')';
+ $result .=
util_make_link('/pm/task.php?group_project_id='.$pg->getID().'&group_id='.$project->getID().'&func=browse',$pg->getName()).'
('.html_e('strong', array(), $pg->getOpenCount(), true, false).' '._('open').'
/ '.html_e('strong', array(), $pg->getTotalCount()).' '._('total').')';
$result .= '</li>' ;
}
$result .= "\n</ul>";
@@ -182,8 +178,8 @@ class Widget_ProjectPublicAreas extends Widget {
if ($project->usesSurvey()) {
$result .= '<div class="public-area-box">'."\n";
$link_content = $HTML->getSurveyPic() . ' ' .
_('Surveys');
- $result .=
util_make_link('/survey/?group_id='.$group_id, $link_content);
- $result .= ' (<strong>'.
project_get_survey_count($group_id) .'</strong> ' . _('surveys').')';
+ $result .=
util_make_link('/survey/?group_id='.$project->getID(), $link_content);
+ $result .= ' (<strong>'.
project_get_survey_count($project->getID()) .'</strong> ' . _('surveys').')';
$result .= "\n</div>\n";
}
@@ -193,11 +189,11 @@ class Widget_ProjectPublicAreas extends Widget {
$result .= '<div class="public-area-box">'."\n";
$link_content = $HTML->getScmPic() . ' ' . _('SCM
Repository');
- // $result .= '<hr size="1" /><a
rel="doap:repository" href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
- $result .= util_make_link('/scm/?group_id='.$group_id,
$link_content);
+ // $result .= '<hr size="1" /><a
rel="doap:repository" href="'.util_make_url
('/scm/?group_id='.$project->getID()).'">';
+ $result .=
util_make_link('/scm/?group_id='.$project->getID(), $link_content);
$hook_params = array () ;
- $hook_params['group_id'] = $group_id ;
+ $hook_params['group_id'] = $project->getID() ;
$hook_params['result'] = &$result;
plugin_hook ("scm_stats", $hook_params) ;
$result .= "\n</div>\n";
@@ -206,7 +202,7 @@ class Widget_ProjectPublicAreas extends Widget {
// ######################### Plugins
$hook_params = array ();
- $hook_params['group_id'] = $group_id;
+ $hook_params['group_id'] = $project->getID();
$hook_params['result'] = &$result;
plugin_hook ("project_public_area", $hook_params);
diff --git a/src/common/widget/Widget_ProjectRss.class.php
b/src/common/widget/Widget_ProjectRss.class.php
index 3b2d145..da6c29e 100644
--- a/src/common/widget/Widget_ProjectRss.class.php
+++ b/src/common/widget/Widget_ProjectRss.class.php
@@ -30,7 +30,8 @@ require_once 'Widget.class.php';
*/
class Widget_ProjectRss extends Widget_Rss {
function __construct() {
- parent::__construct('projectrss',
getIntFromRequest('group_id'), WidgetLayoutManager::OWNER_TYPE_GROUP);
+ global $project;
+ parent::__construct('projectrss', $project->getID(),
WidgetLayoutManager::OWNER_TYPE_GROUP);
}
function canBeUsedByProject(&$project) {
return true;
diff --git a/src/common/widget/Widget_ProjectScmStats.class.php
b/src/common/widget/Widget_ProjectScmStats.class.php
index ee26611..2f81a68 100644
--- a/src/common/widget/Widget_ProjectScmStats.class.php
+++ b/src/common/widget/Widget_ProjectScmStats.class.php
@@ -30,9 +30,8 @@ class Widget_ProjectScmStats extends Widget {
var $content = array();
function __construct() {
+ global $project;
parent::__construct('projectscmstats');
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
if ($project && $this->canBeUsedByProject($project) &&
forge_check_perm('scm', $project->getID(), 'read')) {
$this->content['title'] = _('Repository History');
}
@@ -43,9 +42,7 @@ class Widget_ProjectScmStats extends Widget {
}
function getContent() {
- $html_projectscmstats = '';
- $pm = ProjectManager::instance();
- $project = $pm->getProject(getIntFromRequest('group_id'));
+ global $project;
$project_plugins = $project->getPlugins();
foreach ($project_plugins as $value) {
$plugin_object = plugin_get_object($value);
-----------------------------------------------------------------------
Summary of changes:
.../widget/Widget_ProjectDescription.class.php | 6 +--
.../Widget_ProjectDocumentsActivity.class.php | 15 ++++---
src/common/widget/Widget_ProjectInfo.class.php | 30 ++++++--------
.../widget/Widget_ProjectLatestArtifacts.class.php | 7 +---
.../widget/Widget_ProjectLatestCommits.class.php | 7 +---
.../widget/Widget_ProjectLatestDocuments.class.php | 24 +++++------
.../Widget_ProjectLatestFileReleases.class.php | 16 +++-----
.../widget/Widget_ProjectLatestNews.class.php | 4 +-
src/common/widget/Widget_ProjectMembers.class.php | 9 ++--
.../widget/Widget_ProjectPublicAreas.class.php | 48 ++++++++++------------
src/common/widget/Widget_ProjectRss.class.php | 3 +-
src/common/widget/Widget_ProjectScmStats.class.php | 7 +---
12 files changed, 72 insertions(+), 104 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
