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, 6.0 has been updated
via 350e45a30b6250b6149e8b6d9aeaf91dcaa735eb (commit)
from 00c9488ec63f297f8d1c6784910b5842489382a2 (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=350e45a30b6250b6149e8b6d9aeaf91dcaa735eb
commit 350e45a30b6250b6149e8b6d9aeaf91dcaa735eb
Author: Roland Mas <[email protected]>
Date: Tue Apr 19 11:20:34 2016 +0200
Fixed references to constructor in derived classes
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index b6e3c04..d33bdd1 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -90,7 +90,7 @@ class Document extends FFError {
* @return \Document
*/
function __construct(&$Group, $docid = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/docman/DocumentFactory.class.php
b/src/common/docman/DocumentFactory.class.php
index f234798..0686fae 100644
--- a/src/common/docman/DocumentFactory.class.php
+++ b/src/common/docman/DocumentFactory.class.php
@@ -87,7 +87,7 @@ class DocumentFactory extends FFError {
* @access public
*/
function __construct(&$Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index 042d85d..22d5de9 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -87,7 +87,7 @@ class DocumentGroup extends FFError {
* @access public
*/
function __construct(&$Group, $data = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/docman/DocumentGroupFactory.class.php
b/src/common/docman/DocumentGroupFactory.class.php
index d4a1096..c849b7f 100644
--- a/src/common/docman/DocumentGroupFactory.class.php
+++ b/src/common/docman/DocumentGroupFactory.class.php
@@ -55,7 +55,7 @@ class DocumentGroupFactory extends FFError {
* @return \DocumentGroupFactory
*/
function __construct(&$Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/docman/DocumentManager.class.php
b/src/common/docman/DocumentManager.class.php
index 424208b..229c094 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -52,7 +52,7 @@ class DocumentManager extends FFError {
* @return \DocumentManager
*/
function __construct(&$Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/forum/Forum.class.php b/src/common/forum/Forum.class.php
index b6d9456..416bda1 100644
--- a/src/common/forum/Forum.class.php
+++ b/src/common/forum/Forum.class.php
@@ -105,7 +105,7 @@ class Forum extends FFError {
* @return \Forum success.
*/
function __construct(&$Group, $group_forum_id = false, $arr = false,
$is_news = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/forum/ForumAdmin.class.php
b/src/common/forum/ForumAdmin.class.php
index f922a1e..915cd91 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -31,7 +31,7 @@ class ForumAdmin extends FFError {
var $p,$g;
function __construct($group_id) {
- $this->Error();
+ parent::__construct();
$this->group_id = $group_id;
if ($group_id) {
$this->group_id = $group_id;
diff --git a/src/common/forum/ForumFactory.class.php
b/src/common/forum/ForumFactory.class.php
index 2d5b7e7..1da8c9ec 100644
--- a/src/common/forum/ForumFactory.class.php
+++ b/src/common/forum/ForumFactory.class.php
@@ -47,7 +47,7 @@ class ForumFactory extends FFError {
* @param object $Group The Group object to which this forum is
associated.
*/
function __construct(&$Group, $skip_check=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/forum/ForumHTML.class.php
b/src/common/forum/ForumHTML.class.php
index 3f4d9d7..c2b1f35 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -174,7 +174,7 @@ class ForumHTML extends FFError {
var $Forum;
function ForumHTML(&$Forum) {
- $this->Error();
+ parent::__construct();
if (!$Forum || !is_object($Forum)) {
$this->setError(_('Invalid Forum Object'));
return false;
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index e199c88..4f2674d 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -55,7 +55,7 @@ class ForumMessage extends FFError {
* @return bool success.
*/
function ForumMessage(&$Forum, $msg_id=false, $arr=array(),
$pending=false) {
- $this->Error();
+ parent::__construct();
if (!$Forum || !is_object($Forum)) {
$this->setError(_('Invalid Forum Object'));
return false;
diff --git a/src/common/forum/ForumMessageFactory.class.php
b/src/common/forum/ForumMessageFactory.class.php
index 47ab897..cfc75f1 100644
--- a/src/common/forum/ForumMessageFactory.class.php
+++ b/src/common/forum/ForumMessageFactory.class.php
@@ -53,7 +53,7 @@ class ForumMessageFactory extends FFError {
* @return boolean success.
*/
function ForumMessageFactory(&$Forum) {
- $this->Error();
+ parent::__construct();
if (!$Forum || !is_object($Forum)) {
$this->setError(_("Invalid group_form_id"));
return false;
diff --git a/src/common/frs/FRSFile.class.php b/src/common/frs/FRSFile.class.php
index 1a09198..7148a83 100644
--- a/src/common/frs/FRSFile.class.php
+++ b/src/common/frs/FRSFile.class.php
@@ -76,7 +76,7 @@ class FRSFile extends FFError {
* @return \FRSFile
*/
function __construct(&$FRSRelease, $file_id=false, $arr=false) {
- $this->Error();
+ parent::__construct();
if (!$FRSRelease || !is_object($FRSRelease)) {
$this->setError(_('Invalid FRS Release Object'));
return;
diff --git a/src/common/frs/FRSFileProcessorType.class.php
b/src/common/frs/FRSFileProcessorType.class.php
index 598e29a..90d7aaf 100644
--- a/src/common/frs/FRSFileProcessorType.class.php
+++ b/src/common/frs/FRSFileProcessorType.class.php
@@ -45,7 +45,7 @@ class FRSFileProcessorType extends FFError {
var $data_array;
function FRSFileProcessorType($processor_id, $name) {
- $this->Error();
+ parent::__construct();
$this->data_array = array( 'processor_id' => $processor_id,
'name' => $name);
}
diff --git a/src/common/frs/FRSFileType.class.php
b/src/common/frs/FRSFileType.class.php
index a36c447..6dbe710 100644
--- a/src/common/frs/FRSFileType.class.php
+++ b/src/common/frs/FRSFileType.class.php
@@ -45,7 +45,7 @@ class FRSFileType extends FFError {
var $data_array;
function FRSFileType ($type_id=false, $name=false) {
- $this->Error();
+ parent::__construct();
if($type_id && $name) {
$this->data_array = array( 'type_id' => $type_id,
'name' => $name);
}
diff --git a/src/common/frs/FRSPackage.class.php
b/src/common/frs/FRSPackage.class.php
index a52084d..d73c782 100644
--- a/src/common/frs/FRSPackage.class.php
+++ b/src/common/frs/FRSPackage.class.php
@@ -119,7 +119,7 @@ class FRSPackage extends FFError {
* @return \FRSPackage
*/
function __construct(&$Group, $package_id = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/frs/FRSPackageFactory.class.php
b/src/common/frs/FRSPackageFactory.class.php
index 028719e..59333c4 100644
--- a/src/common/frs/FRSPackageFactory.class.php
+++ b/src/common/frs/FRSPackageFactory.class.php
@@ -45,7 +45,7 @@ class FRSPackageFactory extends FFError {
* @param Group $Group The Group object to which these FRSs are
associated.
*/
function __construct(& $Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/frs/FRSRelease.class.php
b/src/common/frs/FRSRelease.class.php
index 0cd49d7..468f0f7 100644
--- a/src/common/frs/FRSRelease.class.php
+++ b/src/common/frs/FRSRelease.class.php
@@ -80,7 +80,7 @@ class FRSRelease extends FFError {
* @return bool success.
*/
function FRSRelease(&$FRSPackage, $release_id = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$FRSPackage || !is_object($FRSPackage)) {
$this->setError(_('Invalid FRS Package Object'));
return false;
diff --git a/src/common/frs/FRSReleaseFactory.class.php
b/src/common/frs/FRSReleaseFactory.class.php
index a5f736f..7dfd361 100644
--- a/src/common/frs/FRSReleaseFactory.class.php
+++ b/src/common/frs/FRSReleaseFactory.class.php
@@ -54,7 +54,7 @@ class FRSReleaseFactory extends FFError {
* @param Group $Group The Group object to which these FRSRs
are associated.
*/
function __construct(& $Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/include/FusionForge.class.php
b/src/common/include/FusionForge.class.php
index 61283f4..fd896cb 100644
--- a/src/common/include/FusionForge.class.php
+++ b/src/common/include/FusionForge.class.php
@@ -32,7 +32,7 @@ class FusionForge extends FFError {
* FusionForge - FusionForge object constructor
*/
function FusionForge() {
- $this->Error();
+ parent::__construct();
$pkg = dirname(dirname(__FILE__)).'/pkginfo.inc.php';
if (file_exists($pkg)) {
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 40f9095..4518f23 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -236,7 +236,7 @@ class Group extends FFError {
* @param int|bool $res Database result from select
query OR associative array of all columns.
*/
function __construct($id = false, $res = false) {
- $this->Error();
+ parent::__construct();
if (!$id) {
//setting up an empty object
//probably going to call create()
diff --git a/src/common/include/GroupJoinRequest.class.php
b/src/common/include/GroupJoinRequest.class.php
index cea3662..6f24be7 100644
--- a/src/common/include/GroupJoinRequest.class.php
+++ b/src/common/include/GroupJoinRequest.class.php
@@ -59,7 +59,7 @@ class GroupJoinRequest extends FFError {
* @return \GroupJoinRequest
*/
function __construct($Group = false, $user_id = false, $arr = false) {
- $this->error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/include/MailParser.class.php
b/src/common/include/MailParser.class.php
index 1f21596..c02a173 100644
--- a/src/common/include/MailParser.class.php
+++ b/src/common/include/MailParser.class.php
@@ -29,7 +29,7 @@ class MailParser extends FFError {
var $body;
function MailParser($input_file) {
- $this->Error();
+ parent::__construct();
$size = filesize($input_file);
if ($size > $this->max_file_size) {
return $this->setError(_("Error: file too large"));
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index 2d551af..a705f6b 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -44,7 +44,7 @@ class Navigation extends FFError {
* Constructor
*/
function Navigation() {
- $this->Error();
+ parent::__construct();
return true;
}
diff --git a/src/common/include/Plugin.class.php
b/src/common/include/Plugin.class.php
index c9803b0..ac0684d 100644
--- a/src/common/include/Plugin.class.php
+++ b/src/common/include/Plugin.class.php
@@ -42,7 +42,7 @@ class Plugin extends FFError {
* @param int $id
*/
function Plugin($id=0) {
- $this->Error();
+ parent::__construct();
$this->name = false;
$this->hooks = array();
}
diff --git a/src/common/include/PluginManager.class.php
b/src/common/include/PluginManager.class.php
index b0b1b75..c5b72c5 100644
--- a/src/common/include/PluginManager.class.php
+++ b/src/common/include/PluginManager.class.php
@@ -33,7 +33,7 @@ class PluginManager extends FFError {
*
*/
function PluginManager() {
- $this->Error();
+ parent::__construct();
$this->plugins_objects = array();
$this->plugins_to_hooks = array();
$this->hooks_to_plugins = array();
diff --git a/src/common/include/Stats.class.php
b/src/common/include/Stats.class.php
index 6329d25..b3c871d 100644
--- a/src/common/include/Stats.class.php
+++ b/src/common/include/Stats.class.php
@@ -30,7 +30,7 @@ class Stats extends FFError {
* Stats - Stats object constructor
*/
function Stats() {
- $this->Error();
+ parent::__construct();
return true;
}
diff --git a/src/common/include/System.class.php
b/src/common/include/System.class.php
index 6e649b8..80bd941 100644
--- a/src/common/include/System.class.php
+++ b/src/common/include/System.class.php
@@ -28,7 +28,7 @@ class System extends FFError {
*
*/
function System() {
- $this->Error();
+ parent::__construct();
return true;
}
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index e8fa012..9798467 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -232,7 +232,7 @@ class GFUser extends FFError {
* @param bool|int $res The database result set OR array of data
*/
function __construct($id = false, $res = false) {
- $this->Error();
+ parent::__construct();
if (!$id) {
//setting up an empty object
//probably going to call create()
diff --git a/src/common/mail/MailingList.class.php
b/src/common/mail/MailingList.class.php
index 57f685f..c6e4076 100644
--- a/src/common/mail/MailingList.class.php
+++ b/src/common/mail/MailingList.class.php
@@ -61,7 +61,7 @@ class MailingList extends FFError {
* @return \MailingList
*/
function __construct(&$Group, $groupListId = false, $dataArray = false)
{
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/mail/MailingListFactory.class.php
b/src/common/mail/MailingListFactory.class.php
index 80fd651..49b5316 100644
--- a/src/common/mail/MailingListFactory.class.php
+++ b/src/common/mail/MailingListFactory.class.php
@@ -48,7 +48,7 @@ class MailingListFactory extends FFError {
* @param Group $Group The Group object to which these mailing
lists are associated.
*/
function __construct(&$Group, $skip_check=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/common/pm/ProjectCategory.class.php
b/src/common/pm/ProjectCategory.class.php
index 978bac1..224b214 100644
--- a/src/common/pm/ProjectCategory.class.php
+++ b/src/common/pm/ProjectCategory.class.php
@@ -48,7 +48,7 @@ class ProjectCategory extends FFError {
* @return boolean success.
*/
function ProjectCategory(&$ProjectGroup, $data=false) {
- $this->Error();
+ parent::__construct();
//was ProjectGroup legit?
if (!$ProjectGroup || !is_object($ProjectGroup)) {
diff --git a/src/common/pm/ProjectGroup.class.php
b/src/common/pm/ProjectGroup.class.php
index 313e1cc..9b24efc 100644
--- a/src/common/pm/ProjectGroup.class.php
+++ b/src/common/pm/ProjectGroup.class.php
@@ -98,7 +98,7 @@ class ProjectGroup extends FFError {
* @return \ProjectGroup
*/
function ProjectGroup(&$Group, $group_project_id = false, $arr = false)
{
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/pm/ProjectGroupFactory.class.php
b/src/common/pm/ProjectGroupFactory.class.php
index 177445c..7b026b9 100644
--- a/src/common/pm/ProjectGroupFactory.class.php
+++ b/src/common/pm/ProjectGroupFactory.class.php
@@ -49,7 +49,7 @@ class ProjectGroupFactory extends FFError {
* @return \ProjectGroupFactory
*/
function __construct(&$Group, $skip_check=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/pm/ProjectTask.class.php
b/src/common/pm/ProjectTask.class.php
index a322d00..7634dca 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -89,7 +89,7 @@ class ProjectTask extends FFError {
* @return boolean success.
*/
function ProjectTask(&$ProjectGroup, $project_task_id=false,
$arr=false) {
- $this->Error();
+ parent::__construct();
if (!$ProjectGroup || !is_object($ProjectGroup)) {
$this->setError('No Valid ProjectGroup Object');
return false;
diff --git a/src/common/pm/ProjectTaskFactory.class.php
b/src/common/pm/ProjectTaskFactory.class.php
index a56592f..4d3b84f 100644
--- a/src/common/pm/ProjectTaskFactory.class.php
+++ b/src/common/pm/ProjectTaskFactory.class.php
@@ -59,7 +59,7 @@ class ProjectTaskFactory extends FFError {
* @return boolean success.
*/
function ProjectTaskFactory(&$ProjectGroup) {
- $this->Error();
+ parent::__construct();
if (!$ProjectGroup || !is_object($ProjectGroup)) {
$this->setError('ProjectTask: No Valid ProjectGroup
Object');
return false;
diff --git a/src/common/reporting/Report.class.php
b/src/common/reporting/Report.class.php
index 6f7957e..2d95b61 100644
--- a/src/common/reporting/Report.class.php
+++ b/src/common/reporting/Report.class.php
@@ -52,7 +52,7 @@ var $max_month = 24;
var $rawdates = array();
function Report() {
- $this->Error();
+ parent::__construct();
//
// All reporting action will be done in GMT timezone
//
diff --git a/src/common/scm/SCMFactory.class.php
b/src/common/scm/SCMFactory.class.php
index 9b8fb06..7ec6f9a 100644
--- a/src/common/scm/SCMFactory.class.php
+++ b/src/common/scm/SCMFactory.class.php
@@ -40,7 +40,7 @@ class SCMFactory extends FFError {
*/
function SCMFactory() {
- $this->Error();
+ parent::__construct();
if (!forge_get_config('use_scm')) {
$this->setError('SCMFactory::sys_use_scm');
return false;
diff --git a/src/common/survey/Survey.class.php
b/src/common/survey/Survey.class.php
index 9199441..d0e0ac0 100644
--- a/src/common/survey/Survey.class.php
+++ b/src/common/survey/Survey.class.php
@@ -61,7 +61,7 @@ class Survey extends FFError {
* @return \Survey
*/
function __construct(&$Group, $survey_id = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/survey/SurveyFactory.class.php
b/src/common/survey/SurveyFactory.class.php
index 90def1e..b886404 100644
--- a/src/common/survey/SurveyFactory.class.php
+++ b/src/common/survey/SurveyFactory.class.php
@@ -49,7 +49,7 @@ class SurveyFactory extends FFError {
* @param object $Group The Group object to which this survey
is associated.
*/
function __construct(&$Group, $skip_check=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/survey/SurveyQuestion.class.php
b/src/common/survey/SurveyQuestion.class.php
index f45a3c9..05bb3c6 100644
--- a/src/common/survey/SurveyQuestion.class.php
+++ b/src/common/survey/SurveyQuestion.class.php
@@ -52,7 +52,7 @@ class SurveyQuestion extends FFError {
* @return \SurveyQuestion
*/
function __construct(&$Group, $question_id = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/survey/SurveyQuestionFactory.class.php
b/src/common/survey/SurveyQuestionFactory.class.php
index 222c776..2140714 100644
--- a/src/common/survey/SurveyQuestionFactory.class.php
+++ b/src/common/survey/SurveyQuestionFactory.class.php
@@ -48,7 +48,7 @@ class SurveyQuestionFactory extends FFError {
* @param object $Group The Group object to which this survey
question is associated.
*/
function __construct(&$Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/survey/SurveyResponse.class.php
b/src/common/survey/SurveyResponse.class.php
index 6162fff..36b19e0 100644
--- a/src/common/survey/SurveyResponse.class.php
+++ b/src/common/survey/SurveyResponse.class.php
@@ -50,7 +50,7 @@ class SurveyResponse extends FFError {
* @return \SurveyResponse
*/
function __construct(&$Group, $arr=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/survey/SurveyResponseFactory.class.php
b/src/common/survey/SurveyResponseFactory.class.php
index df18d4d..acfce5f 100644
--- a/src/common/survey/SurveyResponseFactory.class.php
+++ b/src/common/survey/SurveyResponseFactory.class.php
@@ -70,7 +70,7 @@ class SurveyResponseFactory extends FFError {
* @param object $question The Question object to which
this survey Response is associated.
*/
function __construct(&$survey, &$question ) {
- $this->Error();
+ parent::__construct();
if (!$survey || !is_object($survey)) {
$this->setError(_('No valid Survey Object'));
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index ffc06be..581cbcf 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -142,7 +142,7 @@ class Artifact extends FFError {
* ONLY OPTIONAL WHEN YOU
PLAN TO IMMEDIATELY CALL ->create()
*/
function __construct(&$ArtifactType, $data=false) {
- $this->Error();
+ parent::__construct();
$this->ArtifactType =& $ArtifactType;
diff --git a/src/common/tracker/ArtifactCanned.class.php
b/src/common/tracker/ArtifactCanned.class.php
index b5eea64..66032d7 100644
--- a/src/common/tracker/ArtifactCanned.class.php
+++ b/src/common/tracker/ArtifactCanned.class.php
@@ -48,7 +48,7 @@ class ArtifactCanned extends FFError {
* @return ArtifactCanned success.
*/
function __construct(&$ArtifactType, $data=false) {
- $this->Error();
+ parent::__construct();
// Was ArtifactType legit?
if (!$ArtifactType || !is_object($ArtifactType)) {
diff --git a/src/common/tracker/ArtifactExtraField.class.php
b/src/common/tracker/ArtifactExtraField.class.php
index 0661216..7bef6b0 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -62,7 +62,7 @@ class ArtifactExtraField extends FFError {
* @param bool $data
*/
function __construct(&$ArtifactType, $data=false) {
- $this->Error();
+ parent::__construct();
//was ArtifactType legit?
if (!$ArtifactType || !is_object($ArtifactType)) {
diff --git a/src/common/tracker/ArtifactExtraFieldElement.class.php
b/src/common/tracker/ArtifactExtraFieldElement.class.php
index 0c4c9f2..4e09747 100644
--- a/src/common/tracker/ArtifactExtraFieldElement.class.php
+++ b/src/common/tracker/ArtifactExtraFieldElement.class.php
@@ -70,7 +70,7 @@ class ArtifactExtraFieldElement extends FFError {
* @param array|bool $data (all fields
from artifact_file_user_vw) OR id from database.
*/
function __construct(&$ArtifactExtraField,$data=false) {
- $this->Error();
+ parent::__construct();
// Was ArtifactExtraField legit?
if (!$ArtifactExtraField || !is_object($ArtifactExtraField)) {
diff --git a/src/common/tracker/ArtifactFactory.class.php
b/src/common/tracker/ArtifactFactory.class.php
index b902563..4bf6d1f 100644
--- a/src/common/tracker/ArtifactFactory.class.php
+++ b/src/common/tracker/ArtifactFactory.class.php
@@ -70,7 +70,7 @@ class ArtifactFactory extends FFError {
* @param object $ArtifactType The ArtifactType object to
which this ArtifactFactory is associated.
*/
function __construct(&$ArtifactType) {
- $this->Error();
+ parent::__construct();
if (!$ArtifactType || !is_object($ArtifactType)) {
$this->setError('ArtifactFactory: No Valid ArtifactType
Object');
return;
diff --git a/src/common/tracker/ArtifactFile.class.php
b/src/common/tracker/ArtifactFile.class.php
index 1404bab..9880244 100644
--- a/src/common/tracker/ArtifactFile.class.php
+++ b/src/common/tracker/ArtifactFile.class.php
@@ -75,7 +75,7 @@ class ArtifactFile extends FFError {
* @param array|bool $data (all fields from
artifact_file_user_vw) OR id from database.
*/
function __construct(&$Artifact, $data=false) {
- $this->Error();
+ parent::__construct();
// Was Artifact legit?
if (!$Artifact || !is_object($Artifact)) {
diff --git a/src/common/tracker/ArtifactHistory.class.php
b/src/common/tracker/ArtifactHistory.class.php
index a6ee74b..ac533c6 100644
--- a/src/common/tracker/ArtifactHistory.class.php
+++ b/src/common/tracker/ArtifactHistory.class.php
@@ -46,7 +46,7 @@ class ArtifactHistory extends FFError {
* @param array|bool $data (all fields from
artifact_history_user_vw) OR id from database.
*/
function __construct(&$Artifact, $data=false) {
- $this->Error();
+ parent::__construct();
//was Artifact legit?
if (!$Artifact || !is_object($Artifact)) {
diff --git a/src/common/tracker/ArtifactMessage.class.php
b/src/common/tracker/ArtifactMessage.class.php
index 114babb..6bbde60 100644
--- a/src/common/tracker/ArtifactMessage.class.php
+++ b/src/common/tracker/ArtifactMessage.class.php
@@ -46,7 +46,7 @@ class ArtifactMessage extends FFError {
* @param array|bool $data (all fields from
artifact_history_user_vw) OR id from database.
*/
function __construct(&$Artifact, $data=false) {
- $this->Error();
+ parent::__construct();
//was Artifact legit?
if (!$Artifact || !is_object($Artifact)) {
diff --git a/src/common/tracker/ArtifactQuery.class.php
b/src/common/tracker/ArtifactQuery.class.php
index 0b1842e..bca5cac 100644
--- a/src/common/tracker/ArtifactQuery.class.php
+++ b/src/common/tracker/ArtifactQuery.class.php
@@ -91,7 +91,7 @@ class ArtifactQuery extends FFError {
* @param array|bool $data
*/
function __construct(&$ArtifactType, $data = false) {
- $this->Error();
+ parent::__construct();
// Was ArtifactType legit?
if (!$ArtifactType || !is_object($ArtifactType)) {
diff --git a/src/common/tracker/ArtifactQueryFactory.class.php
b/src/common/tracker/ArtifactQueryFactory.class.php
index f15475e..d7a429e 100644
--- a/src/common/tracker/ArtifactQueryFactory.class.php
+++ b/src/common/tracker/ArtifactQueryFactory.class.php
@@ -45,7 +45,7 @@ class ArtifactQueryFactory extends FFError {
* @param object $ArtifactType The Group object to which this
ArtifactQueryFactory is associated
*/
function __construct(&$ArtifactType) {
- $this->Error();
+ parent::__construct();
if (!$ArtifactType || !is_object($ArtifactType)) {
$this->setError('ArtifactQueryFactory: No ArtifactType
Object');
return;
diff --git a/src/common/tracker/ArtifactType.class.php
b/src/common/tracker/ArtifactType.class.php
index 09f162d..c053148 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -158,7 +158,7 @@ class ArtifactType extends FFError {
* @param array|bool $arr The associative
array of data.
*/
function __construct($Group, $artifact_type_id = false, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/tracker/ArtifactTypeFactory.class.php
b/src/common/tracker/ArtifactTypeFactory.class.php
index ecb8265..167c2a1 100644
--- a/src/common/tracker/ArtifactTypeFactory.class.php
+++ b/src/common/tracker/ArtifactTypeFactory.class.php
@@ -54,7 +54,7 @@ class ArtifactTypeFactory extends FFError {
* @param Group $Group The Group object to which this
ArtifactTypeFactory is associated
*/
function __construct(&$Group, $skip_check=false) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/tracker/ArtifactTypes.class.php
b/src/common/tracker/ArtifactTypes.class.php
index 53e4b59..432f1fd 100644
--- a/src/common/tracker/ArtifactTypes.class.php
+++ b/src/common/tracker/ArtifactTypes.class.php
@@ -49,7 +49,7 @@ class ArtifactTypes extends FFError {
* @return ArtifactTypes success.
*/
function __construct(&$Group) {
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
$this->setError(_('No Valid Group Object'));
return;
diff --git a/src/common/tracker/Artifacts.class.php
b/src/common/tracker/Artifacts.class.php
index 685286e..3bc9fbe 100644
--- a/src/common/tracker/Artifacts.class.php
+++ b/src/common/tracker/Artifacts.class.php
@@ -56,7 +56,7 @@ class Artifacts extends FFError {
* @param ArtifactType $ArtifactType Artifact Type object.
*/
function __construct(&$ArtifactType) {
- $this->Error();
+ parent::__construct();
$this->ArtifactType =& $ArtifactType;
diff --git a/src/common/tracker/Roadmap.class.php
b/src/common/tracker/Roadmap.class.php
index 97463fc..d8c74d2 100644
--- a/src/common/tracker/Roadmap.class.php
+++ b/src/common/tracker/Roadmap.class.php
@@ -61,7 +61,7 @@ class Roadmap extends FFError {
var $data_array;
function __construct($group, $roadmap_id=0, $data=false) {
- $this->Error();
+ parent::__construct();
if (is_object($group)) {
if ($group->isError()) {
diff --git a/src/common/tracker/RoadmapFactory.class.php
b/src/common/tracker/RoadmapFactory.class.php
index 42177a4..322a4c5 100644
--- a/src/common/tracker/RoadmapFactory.class.php
+++ b/src/common/tracker/RoadmapFactory.class.php
@@ -55,7 +55,7 @@ class RoadmapFactory extends FFError {
var $roadmaps;
function __construct($group) {
- $this->Error();
+ parent::__construct();
if (!$group || !is_object($group)) {
$this->setError(_('No Valid Group Object'));
diff --git a/src/cronjobs/misc/forum_gateway.php
b/src/cronjobs/misc/forum_gateway.php
index 8ded701..d78b5a0 100755
--- a/src/cronjobs/misc/forum_gateway.php
+++ b/src/cronjobs/misc/forum_gateway.php
@@ -52,7 +52,7 @@ class ForumGateway extends FFError {
var $Message="";
function ForumGateway() {
- $this->Error();
+ parent::__construct();
/* Copy mail message to tmp file */
$tmpfile = $this->copyMailTmp();
diff --git a/src/cronjobs/misc/tracker_gateway.php
b/src/cronjobs/misc/tracker_gateway.php
index c561558..f2fac9b 100755
--- a/src/cronjobs/misc/tracker_gateway.php
+++ b/src/cronjobs/misc/tracker_gateway.php
@@ -53,7 +53,7 @@ class TrackerGateway extends FFError {
var $Artifact=null;
function TrackerGateway() {
- $this->Error();
+ parent::__construct();
/* Copy mail message to tmp file */
$tmpfile = $this->copyMailTmp();
diff --git a/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
b/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
index d084f39..6720630 100644
--- a/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
+++ b/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
@@ -276,7 +276,7 @@ class ContribTrackerRole extends FFError {
var $data_array ;
function ContribTrackerRole ($id=false) {
- $this->Error () ;
+ parent::__construct();
if (!$id) {
return true ;
}
diff --git a/src/plugins/mailman/include/MailmanList.class.php
b/src/plugins/mailman/include/MailmanList.class.php
index d4b9bba..a84399b 100644
--- a/src/plugins/mailman/include/MailmanList.class.php
+++ b/src/plugins/mailman/include/MailmanList.class.php
@@ -80,7 +80,7 @@ class MailmanList extends FFError {
$pm = ProjectManager::instance();
$Group = $pm->getProject($group_id);
$this->_mailingDAO = new
MailmanListDao(CodendiDataAccess::instance());
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
exit_no_group();
}
diff --git a/src/plugins/mailman/include/MailmanListFactory.class.php
b/src/plugins/mailman/include/MailmanListFactory.class.php
index a94cf3e..93b6fc8 100644
--- a/src/plugins/mailman/include/MailmanListFactory.class.php
+++ b/src/plugins/mailman/include/MailmanListFactory.class.php
@@ -65,7 +65,7 @@ class MailmanListFactory extends FFError {
*/
function MailmanListFactory(& $Group) {
$this->_mailingDAO = new
MailmanListDao(CodendiDataAccess::instance());
- $this->Error();
+ parent::__construct();
if (!$Group || !is_object($Group)) {
exit_no_group();
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index e618b5e..181d7f3 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -88,7 +88,7 @@ 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');
return false;
diff --git a/src/plugins/taskboard/common/TaskBoardColumn.class.php
b/src/plugins/taskboard/common/TaskBoardColumn.class.php
index 65f5568..3c17816 100644
--- a/src/plugins/taskboard/common/TaskBoardColumn.class.php
+++ b/src/plugins/taskboard/common/TaskBoardColumn.class.php
@@ -104,7 +104,7 @@ class TaskBoardColumn extends FFError {
var $drop_rules;
function TaskBoardColumn($Taskboard, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Taskboard || !is_object($Taskboard)) {
$this->setError('No Valid Taskboard Object');
return false;
diff --git a/src/plugins/taskboard/common/TaskBoardRelease.class.php
b/src/plugins/taskboard/common/TaskBoardRelease.class.php
index 0691e61..2259cba 100644
--- a/src/plugins/taskboard/common/TaskBoardRelease.class.php
+++ b/src/plugins/taskboard/common/TaskBoardRelease.class.php
@@ -50,7 +50,7 @@ class TaskBoardRelease extends FFError {
* Constructor
*/
function TaskBoardRelease($Taskboard, $arr = false) {
- $this->Error();
+ parent::__construct();
if (!$Taskboard || !is_object($Taskboard)) {
$this->setError('No Valid Taskboard Object');
return false;
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 7dce50e..fa6b5c0 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -118,7 +118,7 @@ class Layout extends FFError {
*/
function Layout() {
// parent constructor
- $this->Error();
+ parent::__construct();
$this->navigation = new Navigation();
diff --git a/src/www/trove/TroveCategoryLabel.class.php
b/src/www/trove/TroveCategoryLabel.class.php
index a970aea..3b770d5 100644
--- a/src/www/trove/TroveCategoryLabel.class.php
+++ b/src/www/trove/TroveCategoryLabel.class.php
@@ -38,7 +38,7 @@ class TroveCategoryLabel extends FFError {
var $dataArray = false;
function TroveCategoryLabel(& $category, $labelId = false, $dataArray =
false) {
- $this->Error();
+ parent::__construct();
if (!$category || !is_object($category)) {
return false;
}
diff --git a/tools/create_class.php b/tools/create_class.php
index f7dd6cc..0a5011a 100755
--- a/tools/create_class.php
+++ b/tools/create_class.php
@@ -60,7 +60,7 @@ function generateHeader($tableName,$author="Gforge Class
Generator by Francisco
" * Rewrite in OO and coding guidelines 12/2002 by Tim
Perdue\n".
" */\n".
"\n".
- "require_once('common/include/Error.class');\n";
+ "require_once('common/include/FFError.class');\n";
"require_once('common/include/Validator.class');\n\n";
$variables = array("%{CLASS_NAME}","%{YEAR}","%{AUTHOR}",
@@ -139,7 +139,7 @@ function generateClassConstructor($className, $fields) {
"\t * @return boolean success.\n".
"\t */\n";
$output.="\tfunction ".$className."(/*&\$ProjectGroup,*/
\$".getIdFieldFromFieldsArr($fields)."=false, \$arr=false) {\n";
- $output.="\t\t\$this->error(); \n\n".
+ $output.="\t\tparent::__construct(); \n\n".
"\t\t/*if (!\$ProjectGroup || !is_object(\$ProjectGroup)) {\n".
"\t\t\t\$this->setError('$className:: No Valid ProjectGroup
Object');\n".
"\t\t\t\treturn false;\n".
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 2 +-
src/common/docman/DocumentFactory.class.php | 2 +-
src/common/docman/DocumentGroup.class.php | 2 +-
src/common/docman/DocumentGroupFactory.class.php | 2 +-
src/common/docman/DocumentManager.class.php | 2 +-
src/common/forum/Forum.class.php | 2 +-
src/common/forum/ForumAdmin.class.php | 2 +-
src/common/forum/ForumFactory.class.php | 2 +-
src/common/forum/ForumHTML.class.php | 2 +-
src/common/forum/ForumMessage.class.php | 2 +-
src/common/forum/ForumMessageFactory.class.php | 2 +-
src/common/frs/FRSFile.class.php | 2 +-
src/common/frs/FRSFileProcessorType.class.php | 2 +-
src/common/frs/FRSFileType.class.php | 2 +-
src/common/frs/FRSPackage.class.php | 2 +-
src/common/frs/FRSPackageFactory.class.php | 2 +-
src/common/frs/FRSRelease.class.php | 2 +-
src/common/frs/FRSReleaseFactory.class.php | 2 +-
src/common/include/FusionForge.class.php | 2 +-
src/common/include/Group.class.php | 2 +-
src/common/include/GroupJoinRequest.class.php | 2 +-
src/common/include/MailParser.class.php | 2 +-
src/common/include/Navigation.class.php | 2 +-
src/common/include/Plugin.class.php | 2 +-
src/common/include/PluginManager.class.php | 2 +-
src/common/include/Stats.class.php | 2 +-
src/common/include/System.class.php | 2 +-
src/common/include/User.class.php | 2 +-
src/common/mail/MailingList.class.php | 2 +-
src/common/mail/MailingListFactory.class.php | 2 +-
src/common/pm/ProjectCategory.class.php | 2 +-
src/common/pm/ProjectGroup.class.php | 2 +-
src/common/pm/ProjectGroupFactory.class.php | 2 +-
src/common/pm/ProjectTask.class.php | 2 +-
src/common/pm/ProjectTaskFactory.class.php | 2 +-
src/common/reporting/Report.class.php | 2 +-
src/common/scm/SCMFactory.class.php | 2 +-
src/common/survey/Survey.class.php | 2 +-
src/common/survey/SurveyFactory.class.php | 2 +-
src/common/survey/SurveyQuestion.class.php | 2 +-
src/common/survey/SurveyQuestionFactory.class.php | 2 +-
src/common/survey/SurveyResponse.class.php | 2 +-
src/common/survey/SurveyResponseFactory.class.php | 2 +-
src/common/tracker/Artifact.class.php | 2 +-
src/common/tracker/ArtifactCanned.class.php | 2 +-
src/common/tracker/ArtifactExtraField.class.php | 2 +-
src/common/tracker/ArtifactExtraFieldElement.class.php | 2 +-
src/common/tracker/ArtifactFactory.class.php | 2 +-
src/common/tracker/ArtifactFile.class.php | 2 +-
src/common/tracker/ArtifactHistory.class.php | 2 +-
src/common/tracker/ArtifactMessage.class.php | 2 +-
src/common/tracker/ArtifactQuery.class.php | 2 +-
src/common/tracker/ArtifactQueryFactory.class.php | 2 +-
src/common/tracker/ArtifactType.class.php | 2 +-
src/common/tracker/ArtifactTypeFactory.class.php | 2 +-
src/common/tracker/ArtifactTypes.class.php | 2 +-
src/common/tracker/Artifacts.class.php | 2 +-
src/common/tracker/Roadmap.class.php | 2 +-
src/common/tracker/RoadmapFactory.class.php | 2 +-
src/cronjobs/misc/forum_gateway.php | 2 +-
src/cronjobs/misc/tracker_gateway.php | 2 +-
src/plugins/contribtracker/common/ContribTrackerPlugin.class.php | 2 +-
src/plugins/mailman/include/MailmanList.class.php | 2 +-
src/plugins/mailman/include/MailmanListFactory.class.php | 2 +-
src/plugins/taskboard/common/TaskBoard.class.php | 2 +-
src/plugins/taskboard/common/TaskBoardColumn.class.php | 2 +-
src/plugins/taskboard/common/TaskBoardRelease.class.php | 2 +-
src/www/include/Layout.class.php | 2 +-
src/www/trove/TroveCategoryLabel.class.php | 2 +-
tools/create_class.php | 4 ++--
70 files changed, 71 insertions(+), 71 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
