[Fusionforge-commits] r12684 - in branches/Branch_5_1/src: common/forum common/include common/widget www/admin www/forum
Alain Peyrat
aljeux at fusionforge.org
Fri Mar 11 18:08:51 CET 2011
Author: aljeux
Date: 2011-03-11 18:08:50 +0100 (Fri, 11 Mar 2011)
New Revision: 12684
Modified:
branches/Branch_5_1/src/common/forum/ForumAdmin.class.php
branches/Branch_5_1/src/common/forum/ForumHTML.class.php
branches/Branch_5_1/src/common/include/Navigation.class.php
branches/Branch_5_1/src/common/include/PluginManager.class.php
branches/Branch_5_1/src/common/include/session.php
branches/Branch_5_1/src/common/widget/Widget_MyArtifacts.class.php
branches/Branch_5_1/src/common/widget/Widget_MyBookmarks.class.php
branches/Branch_5_1/src/common/widget/Widget_MyMonitoredForums.class.php
branches/Branch_5_1/src/common/widget/Widget_MyProjects.class.php
branches/Branch_5_1/src/common/widget/Widget_MySurveys.class.php
branches/Branch_5_1/src/www/admin/admin_table.php
branches/Branch_5_1/src/www/forum/attachment.php
Log:
Minor: Mostly indent fixes
Modified: branches/Branch_5_1/src/common/forum/ForumAdmin.class.php
===================================================================
--- branches/Branch_5_1/src/common/forum/ForumAdmin.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/forum/ForumAdmin.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -65,7 +65,6 @@
return $return;
}
-
/**
* PrintAdminOptions - prints the different administrator option for the forums (heading).
*
Modified: branches/Branch_5_1/src/common/forum/ForumHTML.class.php
===================================================================
--- branches/Branch_5_1/src/common/forum/ForumHTML.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/forum/ForumHTML.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -628,9 +628,7 @@
} else {
//do nothing
}
-
}
-
}
// Local Variables:
// mode: php
Modified: branches/Branch_5_1/src/common/include/Navigation.class.php
===================================================================
--- branches/Branch_5_1/src/common/include/Navigation.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/include/Navigation.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -177,7 +177,6 @@
return $res;
}
-
/** Get an array of the user links (Login/Logout/My
Account/Register) with the following structure:
$result['titles']: list of the titles. $result['urls']: list
@@ -332,15 +331,14 @@
* false. $result['selected']: number of the menu entry that
* is currently selected.
*/
- function &getProjectMenu ($group_id, $toptab="") {
+ function getProjectMenu($group_id, $toptab="") {
// rebuild menu if it has never been built before, or
// if the toptab was set differently
if (!isset($this->project_menu_data[$group_id])
|| ($toptab != "")
- || ($toptab != $this->project_menu_data[$group_id]['last_toptab']))
- {
+ || ($toptab != $this->project_menu_data[$group_id]['last_toptab'])) {
// get the group and permission objects
- $group =& group_get_object($group_id);
+ $group = group_get_object($group_id);
if (!$group || !is_object($group)) {
return;
}
@@ -432,7 +430,6 @@
}
}
-
// Mailing Lists
if ($group->usesMail()) {
$menu['titles'][] = _('Lists');
@@ -445,7 +442,6 @@
if ($toptab == "mail") {
$selected = (count($menu['urls'])-1);
}
-
}
// Project/Task Manager
@@ -460,7 +456,6 @@
if ($toptab == "pm") {
$selected = (count($menu['urls'])-1);
}
-
}
// Doc Manager
@@ -475,7 +470,6 @@
if ($toptab == "docman") {
$selected = (count($menu['urls'])-1);
}
-
}
// Surveys
@@ -528,7 +522,6 @@
$hookParams['TITLES'] =& $menu['titles'];
$hookParams['toptab'] =& $toptab;
$hookParams['selected'] =& $selected;
-
plugin_hook ("groupmenu_scm", $hookParams) ;
// fill up adminurls
@@ -557,14 +550,10 @@
$hookParams['TITLES'] =& $menu['titles'];
$hookParams['toptab'] =& $toptab;
$hookParams['selected'] =& $selected;
-
plugin_hook ("groupmenu", $hookParams) ;
// fill up adminurls
- for ($i = 0;
- $i < count($menu['urls']) - count($menu['adminurls']);
- $i++)
- {
+ for ($i = 0; $i < count($menu['urls']) - count($menu['adminurls']); $i++) {
$menu['adminurls'][] = false;
}
@@ -607,7 +596,6 @@
* $result['title']: Title of the link.
*/
function getShowSource($asHTML=true) {
-
if (forge_get_config('show_source')) {
$res['url'] = util_make_url('/source.php?file='.getStringFromServer('SCRIPT_NAME'));
$res['title'] = _('Show source');
Modified: branches/Branch_5_1/src/common/include/PluginManager.class.php
===================================================================
--- branches/Branch_5_1/src/common/include/PluginManager.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/include/PluginManager.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -246,7 +246,6 @@
$result = $result && $returned ;
}
}
-
// Return true only if all the plugins have returned true.
return $result;
}
@@ -267,8 +266,8 @@
} else {
return 0 ;
}
-
}
+
function isPluginAllowedForProject($p, $group_id) {
$Group = group_get_object($group_id);
return $Group->usesPlugin($p->getName());
Modified: branches/Branch_5_1/src/common/include/session.php
===================================================================
--- branches/Branch_5_1/src/common/include/session.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/include/session.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -479,7 +479,6 @@
} else {
session_set_internal ($user_id, $res) ;
}
-
}
function session_set_internal ($user_id, $res=false) {
Modified: branches/Branch_5_1/src/common/widget/Widget_MyArtifacts.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/Widget_MyArtifacts.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/widget/Widget_MyArtifacts.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -41,9 +41,11 @@
UserManager::instance()->getCurrentUser()->setPreference('my_artifacts_show', $this->_artifact_show);
}
}
+
function getTitle() {
return _("My Artifacts");
}
+
function updatePreferences(&$request) {
$request->valid(new Valid_String('cancel'));
$vShow = new Valid_WhiteList('show', array('A', 'S', 'N', 'AS'));
@@ -69,9 +71,11 @@
}
return true;
}
+
function hasPreferences() {
return true;
}
+
function getPreferences() {
$prefs = '';
$prefs .= _("Display artifacts:").' <select name="show">';
@@ -82,9 +86,11 @@
return $prefs;
}
+
function isAjax() {
return true;
}
+
function getContent() {
$html_my_artifacts = '<table style="width:100%">';
$atf = new ArtifactsForUser(@UserManager::instance()->getCurrentUser());
@@ -110,6 +116,7 @@
$html_my_artifacts .= '</table>';
return $html_my_artifacts;
}
+
function _display_artifacts($list_trackers, $print_box_begin) {
$request = HTTPRequest::instance();
$vItemId = new Valid_UInt('hide_item_id');
@@ -248,9 +255,11 @@
}
return $html_my_artifacts;
}
+
function getCategory() {
return 'Trackers';
}
+
function getDescription() {
return _("List artifacts you have submitted or assigned to you, by project.");
}
Modified: branches/Branch_5_1/src/common/widget/Widget_MyBookmarks.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/Widget_MyBookmarks.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/widget/Widget_MyBookmarks.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -30,9 +30,11 @@
function Widget_MyBookmarks() {
$this->Widget('mybookmarks');
}
+
function getTitle() {
return _("My Bookmarks");
}
+
function getContent() {
$html_my_bookmarks = '';
$result = db_query_params("SELECT bookmark_url, bookmark_title, bookmark_id from user_bookmarks where ".
@@ -64,6 +66,7 @@
$html_my_bookmarks .= '<div style="text-align:center; font-size:0.8em;"><a href="/my/bookmark_add.php">['. _("Add a bookmark") .']</a></div>';
return $html_my_bookmarks;
}
+
function getDescription() {
return sprintf(_('List your favorite bookmarks (your favorite pages in %1$s or external).<br />Note that in many cases %1$s uses URL with enough embedded information to bookmark sophisticated items like Software Map browsing, typical search in your project Bug or Task database, etc. <br />Bookmarked items can be edited which means that both the title of the bookmark and its destination URL can be modified.'), forge_get_config('forge_name'));
}
Modified: branches/Branch_5_1/src/common/widget/Widget_MyMonitoredForums.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/Widget_MyMonitoredForums.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/widget/Widget_MyMonitoredForums.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -106,8 +106,6 @@
$class="bgcolor-grey";
}
-
-
$group_forum_id = db_result($result2,$i,'group_forum_id');
$html .= '
Modified: branches/Branch_5_1/src/common/widget/Widget_MyProjects.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/Widget_MyProjects.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/widget/Widget_MyProjects.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -33,6 +33,7 @@
function getTitle() {
return _("My Projects");
}
+
function getContent() {
$html_my_projects = '';
@@ -146,6 +147,7 @@
);
}
}
+
function getDescription() {
return _("List the projects you belong to. Selecting any of these projects brings you to the corresponding Project Summary page.");
}
Modified: branches/Branch_5_1/src/common/widget/Widget_MySurveys.class.php
===================================================================
--- branches/Branch_5_1/src/common/widget/Widget_MySurveys.class.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/common/widget/Widget_MySurveys.class.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -97,7 +97,6 @@
$class="bgcolor-grey";
}
-
$group_survey_id= $survey->getId();
$survey_title = $survey->getTitle();
$devsurvey_is_active = $survey->isActive();
Modified: branches/Branch_5_1/src/www/admin/admin_table.php
===================================================================
--- branches/Branch_5_1/src/www/admin/admin_table.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/www/admin/admin_table.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -253,10 +253,6 @@
echo db_error();
}
-
-
-
-
$field_list = getStringFromRequest('__fields__');
$fields = explode(",", $field_list);
$values = array(); $v = array ();
Modified: branches/Branch_5_1/src/www/forum/attachment.php
===================================================================
--- branches/Branch_5_1/src/www/forum/attachment.php 2011-03-11 17:03:41 UTC (rev 12683)
+++ branches/Branch_5_1/src/www/forum/attachment.php 2011-03-11 17:08:50 UTC (rev 12684)
@@ -1,5 +1,4 @@
<?php
-
/**
* FusionForge Forum Attachments download Page
*
@@ -7,8 +6,6 @@
* The rest Copyright 2002-2004 (c) GForge Team
* http://fusionforge.org/
*
- * @version
- *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
More information about the Fusionforge-commits
mailing list