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 c2c575b09d2137f68012c8c090995b3fbdd7e345 (commit)
via 350e45a30b6250b6149e8b6d9aeaf91dcaa735eb (commit)
via 00c9488ec63f297f8d1c6784910b5842489382a2 (commit)
via 9a1f9be92be3d37f2e652b4cdd012837626b0aeb (commit)
via 367820c954745615ac8a3dc633253d200049328e (commit)
via 17f2343e46dad53f992da35eda714726ab4aa34d (commit)
via cad06ef0f86e4d52a81adbbad547c6b45f4feff2 (commit)
via 3055890e1c12eca8fd6dcf176a8838bf0b0e349f (commit)
from 3aa362f0c76f7ea8283af6126bce1e99a8876381 (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=c2c575b09d2137f68012c8c090995b3fbdd7e345
commit c2c575b09d2137f68012c8c090995b3fbdd7e345
Merge: 3aa362f 350e45a
Author: Roland Mas <[email protected]>
Date: Tue Apr 19 12:24:34 2016 +0200
Merge branch '6.0'
diff --cc src/common/forum/ForumHTML.class.php
index 8840c85,c2b1f35..9b28f7d
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@@ -172,8 -173,8 +172,8 @@@ class ForumHTML extends FFError
*/
var $Forum;
- function ForumHTML(&$Forum) {
+ function __construct(&$Forum) {
- $this->Error();
+ parent::__construct();
if (!$Forum || !is_object($Forum)) {
$this->setError(_('Invalid Forum Object'));
return false;
diff --cc src/common/include/FusionForge.class.php
index 820c777,fd896cb..a699fb6
--- a/src/common/include/FusionForge.class.php
+++ b/src/common/include/FusionForge.class.php
@@@ -22,20 -21,18 +22,20 @@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
- require_once $gfcommon.'include/Error.class.php';
+ require_once $gfcommon.'include/FFError.class.php';
- class FusionForge extends Error {
+ class FusionForge extends FFError {
- var $software_name = "FusionForge" ;
- var $software_version ;
+ var $software_name = "FusionForge";
+ var $software_version;
+
+ public static $instance;
/**
* FusionForge - FusionForge object constructor
*/
- function FusionForge() {
+ function __construct() {
- $this->Error();
+ parent::__construct();
$pkg = dirname(dirname(__FILE__)).'/pkginfo.inc.php';
if (file_exists($pkg)) {
diff --cc src/common/include/Group.class.php
index 120370d,4518f23..93d05dc
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@@ -193,43 -184,8 +193,43 @@@ function group_get_public_active_projec
return $projects;
}
+/**
+ * group_get_readable_projects_using_tag_asc() - Get a list of group_id for
active projects (initially in trove/tag_cloud)
+ *
+ * @param string $selected_tag Tag to search
+ * @param int $max_query_limit Optional Maximum number of rows
to limit query length
+ * @param int $offset start to retrieve rows from
offset value
+ * @return array List of public active projects
+ */
+function group_get_readable_projects_using_tag_asc($selected_tag,
$max_query_limit = -1, $offset = 0) {
+ $role_id = 1;
+ if (session_loggedin()) {
+ global $LUSER;
+ $userRoles = $LUSER->getRoles();
+ if (count($userRoles)) {
+ foreach ($userRoles as $r) {
+ $role_id .= ', '.$r->getID();
+ }
+ }
+ }
+
+ $res_grp = db_query_params ('SELECT groups.group_id, group_name,
unix_group_name, short_description, register_time
+ FROM project_tags, groups
+ WHERE LOWER(name) = $1
+ AND project_tags.group_id = groups.group_id
+ AND groups.status = $2 AND groups.type_id=1 AND
groups.is_template=0 AND groups.register_time > 0
+ AND groups.group_id in (select ref_id FROM pfo_role_setting
WHERE section_name = $3 and perm_val = 1 and role_id IN ('.$role_id.'))
+ ORDER BY groups.group_name ASC',
+ array(strtolower($selected_tag), 'A', 'project_read'),
+ $max_query_limit, $offset);
+ $projects = array();
+ while ($row_grp = db_fetch_array($res_grp)) {
+ $projects[] = $row_grp;
+ }
+ return $projects;
+}
- class Group extends Error {
+ class Group extends FFError {
/**
* Associative array of data from db.
*
diff --cc src/debian/changelog
index 186464f,f91245c..5b2dd1f
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+fusionforge (6.0.50-0) UNRELEASED; urgency=medium
+
+ * New snapshot from master branch.
+
+ -- Roland Mas <[email protected]> Wed, 24 Jun 2015 11:32:26 +0200
+
+ fusionforge (6.0.3+20160419-0) UNRELEASED; urgency=medium
+
+ * Update packaging to work with php7.0 (not only php5).
+
+ -- Roland Mas <[email protected]> Tue, 19 Apr 2016 10:01:27 +0200
+
fusionforge (6.0.3+20151023-1) unstable; urgency=medium
* New upstream snapshot following the 6.0 stable branch
diff --cc src/plugins/taskboard/common/TaskBoard.class.php
index 39b222e,181d7f3..c113258
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@@ -88,9 -88,9 +88,9 @@@ class TaskBoard extends FFError
var $data_array;
function TaskBoard($Group, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
- $this->setError('No Valid Group Object');
+ $this->setError(_('No Valid Group Object'));
return false;
}
if ($Group->isError()) {
diff --cc src/www/include/Layout.class.php
index d05fafd,fa6b5c0..3c6af0e
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@@ -116,9 -116,9 +116,9 @@@ class Layout extends FFError
/**
* Layout() - Constructor
*/
- function Layout() {
+ function __construct() {
// parent constructor
- $this->Error();
+ parent::__construct();
$this->navigation = new Navigation();
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 6 +++---
src/common/docman/DocumentFactory.class.php | 6 +++---
src/common/docman/DocumentGroup.class.php | 6 +++---
src/common/docman/DocumentGroupFactory.class.php | 10 +++++++---
src/common/docman/DocumentManager.class.php | 6 +++---
src/common/forum/AttachManager.class.php | 2 +-
src/common/forum/Forum.class.php | 6 +++---
src/common/forum/ForumAdmin.class.php | 4 ++--
src/common/forum/ForumFactory.class.php | 6 +++---
src/common/forum/ForumHTML.class.php | 4 ++--
src/common/forum/ForumMessage.class.php | 6 +++---
src/common/forum/ForumMessageFactory.class.php | 6 +++---
src/common/frs/FRSFile.class.php | 6 +++---
src/common/frs/FRSFileProcessorType.class.php | 6 +++---
src/common/frs/FRSFileType.class.php | 6 +++---
src/common/frs/FRSPackage.class.php | 6 +++---
src/common/frs/FRSPackageFactory.class.php | 6 +++---
src/common/frs/FRSRelease.class.php | 6 +++---
src/common/frs/FRSReleaseFactory.class.php | 6 +++---
src/common/include/DatabaseInstaller.class.php | 2 +-
.../include/{Error.class.php => FFError.class.php} | 4 ++--
src/common/include/FusionForge.class.php | 6 +++---
src/common/include/Group.class.php | 4 ++--
src/common/include/GroupJoinRequest.class.php | 6 +++---
src/common/include/MailParser.class.php | 6 +++---
src/common/include/MonitorElement.class.php | 2 +-
src/common/include/Navigation.class.php | 4 ++--
src/common/include/Permission.class.php | 4 ++--
src/common/include/Plugin.class.php | 4 ++--
src/common/include/PluginManager.class.php | 4 ++--
src/common/include/PluginPersistence.class.php | 2 +-
src/common/include/RBAC.php | 2 +-
src/common/include/RBACEngine.class.php | 2 +-
src/common/include/Stats.class.php | 4 ++--
src/common/include/Storage.class.php | 2 +-
src/common/include/SysTasksQ.class.php | 2 +-
src/common/include/System.class.php | 6 +++---
src/common/include/TextSanitizer.class.php | 2 +-
src/common/include/TroveCat.class.php | 2 +-
src/common/include/User.class.php | 4 ++--
src/common/include/pre.php | 2 +-
src/common/mail/MailingList.class.php | 6 +++---
src/common/mail/MailingListFactory.class.php | 6 +++---
src/common/pm/ProjectCategory.class.php | 6 +++---
src/common/pm/ProjectGroup.class.php | 6 +++---
src/common/pm/ProjectGroupFactory.class.php | 6 +++---
src/common/pm/ProjectTask.class.php | 6 +++---
src/common/pm/ProjectTaskFactory.class.php | 6 +++---
src/common/pm/ProjectTasksForUser.class.php | 4 ++--
src/common/reporting/Report.class.php | 4 ++--
src/common/reporting/TimeEntry.class.php | 4 ++--
src/common/scm/SCMFactory.class.php | 6 +++---
src/common/search/SearchQuery.class.php | 2 +-
src/common/survey/Survey.class.php | 6 +++---
src/common/survey/SurveyFactory.class.php | 6 +++---
src/common/survey/SurveyQuestion.class.php | 6 +++---
src/common/survey/SurveyQuestionFactory.class.php | 6 +++---
src/common/survey/SurveyResponse.class.php | 6 +++---
src/common/survey/SurveyResponseFactory.class.php | 6 +++---
src/common/tracker/Artifact.class.php | 6 +++---
src/common/tracker/ArtifactCanned.class.php | 6 +++---
src/common/tracker/ArtifactExtraField.class.php | 6 +++---
src/common/tracker/ArtifactExtraFieldElement.class.php | 6 +++---
src/common/tracker/ArtifactFactory.class.php | 6 +++---
src/common/tracker/ArtifactFile.class.php | 6 +++---
src/common/tracker/ArtifactFromID.class.php | 4 ++--
src/common/tracker/ArtifactHistory.class.php | 6 +++---
src/common/tracker/ArtifactMessage.class.php | 6 +++---
src/common/tracker/ArtifactQuery.class.php | 6 +++---
src/common/tracker/ArtifactQueryFactory.class.php | 6 +++---
src/common/tracker/ArtifactType.class.php | 6 +++---
src/common/tracker/ArtifactTypeFactory.class.php | 6 +++---
src/common/tracker/ArtifactTypes.class.php | 6 +++---
src/common/tracker/ArtifactWorkflow.class.php | 4 ++--
src/common/tracker/Artifacts.class.php | 6 +++---
src/common/tracker/ArtifactsForUser.class.php | 4 ++--
src/common/tracker/Roadmap.class.php | 6 +++---
src/common/tracker/RoadmapFactory.class.php | 6 +++---
src/cronjobs/misc/forum_gateway.php | 4 ++--
src/cronjobs/misc/tracker_gateway.php | 4 ++--
src/debian/changelog | 6 ++++++
src/debian/control.in | 14 +++++++-------
src/locale/bg.po | 16 ++++++++--------
src/locale/ca.po | 16 ++++++++--------
src/locale/de.po | 16 ++++++++--------
src/locale/es.po | 16 ++++++++--------
src/locale/eu.po | 16 ++++++++--------
src/locale/fr.po | 16 ++++++++--------
src/locale/fusionforge.pot | 16 ++++++++--------
src/locale/gl.po | 16 ++++++++--------
src/locale/it.po | 16 ++++++++--------
src/locale/ja.po | 16 ++++++++--------
src/locale/ko.po | 16 ++++++++--------
src/locale/nl.po | 16 ++++++++--------
src/locale/pl.po | 16 ++++++++--------
src/locale/pt.po | 16 ++++++++--------
src/locale/ru.po | 16 ++++++++--------
src/locale/sv.po | 16 ++++++++--------
src/locale/th.po | 16 ++++++++--------
src/locale/zh_CN.po | 16 ++++++++--------
src/locale/zh_TW.po | 16 ++++++++--------
.../contribtracker/common/ContribTrackerPlugin.class.php | 12 ++++++------
src/plugins/mailman/include/MailmanList.class.php | 4 ++--
src/plugins/mailman/include/MailmanListFactory.class.php | 4 ++--
src/plugins/mailman/include/MailsForUser.class.php | 2 +-
src/plugins/projectimport/common/UploadedFiles.class.php | 2 +-
src/plugins/taskboard/common/TaskBoard.class.php | 6 +++---
src/plugins/taskboard/common/TaskBoardColumn.class.php | 6 +++---
.../taskboard/common/TaskBoardColumnSource.class.php | 4 ++--
src/plugins/taskboard/common/TaskBoardRelease.class.php | 6 +++---
src/plugins/wiki/common/wikiconfig.class.php | 2 +-
src/www/export/rssAboTask.php | 2 +-
src/www/include/Layout.class.php | 4 ++--
src/www/pm/include/ProjectTaskHTML.class.php | 2 +-
src/www/reporting/timeentry.php | 2 +-
.../search/include/renderers/SearchRenderer.class.php | 2 +-
src/www/soap/common/group.php | 2 +-
src/www/soap/common/user.php | 2 +-
src/www/soap/docman/docman.php | 2 +-
src/www/soap/frs/frs.php | 2 +-
src/www/soap/pm/pm.php | 2 +-
src/www/soap/reporting/timeentry.php | 2 +-
src/www/soap/tracker/query.php | 2 +-
src/www/soap/tracker/tracker.php | 2 +-
src/www/survey/include/SurveyHTML.class.php | 2 +-
src/www/trove/TroveCategory.class.php | 2 +-
src/www/trove/TroveCategoryLabel.class.php | 4 ++--
tests/unit/utils/TextSanitizerTest.php | 2 +-
tools/create_class.php | 6 +++---
129 files changed, 413 insertions(+), 403 deletions(-)
rename src/common/include/{Error.class.php => FFError.class.php} (99%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
