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 e7af9eca1667d9bad31038ae9f9a6b1d10a77fd0 (commit)
from 1c9911eb643ad87ecbd467a10b70b4268d7d40a5 (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=e7af9eca1667d9bad31038ae9f9a6b1d10a77fd0
commit e7af9eca1667d9bad31038ae9f9a6b1d10a77fd0
Author: Franck Villaume <[email protected]>
Date: Wed May 19 19:59:22 2021 +0200
use session_get_user when needed
diff --git a/src/common/include/my_utils.php b/src/common/include/my_utils.php
index b017f8a..d48b3d9 100644
--- a/src/common/include/my_utils.php
+++ b/src/common/include/my_utils.php
@@ -42,7 +42,7 @@
function my_hide_url($svc, $db_item_id, $item_id, $count, $hide) {
$pref_name = 'my_hide_'.$svc.$db_item_id;
- $old_hide = $old_count = $old_pref_value =
UserManager::instance()->getCurrentUser()->getPreference($pref_name);
+ $old_hide = $old_count = $old_pref_value =
session_get_user()->getPreference($pref_name);
if ($old_pref_value) {
list($old_hide,$old_count) = explode('|', $old_pref_value);
}
@@ -75,7 +75,7 @@ function my_hide_url($svc, $db_item_id, $item_id, $count,
$hide) {
// Update pref value if needed
if ($old_pref_value != $pref_value) {
-
UserManager::instance()->getCurrentUser()->setPreference($pref_name,
$pref_value);
+ session_get_user()->setPreference($pref_name, $pref_value);
}
if ($hide) {
@@ -91,7 +91,7 @@ function my_hide_url($svc, $db_item_id, $item_id, $count,
$hide) {
function my_hide($svc, $db_item_id, $item_id, $hide) {
$pref_name = 'my_hide_'.$svc.$db_item_id;
- $old_pref_value =
UserManager::instance()->getCurrentUser()->getPreference($pref_name);
+ $old_pref_value = session_get_user()->getPreference($pref_name);
if ($old_pref_value) {
list($old_hide, $old_count) = explode('|', $old_pref_value);
}
diff --git a/src/common/widget/Widget.class.php
b/src/common/widget/Widget.class.php
index 6a2d617..4113b4e 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -415,7 +415,7 @@ require_once
$gfcommon.'widget/Widget_UserhomeRss.class.php';
return '';
}
function getPreviewCssClass() {
- $locale =
UserManager::instance()->getCurrentUser()->getLanguage();
+ //TODO: implement locale support using
session_get_user()->getLanguage() to get the locale.
$locale = "en_US";
return 'widget-preview-'.($this->id).'-'.$locale;
}
diff --git a/src/common/widget/Widget_HomeHallOfFame.class.php
b/src/common/widget/Widget_HomeHallOfFame.class.php
index c27b8f4..71f59f5 100644
--- a/src/common/widget/Widget_HomeHallOfFame.class.php
+++ b/src/common/widget/Widget_HomeHallOfFame.class.php
@@ -25,7 +25,7 @@ class Widget_HomeHallOfFame extends Widget {
function __construct() {
parent::__construct('homehalloffame');
if (session_loggedin()) {
- $userPrefValue =
UserManager::instance()->getCurrentUser()->getPreference('my_home_hall_of_fame');
+ $userPrefValue =
session_get_user()->getPreference('my_home_hall_of_fame');
if ($userPrefValue) {
$this->_hall_show = $userPrefValue;
}
@@ -109,7 +109,7 @@ class Widget_HomeHallOfFame extends Widget {
default:
$this->_hall_show = 'PDA';
}
-
UserManager::instance()->getCurrentUser()->setPreference('my_home_hall_of_fame',
$this->_hall_show);
+
session_get_user()->setPreference('my_home_hall_of_fame', $this->_hall_show);
}
return true;
}
@@ -128,4 +128,3 @@ class Widget_HomeHallOfFame extends Widget {
return $prefs;
}
}
-
diff --git a/src/common/widget/Widget_MyArtifacts.class.php
b/src/common/widget/Widget_MyArtifacts.class.php
index ec31fce..5ca87b6 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -41,10 +41,10 @@ class Widget_MyArtifacts extends Widget {
var $_artifact_show;
function __construct() {
parent::__construct('myartifacts');
- $this->_artifact_show =
UserManager::instance()->getCurrentUser()->getPreference('my_artifacts_show');
+ $this->_artifact_show =
session_get_user()->getPreference('my_artifacts_show');
if($this->_artifact_show === false) {
$this->_artifact_show = 'ASM';
-
UserManager::instance()->getCurrentUser()->setPreference('my_artifacts_show',
$this->_artifact_show);
+ session_get_user()->setPreference('my_artifacts_show',
$this->_artifact_show);
}
}
@@ -77,7 +77,7 @@ class Widget_MyArtifacts extends Widget {
default:
$this->_artifact_show = 'ASM';
}
-
UserManager::instance()->getCurrentUser()->setPreference('my_artifacts_show',
$this->_artifact_show);
+ session_get_user()->setPreference('my_artifacts_show',
$this->_artifact_show);
return true;
}
@@ -101,20 +101,20 @@ class Widget_MyArtifacts extends Widget {
function getContent() {
global $HTML;
- $user = @UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$atf = new ArtifactsForUser($user);
$my_artifacts = array();
if ($this->_artifact_show == 'ASM') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select
artifact_monitor.artifact_id FROM artifact_monitor WHERE
artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select
artifact_monitor.artifact_id FROM artifact_monitor WHERE
artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(user_getid()));
}
if ($this->_artifact_show == 'AS') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(user_getid()));
}
if ($this->_artifact_show == 'AM') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id DESC',array(user_getid()));
}
if ($this->_artifact_show == 'SM') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id DESC',array(user_getid()));
}
if ($this->_artifact_show== 'S') {
$my_artifacts = $atf->getSubmittedArtifactsByGroup();
@@ -123,7 +123,7 @@ class Widget_MyArtifacts extends Widget {
$my_artifacts = $atf->getAssignedArtifactsByGroup();
}
if ($this->_artifact_show== 'M') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(user_getid()));
}
if (count($my_artifacts) > 0) {
@@ -264,7 +264,7 @@ class Widget_MyArtifacts extends Widget {
if (!forge_get_config('use_tracker')) {
return false;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesTracker()) {
return true;
}
diff --git a/src/common/widget/Widget_MyLatestCommits.class.php
b/src/common/widget/Widget_MyLatestCommits.class.php
index 354a61d..2322181 100644
--- a/src/common/widget/Widget_MyLatestCommits.class.php
+++ b/src/common/widget/Widget_MyLatestCommits.class.php
@@ -35,10 +35,10 @@ class Widget_MyLatestCommits extends Widget {
function __construct() {
parent::__construct('mylatestcommits');
- $this->_nb_commits =
UserManager::instance()->getCurrentUser()->getPreference('my_latests_commits_nb_display');
+ $this->_nb_commits =
session_get_user()->getPreference('my_latests_commits_nb_display');
if($this->_nb_commits === false) {
$this->_nb_commits = self::NB_COMMITS_TO_DISPLAY;
-
UserManager::instance()->getCurrentUser()->setPreference('my_latests_commits_nb_display',
$this->_nb_commits);
+
session_get_user()->setPreference('my_latests_commits_nb_display',
$this->_nb_commits);
}
}
@@ -60,7 +60,7 @@ class Widget_MyLatestCommits extends Widget {
public function getContent() {
global $HTML;
$html = '';
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$projects = $user->getGroups();
$global_nb_revisions = 0;
foreach ($projects as $project) {
@@ -75,7 +75,7 @@ class Widget_MyLatestCommits extends Widget {
$scmPlugin = plugin_get_object('scmgit');
$revisions = array_merge($revisions,
$scmPlugin->getCommits($project, $user, $this->_nb_commits));
}
- if (count($revisions) > 0) {
+ if (!empty($revisions)) {
usort($revisions, array($this,
'commit_dateorder'));
$revisions = array_slice($revisions, 0,
$this->_nb_commits, true);
$global_nb_revisions += count($revisions);
@@ -113,7 +113,7 @@ class Widget_MyLatestCommits extends Widget {
function getPreferences() {
$prefs = _('Maximum number of commits to display per
project.');
- $prefs .= html_e('input', array('name' => 'nb_commits', 'type'
=> 'number', 'size' => 2, 'maxlength' => 3, 'value' =>
UserManager::instance()->getCurrentUser()->getPreference('my_latests_commits_nb_display')));
+ $prefs .= html_e('input', array('name' => 'nb_commits', 'type'
=> 'number', 'size' => 2, 'maxlength' => 3, 'value' =>
session_get_user()->getPreference('my_latests_commits_nb_display')));
return $prefs;
}
@@ -121,7 +121,7 @@ class Widget_MyLatestCommits extends Widget {
$cancel = getStringFromRequest('cancel');
if (strlen($cancel) > 0) {
$this->_nb_commits = getIntFromRequest('nb_commits',
self::NB_COMMITS_TO_DISPLAY);
-
UserManager::instance()->getCurrentUser()->setPreference('my_latests_commits_nb_display',
$this->_nb_commits);
+
session_get_user()->setPreference('my_latests_commits_nb_display',
$this->_nb_commits);
}
return true;
}
@@ -154,7 +154,7 @@ class Widget_MyLatestCommits extends Widget {
if (!forge_get_config('use_scm')) {
return false;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesPlugin('scmsvn') ||
$p->usesPlugin('scmgit')) {
return true;
}
diff --git a/src/common/widget/Widget_MyMonitoredForums.class.php
b/src/common/widget/Widget_MyMonitoredForums.class.php
index 90f5f2e..d2c6160 100644
--- a/src/common/widget/Widget_MyMonitoredForums.class.php
+++ b/src/common/widget/Widget_MyMonitoredForums.class.php
@@ -137,7 +137,7 @@ class Widget_MyMonitoredForums extends Widget {
if (!forge_get_config('use_forum')) {
return false;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesForum()) {
return true;
}
diff --git a/src/common/widget/Widget_MyMonitoredFp.class.php
b/src/common/widget/Widget_MyMonitoredFp.class.php
index 7b8a116..ed85291 100644
--- a/src/common/widget/Widget_MyMonitoredFp.class.php
+++ b/src/common/widget/Widget_MyMonitoredFp.class.php
@@ -29,12 +29,15 @@ require_once $gfcommon.'include/MonitorElement.class.php';
* FRS packages that are actively monitored
*/
class Widget_MyMonitoredFp extends Widget {
+
function __construct() {
parent::__construct('mymonitoredfp');
}
+
function getTitle() {
return _('Monitored File Packages');
}
+
function getContent() {
global $HTML;
$html_my_monitored_fp = '';
@@ -132,7 +135,7 @@ class Widget_MyMonitoredFp extends Widget {
if (!forge_get_config('use_frs')) {
return false;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesFRS()) {
return true;
}
diff --git a/src/common/widget/Widget_MyProjects.class.php
b/src/common/widget/Widget_MyProjects.class.php
index bcb78e3..89a81dd 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -115,10 +115,10 @@ class Widget_MyProjects extends Widget {
'copyright' => 'Copyright Xerox',
'pubDate' => gmdate('D, d M Y
G:i:s',time()).' GMT',
));
- $projects =
UserManager::instance()->getCurrentUser()->getGroups();
+ $projects = session_get_user()->getGroups();
sortProjectList($projects);
- if (!$projects || count($projects) < 1) {
+ if (!$projects || empty($projects)) {
$rss->addItem(array(
'title' =>
forge_get_config('forge_name'),
'description' => _("You're not a
member of any project") . db_error(),
@@ -153,8 +153,3 @@ class Widget_MyProjects extends Widget {
return _('List the projects you belong to. Selecting any of
these projects brings you to the corresponding Project Summary page.');
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/common/widget/Widget_MyProjectsLastDocuments.class.php
b/src/common/widget/Widget_MyProjectsLastDocuments.class.php
index d051a49..3e7f988 100644
--- a/src/common/widget/Widget_MyProjectsLastDocuments.class.php
+++ b/src/common/widget/Widget_MyProjectsLastDocuments.class.php
@@ -132,7 +132,7 @@ class Widget_MyProjectsLastDocuments extends Widget {
if (!forge_get_config('use_docman')) {
return false;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesDocman()) {
return true;
}
diff --git a/src/common/widget/Widget_MyTasks.class.php
b/src/common/widget/Widget_MyTasks.class.php
index 20d860d..f2540e7 100644
--- a/src/common/widget/Widget_MyTasks.class.php
+++ b/src/common/widget/Widget_MyTasks.class.php
@@ -119,7 +119,7 @@ class Widget_MyTasks extends Widget {
return false ;
}
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ foreach (session_get_user()->getGroups(false) as $p) {
if ($p->usesPM()) {
return true ;
}
diff --git a/src/common/widget/Widget_ProjectDocumentsActivity.class.php
b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
index 5923ae0..57dbb01 100644
--- a/src/common/widget/Widget_ProjectDocumentsActivity.class.php
+++ b/src/common/widget/Widget_ProjectDocumentsActivity.class.php
@@ -34,7 +34,7 @@ class Widget_ProjectDocumentsActivity extends Widget {
global $project;
parent::__construct('projectdocumentsactivity');
if (session_loggedin()) {
- $userPrefValue =
UserManager::instance()->getCurrentUser()->getPreference('my_docman_project_activitity_show');
+ $userPrefValue =
session_get_user()->getPreference('my_docman_project_activitity_show');
if ($userPrefValue) {
$this->_statistic_show = $userPrefValue;
}
@@ -75,7 +75,7 @@ class Widget_ProjectDocumentsActivity extends Widget {
default:
$this->_statistic_show = 'FUD';
}
-
UserManager::instance()->getCurrentUser()->setPreference('my_docman_project_activitity_show',
$this->_statistic_show);
+
session_get_user()->setPreference('my_docman_project_activitity_show',
$this->_statistic_show);
}
return true;
}
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php
b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index ca0e58f..441e277 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -110,7 +110,7 @@ class Widget_ProjectLatestDocuments extends Widget {
$cells[][] =
$doc->getStateName();
$action = '';
if ($doc->getStateID() != 2) {
- if
($doc->isMonitoredBy(UserManager::instance()->getCurrentUser()->getID())) {
+ if
($doc->isMonitoredBy(user_getid())) {
$option =
'stop';
$titleMonitor =
_('Stop monitoring this document');
$image =
$HTML->getStopMonitoringPic($titleMonitor, $titleMonitor);
diff --git a/src/plugins/extsubproj/include/extsubprojPlugin.class.php
b/src/plugins/extsubproj/include/extsubprojPlugin.class.php
index fa97d59..f2cba17 100644
--- a/src/plugins/extsubproj/include/extsubprojPlugin.class.php
+++ b/src/plugins/extsubproj/include/extsubprojPlugin.class.php
@@ -55,9 +55,7 @@ control over it to the project's administrator.");
$group_id = $params['group_id'];
$group = group_get_object($group_id);
if ($group->usesPlugin($this->name)) {
- echo '<p>';
- echo $this->getProjectAdminLink($group_id);
- echo '</p>';
+ echo '<p>'.$this->getProjectAdminLink($group_id).'</p>';
}
}
@@ -92,7 +90,6 @@ control over it to the project's administrator.");
* @return bool success or not
*/
function getHeader($type, $params=NULL) {
- global $gfplugins;
$returned = false;
switch ($type) {
case 'globaladmin': {
@@ -249,7 +246,6 @@ control over it to the project's administrator.");
*/
function widget_instance($params) {
global $gfplugins, $gfcommon;
- //$user = UserManager::instance()->getCurrentUser();
require_once $gfcommon.'/widget/WidgetLayoutManager.class.php';
if ($params['widget'] ==
'plugin_extsubproj_project_subprojects') {
require_once
$gfplugins.$this->name.'/include/extsubproj_Widget_SubProjects.class.php';
diff --git a/src/plugins/forumml/www/forumml_utils.php
b/src/plugins/forumml/www/forumml_utils.php
index dade697..604473b 100644
--- a/src/plugins/forumml/www/forumml_utils.php
+++ b/src/plugins/forumml/www/forumml_utils.php
@@ -635,7 +635,7 @@ function plugin_forumml_process_mail($plug,$reply=false) {
$to = $list->getName()."@".forge_get_config('lists_host');
$mail->setTo($to);
- $mail->setFrom(UserManager::instance()->getCurrentUser()->getEmail());
+ $mail->setFrom(session_get_user()->getEmail());
$vMsg = new Valid_Text('message');
if ($request->valid($vMsg)) {
diff --git a/src/plugins/forumml/www/message.php
b/src/plugins/forumml/www/message.php
index e630e92..c11607b 100644
--- a/src/plugins/forumml/www/message.php
+++ b/src/plugins/forumml/www/message.php
@@ -41,7 +41,7 @@ $plugin_manager =& PluginManager::instance();
$p =& $plugin_manager->getPluginByName('forumml');
if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
$request =& HTTPRequest::instance();
$vGrp = new Valid_UInt('group_id');
diff --git a/src/plugins/forumml/www/upload.php
b/src/plugins/forumml/www/upload.php
index 8d12548..cf1c0c8 100644
--- a/src/plugins/forumml/www/upload.php
+++ b/src/plugins/forumml/www/upload.php
@@ -31,60 +31,59 @@
require_once(dirname(__FILE__).'/../include/ForumML_Attachment.class.php');
global $feedback ;
$plugin_manager = PluginManager::instance();
$p = $plugin_manager->getPluginByName('forumml');
+
if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
- $request = HTTPRequest::instance();
- $current_user=UserManager::instance()->getCurrentUser();
- $groupId = $request->getValidated('group_id', 'UInt', 0);
+ $request = HTTPRequest::instance();
+ $current_user= session_get_user();
+ $groupId = $request->getValidated('group_id', 'UInt', 0);
- $vList = new Valid_UInt('list');
- $vList->required();
- // Checks 'list' parameter
- if (! $request->valid($vList)) {
- exit_error('Error','No list specified');
- } else {
- $list_id = $request->get('list');
- $list = new MailmanList($groupId,$list_id);
- if (!isLogged() || ($list->isPublic()!=1 &&
!$current_user->isMember($groupId))) {
- exit_error(_('Error'),_('You are not allowed to access this
page'));
- }
- if ($list->getStatus() !=3) {
- exit_error(_('Error'),_('This list is not active'));
+ $vList = new Valid_UInt('list');
+ $vList->required();
+ // Checks 'list' parameter
+ if (! $request->valid($vList)) {
+ exit_error('Error','No list specified');
+ } else {
+ $list_id = $request->get('list');
+ $list = new MailmanList($groupId,$list_id);
+ if (!isLogged() || ($list->isPublic()!=1 &&
!$current_user->isMember($groupId))) {
+ exit_error(_('Error'),_('You are not allowed to access
this page'));
+ }
+ if ($list->getStatus() !=3) {
+ exit_error(_('Error'),_('This list is not active'));
+ }
}
- }
- // Topic
- $vTopic = new Valid_UInt('topic');
- $vTopic->required();
- if ($request->valid($vTopic)) {
- $topic = $request->get('topic');
- } else {
- $topic = 0;
- }
- $attchmentId = $request->getValidated('id', 'UInt', 0);
- if ($attchmentId) {
- $fmlAttch = new ForumML_Attachment();
- $attch = $fmlAttch->getById($attchmentId);
-echo $attch['file_path'];
- if ( file_exists($attch['file_path'])) {
-//if (1==1) {
- header('Content-disposition:
filename="'.$attch['file_name'].'"');
- header("Content-Type: ".$attch['type']);
- header("Content-Transfer-Encoding: ".$attch['type']);
- if ($attch['file_size'] > 0) {
- header("Content-Length: ".$attch['file_size']);
- }
- header("Pragma: no-cache");
- header("Cache-Control: must-revalidate, post-check=0,
pre-check=0, public");
- header("Expires: 0");
- readfile($attch['file_path']);
- exit;
- } else {
- $feedback.= _('Error: Attachment not found');
- }
- } else {
+ // Topic
+ $vTopic = new Valid_UInt('topic');
+ $vTopic->required();
+ if ($request->valid($vTopic)) {
+ $topic = $request->get('topic');
+ } else {
+ $topic = 0;
+ }
+ $attchmentId = $request->getValidated('id', 'UInt', 0);
+ if ($attchmentId) {
+ $fmlAttch = new ForumML_Attachment();
+ $attch = $fmlAttch->getById($attchmentId);
+ if ( file_exists($attch['file_path'])) {
+ header('Content-disposition:
filename="'.$attch['file_name'].'"');
+ header("Content-Type: ".$attch['type']);
+ header("Content-Transfer-Encoding: ".$attch['type']);
+ if ($attch['file_size'] > 0) {
+ header("Content-Length: ".$attch['file_size']);
+ }
+ header("Pragma: no-cache");
+ header("Cache-Control: must-revalidate, post-check=0,
pre-check=0, public");
+ header("Expires: 0");
+ readfile($attch['file_path']);
+ exit;
+ } else {
+ $feedback.= _('Error: Attachment not found');
+ }
+ } else {
$feedback.= _('Error: Missing parameter');
- }
-
session_redirect('/plugins/forumml/message.php?group_id='.$groupId.'&list='.$list_id.'&topic='.$topic);
+ }
+
session_redirect('/plugins/forumml/message.php?group_id='.$groupId.'&list='.$list_id.'&topic='.$topic);
} else {
session_redirect(get_server_url());
}
diff --git
a/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
b/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
index 171c983..580c18f 100644
--- a/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
+++ b/src/plugins/globaldashboard/include/globaldashboardPlugin.class.php
@@ -37,7 +37,7 @@ class globaldashboardPlugin extends Plugin {
}
function usermenu() {
- global $G_SESSION,$HTML;
+ global $G_SESSION, $HTML;
$text = $this->text; // this is what shows in the tab
if ($G_SESSION->usesPlugin("globaldashboard")) {
$param = '?type=user&id=' . $G_SESSION->getId() .
'&pluginname=' . $this->name; // we indicate the part we're calling is the user
one
@@ -61,7 +61,6 @@ class globaldashboardPlugin extends Plugin {
*/
function widget_instance($params) {
global $gfplugins;
- //$user = UserManager::instance()->getCurrentUser();
require_once 'common/widget/WidgetLayoutManager.class.php';
if ($params['widget'] == 'plugin_globalDashboard_MyProjects') {
require_once
$gfplugins.$this->name.'/include/globalDashboard_Widget_MyProjects.php';
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php
b/src/plugins/hudson/include/hudsonPlugin.class.php
index 2fd434c..7ae8e22 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -153,8 +153,6 @@ control over it to the project administrator.");
function myPageBox($params) {
require_once 'common/widget/WidgetLayoutManager.class.php';
- $user = UserManager::instance()->getCurrentUser();
-
// MY
if ($params['widget'] == 'plugin_hudson_my_jobs') {
require_once 'hudson_Widget_MyMonitoredJobs.class.php';
@@ -162,23 +160,23 @@ control over it to the project administrator.");
}
if ($params['widget'] == 'plugin_hudson_my_joblastbuilds') {
require_once 'hudson_Widget_JobLastBuilds.class.php';
- $params['instance'] = new
hudson_Widget_JobLastBuilds(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
hudson_Widget_JobLastBuilds(WidgetLayoutManager::OWNER_TYPE_USER, user_getid());
}
if ($params['widget'] == 'plugin_hudson_my_jobtestresults') {
require_once 'hudson_Widget_JobTestResults.class.php';
- $params['instance'] = new
hudson_Widget_JobTestResults(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
hudson_Widget_JobTestResults(WidgetLayoutManager::OWNER_TYPE_USER,
user_getid());
}
if ($params['widget'] == 'plugin_hudson_my_jobtesttrend') {
require_once 'hudson_Widget_JobTestTrend.class.php';
- $params['instance'] = new
hudson_Widget_JobTestTrend(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
hudson_Widget_JobTestTrend(WidgetLayoutManager::OWNER_TYPE_USER, user_getid());
}
if ($params['widget'] == 'plugin_hudson_my_jobbuildhistory') {
require_once 'hudson_Widget_JobBuildHistory.class.php';
- $params['instance'] = new
hudson_Widget_JobBuildHistory(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
hudson_Widget_JobBuildHistory(WidgetLayoutManager::OWNER_TYPE_USER,
user_getid());
}
if ($params['widget'] == 'plugin_hudson_my_joblastartifacts') {
require_once 'hudson_Widget_JobLastArtifacts.class.php';
- $params['instance'] = new
hudson_Widget_JobLastArtifacts(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
hudson_Widget_JobLastArtifacts(WidgetLayoutManager::OWNER_TYPE_USER,
user_getid());
}
// PROJECT
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index 5351b71..2ae2373 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -23,7 +23,6 @@
require_once 'common/mvc/Views.class.php';
/*require_once('common/include/HTTPRequest.class.php');
- require_once 'common/user/UserManager.class.php';
require_once('common/reference/CrossReferenceFactory.class.php');*/
require_once 'HudsonJob.class.php';
@@ -56,7 +55,7 @@ class hudsonViews extends Views {
function projectOverview() {
$request =& HTTPRequest::instance();
$group_id = $request->get('group_id');
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$this->_display_jobs_table($group_id);
if ($user->isMember($request->get('group_id'), 'A')) {
@@ -180,7 +179,7 @@ class hudsonViews extends Views {
$request =& HTTPRequest::instance();
$group_id = $request->get('group_id');
$job_id = $request->get('job_id');
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
if ($user->isMember($group_id, 'A')) {
$project = group_get_objet($group_id);
@@ -261,7 +260,7 @@ class hudsonViews extends Views {
global $HTML;
$request =& HTTPRequest::instance();
$group_id = $request->get('group_id');
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$job_dao = new
PluginHudsonJobDao(CodendiDataAccess::instance());
$dar = $job_dao->searchByGroupID($group_id);
diff --git a/src/plugins/mailman/include/MailmanList.class.php
b/src/plugins/mailman/include/MailmanList.class.php
index acf39c4..caa3fd6 100644
--- a/src/plugins/mailman/include/MailmanList.class.php
+++ b/src/plugins/mailman/include/MailmanList.class.php
@@ -5,8 +5,6 @@
* Copyright 2003 Guillaume Smet
* http://fusionforge.org/
*
- * @version $Id$
- *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
@@ -31,7 +29,6 @@
*/
require_once 'MailmanListDao.class.php';
-require_once 'UserManager.class.php';
require_once 'common/dao/CodendiDataAccess.class.php';
require_once 'common/system_event/SystemEventManager.class.php';
require_once 'common/system_event/SystemEvent.class.php';
@@ -117,7 +114,7 @@ class MailmanList extends FFError {
**/
function create($listName, $description, $isPublic =
'1',$creator_id=false) {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user= session_get_user();
//
// During the group creation, the current user_id will not
match the admin's id
//
@@ -161,7 +158,7 @@ class MailmanList extends FFError {
$systemevent = SystemEventManager::instance();
$systemevent->createEvent('MAILMAN_LIST_CREATE',
$this->groupMailmanListId,SystemEvent::PRIORITY_MEDIUM);
$this->fetchData($this->groupMailmanListId);
- $user=UserManager::instance()->getUserByID($creator_id);
+ $user = user_get_object($creator_id);
$userEmail = $user->getEmail();
if(empty($userEmail) || !validate_email($userEmail)) {
@@ -186,8 +183,7 @@ class MailmanList extends FFError {
$result2 =
$systemevent->fetchEvents(0,10,false,SystemEvent::STATUS_RUNNING,'MAILMAN_LIST_CREATE',$this->getID());
if(count($result1)+count($result2)<1) {
return false;
- }
- else {
+ } else {
return true;
}
}
@@ -228,7 +224,7 @@ class MailmanList extends FFError {
* @return boolean success.
*/
function update($description, $isPublic ='1',$status='1') {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
if(!$current_user->isMember($this->Group->getID(),'A')) {
exit_permission_denied();
return false;
@@ -341,8 +337,8 @@ class MailmanList extends FFError {
* @return string url of the info page
*/
function getOptionsUrl() {
- $current_user=UserManager::instance()->getCurrentUser();
- $user=$current_user->getEmail();
+ $current_user = session_get_user();
+ $user = $current_user->getEmail();
$iframe_url = '/mailman/options/'.$this->getName().'/'.$user;
htmlIframe($iframe_url, array('class' => 'iframe_service'));
}
@@ -352,9 +348,8 @@ class MailmanList extends FFError {
* @return string url of the info page
*/
function subscribe() {
- $current_user=UserManager::instance()->getCurrentUser();
- if(isLogged() && $current_user->isMember($this->Group->getID())
&& !$this->isMonitoring())
- {
+ $current_user = session_get_user();
+ if(isLogged() && $current_user->isMember($this->Group->getID())
&& !$this->isMonitoring()) {
$user=$current_user->getEmail();
$passwd= $current_user->getUserPw();
$name= $current_user->getRealName();
@@ -373,7 +368,7 @@ class MailmanList extends FFError {
* @return string url of the info page
*/
function unsubscribe() {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
$user=$current_user->getEmail();
$res =
$this->_mailingDAO->deleteSubscriber($user,$this->getName());
if (!$res) {
@@ -391,7 +386,7 @@ class MailmanList extends FFError {
if (!isLogged()) {
return false;
}
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
$user=$current_user->getEmail();
$res =
$this->_mailingDAO->userIsMonitoring($user,$this->getName());
if (!$res) {
@@ -421,7 +416,7 @@ class MailmanList extends FFError {
* @return boolean success;
*/
function deleteList($sure,$really_sure) {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
if (!$sure || !$really_sure) {
$this->setError(_('Missing parameters'));
return false;
@@ -441,12 +436,5 @@ class MailmanList extends FFError {
$systemevent->createEvent('MAILMAN_LIST_DELETE',
$this->groupMailmanListId,SystemEvent::PRIORITY_MEDIUM);
return true;
-
}
-
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/mailman/include/MailmanListFactory.class.php
b/src/plugins/mailman/include/MailmanListFactory.class.php
index 9c42542..2a59c01 100644
--- a/src/plugins/mailman/include/MailmanListFactory.class.php
+++ b/src/plugins/mailman/include/MailmanListFactory.class.php
@@ -91,7 +91,7 @@ class MailmanListFactory extends FFError {
* @return array The array of MailmanList objects.
*/
function &getMailmanLists() {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
if (isset($this->mailingLists) &&
is_array($this->mailingLists)) {
return $this->mailingLists;
}
@@ -121,9 +121,8 @@ class MailmanListFactory extends FFError {
*
* @return string url of the info page
*/
- function compareInfos()
- {
- $current_user=UserManager::instance()->getCurrentUser();
+ function compareInfos() {
+ $current_user = session_get_user();
$mail=$current_user->getEmail();
$passwd= $current_user->getUserPw();
@@ -131,13 +130,9 @@ class MailmanListFactory extends FFError {
$result =& $this->_mailingDAO->compareInfos($mail);
if (!$result) {
return false;
- }
- else
- {
- while( $arr =& $result->getRow())
- {
- if($arr['password']!=$passwd ||
$arr['name']!=$name)
- {
+ } else {
+ while( $arr =& $result->getRow()) {
+ if($arr['password']!=$passwd ||
$arr['name']!=$name) {
return true;
}
}
@@ -150,9 +145,8 @@ class MailmanListFactory extends FFError {
*
* @return string url of the info page
*/
- function updateInfos()
- {
- $current_user=UserManager::instance()->getCurrentUser();
+ function updateInfos() {
+ $current_user = session_get_user();
$mail=$current_user->getEmail();
$passwd= $current_user->getUserPw();
@@ -167,8 +161,3 @@ class MailmanListFactory extends FFError {
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/mailman/include/mailmanPlugin.class.php
b/src/plugins/mailman/include/mailmanPlugin.class.php
index 8921124..d98f150 100644
--- a/src/plugins/mailman/include/mailmanPlugin.class.php
+++ b/src/plugins/mailman/include/mailmanPlugin.class.php
@@ -70,11 +70,11 @@ class mailmanPlugin extends Plugin {
}
function CallHook($hookname, &$params) {
- global
$use_mailmanplugin,$G_SESSION,$HTML,$gfcommon,$gfwww,$gfplugins;
+ global $use_mailmanplugin, $HTML, $gfcommon, $gfwww, $gfplugins;
if ($hookname == "usermenu") {
$text = $this->text; // this is what shows in the tab
- if ($G_SESSION->usesPlugin("mailman")) {
- $param = '?type=user&id=' . $G_SESSION->getId()
. '&pluginname=' . $this->name; // we indicate the part we're calling is the
user one
+ if (session_get_user()->usesPlugin("mailman")) {
+ $param = '?type=user&id=' . user_getid() .
'&pluginname=' . $this->name; // we indicate the part we're calling is the user
one
echo ' | ' . $HTML->PrintSubMenu (array ($text),
array ('/plugins/mailman/index.php' .
$param ));
}
@@ -150,7 +150,7 @@ class mailmanPlugin extends Plugin {
}
}
elseif ($hookname == "monitored_element") {
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
$last_group=0;
$order_name_arr=array();
$order_name_arr[]=_('Remove');
diff --git a/src/plugins/mailman/www/mailman_utils.php
b/src/plugins/mailman/www/mailman_utils.php
index e1d4a16..6904074 100644
--- a/src/plugins/mailman/www/mailman_utils.php
+++ b/src/plugins/mailman/www/mailman_utils.php
@@ -27,8 +27,6 @@ require_once 'mailman/include/MailmanList.class.php';
require_once 'mailman/include/MailmanListFactory.class.php';
global $HTML;
-global $class;
-$current_user=UserManager::instance()->getCurrentUser();
function sendCreationMail($userEmail,&$list) {
$message = sprintf(_('A mailing list will be created on %s in few
minutes and you are the list administrator.'), forge_get_config ('forge_name'))
@@ -91,13 +89,11 @@ function table_end()
// echo '</TD></TR></TABLE>';
echo '</table>';
}
-function display_list($currentList)
-{
-global $class;
-$plugin_manager =& PluginManager::instance();
-$p =& $plugin_manager->getPluginByName('mailman');
+function display_list($currentList) {
+ global $class;
+ $plugin_manager =& PluginManager::instance();
+ $p =& $plugin_manager->getPluginByName('mailman');
$request =& HTTPRequest::instance();
- $current_user=UserManager::instance()->getCurrentUser();
if($currentList->isPublic()!='9'){
if ($currentList->isError()) {
@@ -144,7 +140,7 @@ $p =& $plugin_manager->getPluginByName('mailman');
;
echo '</a></td> <td></td>';
}
- if ($currentList->getListAdminID() ==
$current_user->getID()){
+ if ($currentList->getListAdminID() ==
user_getid()){
echo ' <td> <a
href="index.php?group_id='.
$request->get('group_id').'&action=admin&id='. $currentList->getID()
.'">'._('Administrate').'</a> ';
}
else { echo '<td>';}
@@ -156,11 +152,9 @@ $p =& $plugin_manager->getPluginByName('mailman');
}
}
-function display_list_admin($currentList)
-{
+function display_list_admin($currentList) {
global $class;
$request =& HTTPRequest::instance();
- $current_user=UserManager::instance()->getCurrentUser();
if($currentList->isPublic()!='9'){
if ($currentList->isError() ) {
echo $currentList->getErrorMessage();
@@ -190,7 +184,7 @@ function display_list_admin($currentList)
echo '<td> <a
href="index.php?group_id='.$request->get('group_id').'&change_status=1&group_list_id='.$currentList->getID().'">'._('Update').'</a></td>';
echo '<td> <a
href="deletelist.php?group_id='.$currentList->Group->getID().'&id='.$currentList->getID().'">'.
_('Delete').'</td>';
- if ($currentList->getListAdminID() ==
$current_user->getID()){
+ if ($currentList->getListAdminID() == user_getid()){
echo ' <td> <a href="../index.php?group_id='.
$request->get('group_id').'&action=admin&id='. $currentList->getID()
.'">'._('Administrate from Mailman').'</a></td> ';
}
}
@@ -201,7 +195,7 @@ function display_list_admin($currentList)
function mailman_header($params) {
global $group_id;
- $current_user=UserManager::instance()->getCurrentUser();
+ $current_user = session_get_user();
$request =& HTTPRequest::instance();
//required for site_project_header
@@ -229,8 +223,3 @@ function mailman_header($params) {
function mail_footer($params = array()) {
site_project_footer($params);
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git
a/src/plugins/oslc/include/oslc-zend/application/controllers/CodendiOSLCConnector.php
b/src/plugins/oslc/include/oslc-zend/application/controllers/CodendiOSLCConnector.php
index 5dc0ca7..be49d1b 100644
---
a/src/plugins/oslc/include/oslc-zend/application/controllers/CodendiOSLCConnector.php
+++
b/src/plugins/oslc/include/oslc-zend/application/controllers/CodendiOSLCConnector.php
@@ -140,7 +140,6 @@ class CodendiOSLCConnector extends OSLCConnector {
* @return boolean true if success, false otherwise.
*/
public function updateChangeRequest($changerequest_id, $group_id,
$tracker_id, $changerequest, $props) {
- $user = UserManager::instance()->getCurrentUser();
$project = group_get_object($group_id);
if (! $project || ! is_object($project)) {
throw new Exception('Error : Could Not Get
Group','updateChangeRequest');
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index bb5e064..af5ed45 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -952,12 +952,10 @@ control over it to the project's administrator.");
require_once 'common/widget/WidgetLayoutManager.class.php';
if ($params['widget'] == 'plugin_scmgit_user_myrepositories') {
require_once
$gfplugins.$this->name.'/common/scmgit_Widget_MyRepositories.class.php';
- $user = UserManager::instance()->getCurrentUser();
- $params['instance'] = new
scmgit_Widget_MyRepositories(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ $params['instance'] = new
scmgit_Widget_MyRepositories(WidgetLayoutManager::OWNER_TYPE_USER,
user_getid());
} elseif ($params['widget'] ==
'plugin_scmgit_user_userrepositories') {
- global $user; #TODO: do not rely on global var.
require_once
$gfplugins.$this->name.'/common/scmgit_Widget_UserRepositories.class.php';
- $params['instance'] = new
scmgit_Widget_UserRepositories(WidgetLayoutManager::OWNER_TYPE_USERHOME,
$user->getId());
+ $params['instance'] = new
scmgit_Widget_UserRepositories(WidgetLayoutManager::OWNER_TYPE_USERHOME,
user_getid());
}
}
diff --git a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
index 7213247..17912c1 100644
--- a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
+++ b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
@@ -42,7 +42,7 @@ class scmgit_Widget_MyRepositories extends Widget {
function getContent() {
global $HTML;
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$GitRepositories = $this->getMyRepositoriesList();
if (count($GitRepositories)) {
$ssh_port = '';
diff --git a/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
b/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
index 4fd81d2..f2fcce0 100644
--- a/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
+++ b/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
@@ -41,7 +41,7 @@ class scmgit_Widget_UserRepositories extends Widget {
function getContent() {
global $HTML;
- $user = UserManager::instance()->getCurrentUser();
+ $user = session_get_user();
$GitRepositories = $this->getMyRepositoriesList();
if (count($GitRepositories)) {
$ssh_port = '';
diff --git a/src/www/widgets/widgets.php b/src/www/widgets/widgets.php
index 52877c8..fcd64f9 100644
--- a/src/www/widgets/widgets.php
+++ b/src/www/widgets/widgets.php
@@ -30,16 +30,14 @@ html_use_jquery();
use_javascript('/widgets/scripts/LayoutController.js');
if (session_loggedin()) {
- $lm = new WidgetLayoutManager();
- $layout_id = getIntFromRequest('layout_id');
- $owner = getStringFromRequest('owner');
+ $lm = new WidgetLayoutManager();
+ $layout_id = getIntFromRequest('layout_id');
+ $owner = getStringFromRequest('owner');
$owner_id = (int)substr($owner, 1);
$owner_type = substr($owner, 0, 1);
switch($owner_type) {
case WidgetLayoutManager::OWNER_TYPE_USER:
if ($owner_id == user_getid()) {
- $userm = UserManager::instance();
- $current = $userm->getCurrentUser();
site_user_header(array('title'=>sprintf(_('Personal Page for %s'),
user_getname())));
$lm->displayAvailableWidgets(user_getid(),
WidgetLayoutManager::OWNER_TYPE_USER, $layout_id);
site_footer();
@@ -96,8 +94,6 @@ if (session_loggedin()) {
break;
case WidgetLayoutManager::OWNER_TYPE_USERHOME:
if ($owner_id == user_getid()) {
- $userm = UserManager::instance();
- $current = $userm->getCurrentUser();
site_header(array('title'=>sprintf(_('Profile
Page for %s'), user_getname())));
$lm->displayAvailableWidgets(user_getid(),
WidgetLayoutManager::OWNER_TYPE_USERHOME, $layout_id);
site_footer();
-----------------------------------------------------------------------
Summary of changes:
src/common/include/my_utils.php | 6 +-
src/common/widget/Widget.class.php | 2 +-
src/common/widget/Widget_HomeHallOfFame.class.php | 5 +-
src/common/widget/Widget_MyArtifacts.class.php | 20 ++---
src/common/widget/Widget_MyLatestCommits.class.php | 14 ++--
.../widget/Widget_MyMonitoredForums.class.php | 2 +-
src/common/widget/Widget_MyMonitoredFp.class.php | 5 +-
src/common/widget/Widget_MyProjects.class.php | 9 +-
.../Widget_MyProjectsLastDocuments.class.php | 2 +-
src/common/widget/Widget_MyTasks.class.php | 2 +-
.../Widget_ProjectDocumentsActivity.class.php | 4 +-
.../widget/Widget_ProjectLatestDocuments.class.php | 2 +-
.../extsubproj/include/extsubprojPlugin.class.php | 6 +-
src/plugins/forumml/www/forumml_utils.php | 2 +-
src/plugins/forumml/www/message.php | 2 +-
src/plugins/forumml/www/upload.php | 97 +++++++++++-----------
.../include/globaldashboardPlugin.class.php | 3 +-
src/plugins/hudson/include/hudsonPlugin.class.php | 12 ++-
src/plugins/hudson/include/hudsonViews.class.php | 7 +-
src/plugins/mailman/include/MailmanList.class.php | 34 +++-----
.../mailman/include/MailmanListFactory.class.php | 27 ++----
.../mailman/include/mailmanPlugin.class.php | 8 +-
src/plugins/mailman/www/mailman_utils.php | 27 ++----
.../controllers/CodendiOSLCConnector.php | 1 -
src/plugins/scmgit/common/GitPlugin.class.php | 6 +-
.../common/scmgit_Widget_MyRepositories.class.php | 2 +-
.../scmgit_Widget_UserRepositories.class.php | 2 +-
src/www/widgets/widgets.php | 10 +--
28 files changed, 133 insertions(+), 186 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
