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 82cdedcf23772febb246593c25629eea4356fe36 (commit)
via 580ba1ebb49deb7266f0f5bf425ab95e88c39f01 (commit)
from 7516b792e2e15833353f3ab1b07af47a7a90fef5 (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=82cdedcf23772febb246593c25629eea4356fe36
commit 82cdedcf23772febb246593c25629eea4356fe36
Author: Franck Villaume <[email protected]>
Date: Fri May 14 16:23:29 2021 +0200
clean-up: use empty when appropriate
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 336a820..7814f3e 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -2843,7 +2843,7 @@ class Group extends FFError {
$submitters[] = user_get_object($gjr->getUserID());
}
- if (count ($submitters) < 1) {
+ if (empty($submitters)) {
$this->setError(_('Group does not have any
administrators.'));
return false;
}
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index c1b7928..d9e3ad4 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -140,7 +140,7 @@ function &user_get_objects($id_arr) {
$fetch[] = $id;
}
}
- if (count($fetch) > 0) {
+ if (!empty($fetch)) {
$res = db_query_params('SELECT * FROM users WHERE user_id = ANY
($1)',
array(db_int_array_to_any_clause($fetch)));
while ($arr = db_fetch_array($res)) {
diff --git a/src/common/include/sqlparser.php b/src/common/include/sqlparser.php
index a183916..01013ca 100644
--- a/src/common/include/sqlparser.php
+++ b/src/common/include/sqlparser.php
@@ -331,7 +331,7 @@ function parse_sql_file($filename) {
$found = $matches[2];
if ($found == $cur) {
array_pop($doldolstack);
- if (count($doldolstack) > 0) {
+ if (!empty($doldolstack)) {
$state = $states['IN_DOLDOL'];
break;
} else {
diff --git a/src/common/include/tag_cloud.php b/src/common/include/tag_cloud.php
index 433bde6..5b96c8a 100644
--- a/src/common/include/tag_cloud.php
+++ b/src/common/include/tag_cloud.php
@@ -130,7 +130,7 @@ function tag_cloud($params = array()) {
$available_counts = array_keys($count_to_tags);
rsort($available_counts, SORT_NUMERIC);
- if (count($tag_count) > 0) {
+ if (!empty($tag_count)) {
$count_min = 0;
$count_max = 0;
$nb = 0;
diff --git a/src/common/pm/ProjectTask.class.php
b/src/common/pm/ProjectTask.class.php
index 7d01a06..8cc593d 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -29,27 +29,24 @@ require_once $gfcommon.'include/FFError.class.php';
require_once $gfcommon.'include/Validator.class.php';
function projecttask_get_object($project_task_id, $data = false) {
- global $PROJECTTASK_OBJ;
- if (!isset($PROJECTTASK_OBJ["_".$project_task_id."_"])) {
- if ($data) {
- //the db result handle was passed in
- } else {
- $res = db_query_params ('SELECT * FROM
project_task_vw WHERE project_task_id=$1',
- array
($project_task_id)) ;
-
- if (db_numrows($res) <1 ) {
-
$PROJECTTASK_OBJ["_".$project_task_id."_"]=false;
- return false;
- }
- $data = db_fetch_array($res);
+ global $PROJECTTASK_OBJ;
+ if (!isset($PROJECTTASK_OBJ["_".$project_task_id."_"])) {
+ if ($data) {
+ //the db result handle was passed in
+ } else {
+ $res = db_query_params ('SELECT * FROM project_task_vw
WHERE project_task_id=$1',
+ array ($project_task_id)) ;
+ if (db_numrows($res) <1 ) {
+
$PROJECTTASK_OBJ["_".$project_task_id."_"]=false;
+ return false;
}
- $ProjectGroup =
projectgroup_get_object($data["group_project_id"]);
- $PROJECTTASK_OBJ["_".$project_task_id."_"]= new
ProjectTask($ProjectGroup,$project_task_id,$data);
-
+ $data = db_fetch_array($res);
}
-
- return $PROJECTTASK_OBJ["_".$project_task_id."_"];
+ $ProjectGroup =
projectgroup_get_object($data["group_project_id"]);
+ $PROJECTTASK_OBJ["_".$project_task_id."_"]= new
ProjectTask($ProjectGroup,$project_task_id,$data);
+ }
+ return $PROJECTTASK_OBJ["_".$project_task_id."_"];
}
/*
@@ -857,8 +854,8 @@ class ProjectTask extends FFError {
$this->assignedto =& $arr;
// If no one is assigned, then assign it to "100" - NOBODY
- if (!$arr || count($arr) < 1 || ((count($arr)==1) &&
($arr[0]==''))) {
- $arr=array('100');
+ if (!$arr || empty($arr) || ((count($arr)==1) &&
($arr[0]==''))) {
+ $arr = array('100');
}
if (count($arr) || count($arr2)) {
$add_arr = array_values(array_diff ($arr, $arr2));
diff --git a/src/common/survey/Survey.class.php
b/src/common/survey/Survey.class.php
index 27da6f3..ba0366a 100644
--- a/src/common/survey/Survey.class.php
+++ b/src/common/survey/Survey.class.php
@@ -524,7 +524,7 @@ class Survey extends FFError {
if (empty($arr)) {
$arr = $arr_to_add;
} else {
- if ($arr_to_add && is_array($arr_to_add) &&
count($arr_to_add)>0) {
+ if ($arr_to_add && is_array($arr_to_add) &&
!empty($arr_to_add)) {
for ($i = 0; $i < count($arr_to_add); $i++) {
/* Avoid double question */
if ($arr_to_add[$i] &&
array_search($arr_to_add[$i], $arr) == false && $arr_to_add[$i]!=$arr[0]) {
@@ -535,7 +535,7 @@ class Survey extends FFError {
}
/* questions to delete */
- if ($arr_to_del && is_array($arr_to_del) &&
count($arr_to_del)>0) {
+ if ($arr_to_del && is_array($arr_to_del) &&
!empty($arr_to_del)) {
$new_arr = array();
for ($i = 0; $i < count($arr); $i++) {
/* If the value is no in the delete array, copy
it into new array */
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 6b35005..1b0b12c 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -976,7 +976,7 @@ class Artifact extends FFObject {
// the status_id based on the extra field - this keeps the
counters
// accurate
//
- if (count($extra_fields) > 0) {
+ if (!empty($extra_fields)) {
$status_id=$this->ArtifactType->remapStatus($status_id,$extra_fields);
}
if (!$this->getID()) {
@@ -2015,11 +2015,11 @@ class Artifact extends FFObject {
"\n".util_make_url($this->getPermalink());
//only send if some recipients were found
- if (count($emails) < 1 && count($monitor_ids) < 1) {
+ if (empty($emails) && empty($monitor_ids)) {
return true;
}
- if (count($monitor_ids) < 1) {
+ if (empty($monitor_ids)) {
$monitor_ids = array();
} else {
$monitor_ids = array_unique($monitor_ids);
@@ -2039,7 +2039,7 @@ class Artifact extends FFObject {
}
//now remove all duplicates from the email list
- if (count($emails) > 0) {
+ if (!empty($emails)) {
$bcc = implode(',',array_unique($emails));
util_send_message('', $subject, $body, $from, $bcc, '',
$extra_headers);
}
@@ -2047,8 +2047,6 @@ class Artifact extends FFObject {
$this->sendSubjectMsg = $subject;
$this->sendBodyMsg = $body;
- //util_handle_message($monitor_ids,$subject,$body,$BCC);
-
return true;
}
diff --git a/src/common/tracker/ArtifactFactory.class.php
b/src/common/tracker/ArtifactFactory.class.php
index 9c00e13..9c81fc1 100644
--- a/src/common/tracker/ArtifactFactory.class.php
+++ b/src/common/tracker/ArtifactFactory.class.php
@@ -245,7 +245,7 @@ class ArtifactFactory extends FFError {
}
$extra_pref = '';
- if (count($aux_extra_fields)>0) {
+ if (!empty($aux_extra_fields)) {
$extra_pref =
'|'.serialize($aux_extra_fields);
}
diff --git a/src/common/tracker/actions/admin-ind.php
b/src/common/tracker/actions/admin-ind.php
index bdf2659..ba8b510 100644
--- a/src/common/tracker/actions/admin-ind.php
+++ b/src/common/tracker/actions/admin-ind.php
@@ -88,7 +88,7 @@ if(isset($page_title)){
$atf->header( array('title' => _('Trackers Administration')));
-if (!isset($at_arr) || !$at_arr || count($at_arr) < 1) {
+if (!isset($at_arr) || !$at_arr || empty($at_arr)) {
echo $HTML->warning_msg(_('No trackers found'));
} else {
diff --git a/src/common/tracker/actions/ind.php
b/src/common/tracker/actions/ind.php
index b155e4b..c55aa02 100644
--- a/src/common/tracker/actions/ind.php
+++ b/src/common/tracker/actions/ind.php
@@ -39,7 +39,7 @@ if ($at_arr === false) {
html_use_tablesorter();
$atf->header();
-if (!$at_arr || count($at_arr) < 1) {
+if (!$at_arr || empty($at_arr)) {
$localInformation = $HTML->information(_('No trackers have been set up,
or you cannot view them.'));
$localInformation .= html_e('p', array(), sprintf(_('The Admin for this
project will have to set up data types using the %1$s admin page %2$s'), '<a
href="'.util_make_url ('/tracker/admin/?group_id='.$group_id).'">', '</a>'));
$at_arr = array();
@@ -64,7 +64,7 @@ if ($group->usesPlugin('projects-hierarchy')) {
}
}
-if (count($at_arr) < 1) {
+if (empty($at_arr)) {
echo $localInformation;
} else {
plugin_hook('blocks', 'tracker index');
diff --git a/src/common/tracker/actions/tracker.php
b/src/common/tracker/actions/tracker.php
index 5dce4a4..a0a828a 100644
--- a/src/common/tracker/actions/tracker.php
+++ b/src/common/tracker/actions/tracker.php
@@ -196,7 +196,7 @@ switch (getStringFromRequest('func')) {
// in this case, if
$extra_fields is not setted, it
// means no option was
selected, so we have to delete
// the original values
- if (!is_array($f) || count($f)
== 0) {
+ if (!is_array($f) || empty($f))
{
$ef[$efid] = array();
} elseif (in_array('100',
$extra_fields[$efid])) { // "No change" option selected?
// no change
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index d747f64..6f0a4f2 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -1362,7 +1362,7 @@ class ArtifactTypeHtml extends ArtifactType {
} elseif ($ef['alias'] == 'response_time') {
// Implement Response SLA: Time from create to
first comment.
$messages = $artifact->getMessageObjects();
- if (count($messages) > 0) {
+ if (!empty($messages)) {
$message = $messages[count($messages) -
1];
$current_time = $message->getAddDate();
$timer_is_running = false;
diff --git a/src/common/tracker/views/form-clonetracker.php
b/src/common/tracker/views/form-clonetracker.php
index c59cc9c..201e0a3 100644
--- a/src/common/tracker/views/form-clonetracker.php
+++ b/src/common/tracker/views/form-clonetracker.php
@@ -37,7 +37,7 @@ foreach ($arr_g as $g) {
$ata = $atf->getArtifactTypes();
for ($i=0; $i<count($ata); $i++) {
if (!$ata[$i] || $ata[$i]->isError()) {
- //skip it
+ //skip it
} else {
$ids[]=$ata[$i]->getID();
$titles[]=$g->getPublicName().'::'.$ata[$i]->getName();
@@ -49,7 +49,7 @@ foreach ($arr_g as $g) {
$ath->adminHeader(array('title'=>_('Clone Tracker'), 'modal'=>1));
-if (count($ids) < 1) {
+if (empty($ids)) {
echo $HTML->warning_msg(_('The site administrator must first set up
template trackers in the template project with default values and set
permissions properly so you can access them.'));
} else {
?>
diff --git a/src/common/tracker/views/form-workflow.php
b/src/common/tracker/views/form-workflow.php
index af8ce0e..fa8e4de 100644
--- a/src/common/tracker/views/form-workflow.php
+++ b/src/common/tracker/views/form-workflow.php
@@ -29,7 +29,7 @@ global $HTML;
$has_error = false;
$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_STATUS));
-if (count($efarr) === 0) {
+if (empty($efarr)) {
$has_error = true;
$error_msg .= _('To create a workflow, you need first to create a
custom field of type “Status”.');
} elseif (count($efarr) !== 1) {
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php
b/src/common/widget/Widget_ProjectPublicAreas.class.php
index 9d877cd..10497bf 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -65,7 +65,7 @@ class Widget_ProjectPublicAreas extends Widget {
}
}
- if (count($rows) < 1) {
+ if (empty($rows)) {
$result .= "<br />\n<em>"._('There are no
trackers available').'</em>';
} else {
$elementsLi = array();
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index f804b4a..6404504 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -254,11 +254,11 @@ EOS;
if ($preference) {
$arr = $this->getExtraFieldIDs($owner_id);
}
- if (count($stillAvailableExtraFields) > 0 || count($arr) > 0) {
+ if (!empty($stillAvailableExtraFields) || !empty($arr)) {
$content = html_e('p', array(), sprintf(_('Drag & drop
into your layout the available custom fields from %s to display into this
widget'), $artifactTypeObject->getName())._(':'));
$content .= $HTML->listTableTop(array(), array(),
'full', 'extrafield_table');
}
- if (count($stillAvailableExtraFields) > 0) {
+ if (!empty($stillAvailableExtraFields)) {
$cells = array();
for ($i = 0; count($stillAvailableExtraFields) > $i;
$i++) {
$cells[] = array(html_e('div', array('id' =>
'ef'.$stillAvailableExtraFields[$i][0], 'class' => 'wb_extrafield', 'style' =>
'background: #e6e6e6 none repeat scroll 0 0; padding: 2px; text-align:
center;'),
util_unconvert_htmlspecialchars($stillAvailableExtraFields[$i]['field_name']).'<div
id="xef'.$stillAvailableExtraFields[$i][0].'" style="display: none"
class="ef-widget-remove">x</div>'), 'id' =>
'tdef'.$stillAvailableExtraFields[$i][0], 'class' => 'td-droppable', 'width' =>
'50%');
@@ -271,7 +271,7 @@ EOS;
$content .= $HTML->multiTableRow(array(),
$cells);
}
}
- if (count($arr) > 0) {
+ if (!empty($arr)) {
$cells = array();
for ($i = 0; count($arr) > $i; $i++) {
$cells[] = array('', 'id' => 'tdef'.$arr[$i],
'width' => '50%');
@@ -284,7 +284,7 @@ EOS;
$content .= $HTML->multiTableRow(array(),
$cells);
}
}
- if (count($stillAvailableExtraFields) > 0 || count($arr) > 0) {
+ if (!empty($stillAvailableExtraFields) || !empty($arr)) {
$content .= $HTML->listTableBottom();
$javascript = <<<'EOS'
jQuery(document).ready(function() {
diff --git a/src/cronjobs/db/massmail.php b/src/cronjobs/db/massmail.php
index c6ed7fb..b1eae93 100755
--- a/src/cronjobs/db/massmail.php
+++ b/src/cronjobs/db/massmail.php
@@ -123,7 +123,7 @@ foreach ($all_users as $user) {
$err .= "Mailing ".count($filtered_users)." users.\n";
// If no more users left, we've finished with this mailing
-if (count ($filtered_users)==0) {
+if (empty($filtered_users)) {
db_query_params ('UPDATE massmail_queue SET
failed_date=0,finished_date=$1 WHERE id=$2',
array(time(),
$mail_id));
diff --git a/src/plugins/mantisbt/view/viewIssues.php
b/src/plugins/mantisbt/view/viewIssues.php
index 96e9ad9..570e9e3 100644
--- a/src/plugins/mantisbt/view/viewIssues.php
+++ b/src/plugins/mantisbt/view/viewIssues.php
@@ -115,7 +115,7 @@ if (!isset($clientSOAP) && !isset($errorPage)) {
);
}
- if(count($listBugAll) > 0) {
+ if(!empty($listBugAll)) {
foreach ($listBugAll as $key => $defect) {
if ( ($indexMin <= $key) && ($indexMax >= $key) ){
$listBug[] = $defect;
@@ -124,7 +124,7 @@ if (!isset($clientSOAP) && !isset($errorPage)) {
}
// affichage page
- if (!count($listBug)) {
+ if (empty($listBug)) {
echo $HTML->warning_msg(_('No tickets to display.'));
} else {
html_use_tablesorter();
diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php
b/src/plugins/scmbzr/common/BzrPlugin.class.php
index fca26be..85f858e 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -254,7 +254,7 @@ over it to the project's administrator.");
$dellist = array () ;
$createlist = array () ;
- while (count ($oldlist) > 0 && count ($newlist) > 0) {
+ while (!empty($oldlist) && !empty($newlist)) {
$o = $oldlist[0] ;
$n = $newlist[0] ;
if ($o > $n) {
diff --git a/src/plugins/scmcvs/bin/aclcheck.php
b/src/plugins/scmcvs/bin/aclcheck.php
index 69a9040..20a0fb3 100755
--- a/src/plugins/scmcvs/bin/aclcheck.php
+++ b/src/plugins/scmcvs/bin/aclcheck.php
@@ -41,7 +41,7 @@ $env_cvsroot = (string) $_ENV['CVSROOT'];
# 2. Then must contain 3 - 25 alphanumeric chars or -
preg_match("/^\/\/?(cvs)(root)*\/\/?([[:alnum:]-]{3,25})$/", $env_cvsroot,
$matches);
-if (count($matches) == 0) {
+if (empty($matches)) {
print "Invalid CVS directory\n";
exit(1);
}
diff --git a/src/plugins/scmcvs/www/acl.php b/src/plugins/scmcvs/www/acl.php
index 54912c8..ad6dfd0 100644
--- a/src/plugins/scmcvs/www/acl.php
+++ b/src/plugins/scmcvs/www/acl.php
@@ -40,10 +40,10 @@ preg_match("/^([[:alnum:]-]{3,15})$/", $env_group,
$matches);
# 2. Must be 3 - 15 chars
preg_match("/[[:alnum:]_-]{3,15}/", $env_user, $matches2);
-if (count($matches) == 0) {
+if (empty($matches)) {
exit_error(_('Invalid CVS repository: ').$env_group,'home');
} else {
- if (count($matches2) == 0) {
+ if (empty($matches2)) {
exit_error(_('Invalid username: ').$env_user,'home');
}
diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index 7c336e1..77b3217 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -98,7 +98,7 @@ over it to the project's administrator.");
function getInstructionForDarcs($project, $rw) {
global $HTML;
$repo_names = $this->getRepositories($project);
- if (count($repo_names) > 0) {
+ if (!empty($repo_names)) {
$default_repo = "REPO";
if (count($repo_names) == 1) {
$default_repo = $repo_names[0];
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 683e3d8..20789b3 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -1181,7 +1181,7 @@ control over it to the project's administrator.");
'description' =>
$data['description'],
'clone_url' =>
$data['clone_url']);
}
- if (count($existing_repos) == 0) {
+ if (empty($existing_repos)) {
echo $HTML->information(_('No extra Git repository for
project').' '.$project_name);
} else {
echo html_e('h2', array(), sprintf(ngettext('Extra Git
repository for project %1$s',
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index 7aa65b1..8f215d2 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -898,7 +898,7 @@ Offer DAV or SSH access.");
$existing_repos[] = array('repo_name' =>
$data['repo_name'],
'description' =>
$data['description']);
}
- if (count($existing_repos) == 0) {
+ if (empty($existing_repos)) {
echo $HTML->information(_('No extra Hg repository for
project').' '.$project_name);
} else {
echo html_e('h2', array(), sprintf(ngettext('Extra Hg
repository for project %1$s',
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 894ddc2..c9d6ab8 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -124,7 +124,7 @@ some control over it to the project's administrator.");
}
}
}
- if (count($modules) == 0) {
+ if (empty($modules)) {
$modules[] = '/';
}
return $modules;
@@ -1083,7 +1083,7 @@ some control over it to the project's administrator.");
$existing_repos[] = array('repo_name' =>
$data['repo_name'],
'description' =>
$data['description']);
}
- if (count($existing_repos) == 0) {
+ if (empty($existing_repos)) {
echo $HTML->information(_('No extra Subversion
repository for project').' '.$project_name);
} else {
echo html_e('h2', array(), sprintf(ngettext('Extra
Subversion repository for project %1$s',
diff --git a/src/plugins/taskboard/common/views/admin/ind.php
b/src/plugins/taskboard/common/views/admin/ind.php
index 6e046de..35315f0 100644
--- a/src/plugins/taskboard/common/views/admin/ind.php
+++ b/src/plugins/taskboard/common/views/admin/ind.php
@@ -49,7 +49,7 @@ echo html_e('p', array(),
util_make_link('/plugins/'.$pluginTaskboard->name.'/ad
html_e('strong', array(), _('Initialize a new Task Board')))
.html_e('br'). _('Create initial Task Board configuration'));
-if (!$tb_arr || count($tb_arr) < 1) {
+if (!$tb_arr || empty($tb_arr)) {
echo $HTML->information(_('No Task Boards have been set up, or you
cannot view them.'));
} else {
echo html_e('p', array(), _('Choose a Task Board.'));
diff --git a/src/plugins/taskboard/common/views/admin/trackers.php
b/src/plugins/taskboard/common/views/admin/trackers.php
index 98d6471..c16956a 100644
--- a/src/plugins/taskboard/common/views/admin/trackers.php
+++ b/src/plugins/taskboard/common/views/admin/trackers.php
@@ -77,8 +77,8 @@ if (!$atf || !is_object($atf) || $atf->isError()) {
$trackers_bgcolor[
$used_tracker_data['group_artifact_id'] ] =
$used_tracker_data['card_background_color'];
}
- if (count($trackers) > 0) {
- if (count($trackers_selected) == 0) {
+ if (!empty($trackers)) {
+ if (empty($trackers_selected)) {
echo $HTML->warning_msg(_('Choose at least one
tracker for using with Task Board.'));
} else {
echo html_e('div', array('id' => 'messages',
'class' => 'warning', 'style' => 'display: none;'), '', false);
diff --git a/src/plugins/taskboard/common/views/ind.php
b/src/plugins/taskboard/common/views/ind.php
index 0237f2e..689dd5f 100644
--- a/src/plugins/taskboard/common/views/ind.php
+++ b/src/plugins/taskboard/common/views/ind.php
@@ -40,7 +40,7 @@ if ($tb_arr === false) {
html_use_tablesorter();
$taskboardFactory->header();
-if (!$tb_arr || count($tb_arr) < 1) {
+if (!$tb_arr || empty($tb_arr)) {
echo $HTML->information(_('No taskboards have been set up, or you
cannot view them.'));
echo html_e('p', array(), sprintf(_('The Admin for this project will
have to set up data types using the %1$s admin page %2$s'), '<a
href="'.util_make_uri('/plugins/'.$pluginTaskboard->name.'/?group_id='.$group_id).'">',
'</a>'));
} else {
diff --git a/src/plugins/taskboard/common/views/releases/burndown.php
b/src/plugins/taskboard/common/views/releases/burndown.php
index 43116df..37ef6bb 100644
--- a/src/plugins/taskboard/common/views/releases/burndown.php
+++ b/src/plugins/taskboard/common/views/releases/burndown.php
@@ -72,7 +72,7 @@ $dataRemainingTasks = array();
$dataRemainingEfforts = array();
foreach ($release_snapshots as $snapshot) {
- if (count($dataRemainingTasks) == 0 && $snapshot['snapshot_date'] !=
$release->getStartDate()) {
+ if (empty($dataRemainingTasks) && $snapshot['snapshot_date'] !=
$release->getStartDate()) {
// initialize start point if snapshot is missing for the first
day
$dataRemainingTasks[] = array($release->getStartDate() * 1000,
$release_volume['tasks']);
$dataRemainingEfforts[] = array($release->getStartDate() *
1000, $release_volume['man_days']);
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index eb38df9..59a86ae 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -177,7 +177,7 @@ foreach ($show as $showthis) {
site_project_header(array('title'=>_('Activity'), 'group'=>$group_id,
'toptab'=>'activity'));
-if (count($ids) < 1) {
+if (empty($ids)) {
echo $HTML->information(_('No Activity Found'));
} else {
?>
@@ -216,7 +216,7 @@ echo $HTML->closeForm();
<div id="activity_right">
<?php
- if (count($results) < 1) {
+ if (empty($results)) {
echo $HTML->information(_('No Activity Found'));
} else {
$cached_perms = array();
diff --git a/src/www/export/rss20_docman.php b/src/www/export/rss20_docman.php
index 49b665c..586205e 100644
--- a/src/www/export/rss20_docman.php
+++ b/src/www/export/rss20_docman.php
@@ -113,7 +113,7 @@ function writeFeed($d_arr, $limit) {
}
$child_count = count($nested_groups["$parent_group"]);
*/
- if ($d_arr && count($d_arr) > 0) {
+ if ($d_arr && !empty($d_arr)) {
// Put the result set (list of documents for this group)
into feed items
// ## item outputs
diff --git a/src/www/export/rss20_forum.php b/src/www/export/rss20_forum.php
index 1e88aeb..d74e30e 100644
--- a/src/www/export/rss20_forum.php
+++ b/src/www/export/rss20_forum.php
@@ -77,34 +77,36 @@ $debug = false;
//--- filter by group_ids - resolve them to forums ---
if (isset($_GET['group_ids'])&&!empty($_GET['group_ids'])) {
- //explode: http changes "+" to " "
- $group_ids = array_unique(array_merge($group_ids, explode("
",$_GET['group_ids'])));
-
- //loop through group_ids
- for ($i=0; $i<count($group_ids);$i++){
- if (is_numeric($group_ids[$i])) {
- $group = group_get_object($group_ids[$i]);
- //does group exist? do we get an object? is group public? does it
use forums?
- if ($group && is_object($group) && !$group->isError()
- && $group->isPublic() && $group->usesForum()){
- $groups[] = $group;
- //valid forums from forum_ids param (needed for feed title)
- $n_group_ids++;
-
- //this groups' forums in array (code based on forum/index.php)
- $ff=new ForumFactory($group);
- if ($ff &&is_object($ff) && !$ff->isError()) {
- $farr = array_merge($farr, $ff->getForums());
- if (count($farr) < 1) {
- error_log(_("Forum RSS: No forums found"),0);
- }
- }
- else error_log("Forum RSS: ForumFactory error:
".$ff->getErrorMessage()." - No forums for group ".$group->getPublicName(),0);
- }
- else error_log("Forum RSS: group object error",0);
- }
- else error_log("Forum RSS: invalid group_ids param: ".$group_ids[$i],0);
- }
+ //explode: http changes "+" to " "
+ $group_ids = array_unique(array_merge($group_ids, explode("
",$_GET['group_ids'])));
+
+ //loop through group_ids
+ for ($i=0; $i<count($group_ids);$i++) {
+ if (is_numeric($group_ids[$i])) {
+ $group = group_get_object($group_ids[$i]);
+ //does group exist? do we get an object? is group
public? does it use forums?
+ if ($group && is_object($group) && !$group->isError()
&& $group->isPublic() && $group->usesForum()) {
+ $groups[] = $group;
+ //valid forums from forum_ids param (needed for
feed title)
+ $n_group_ids++;
+
+ //this groups' forums in array (code based on
forum/index.php)
+ $ff=new ForumFactory($group);
+ if ($ff &&is_object($ff) && !$ff->isError()) {
+ $farr = array_merge($farr,
$ff->getForums());
+ if (empty($farr)) {
+ error_log(_("Forum RSS: No
forums found"),0);
+ }
+ } else {
+ error_log("Forum RSS: ForumFactory
error: ".$ff->getErrorMessage()." - No forums for group
".$group->getPublicName(),0);
+ }
+ } else {
+ error_log("Forum RSS: group object error",0);
+ }
+ } else {
+ error_log("Forum RSS: invalid group_ids param:
".$group_ids[$i],0);
+ }
+ }
}
// ----------- add forums called by forum_ids param, if any ------------
diff --git a/src/www/export/rss20_tracker.php b/src/www/export/rss20_tracker.php
index 1ba7ecb..fb98e03 100644
--- a/src/www/export/rss20_tracker.php
+++ b/src/www/export/rss20_tracker.php
@@ -104,7 +104,7 @@ function writeFeed($at_arr, $group_id){
//if (isset($limit) ||empty($limit)) $limit = 10;
//if ($limit > 100) $limit = 100;
- if (!$at_arr || count($at_arr) < 1) {
+ if (!$at_arr || empty($at_arr)) {
endOnError(_("Tracker RSS: No trackers found"));
} else {
diff --git a/src/www/forum/admin/index.php b/src/www/forum/admin/index.php
index 4941f4d..3d9c4cc 100644
--- a/src/www/forum/admin/index.php
+++ b/src/www/forum/admin/index.php
@@ -365,7 +365,7 @@ if (getStringFromRequest('add_forum')) {
$farr = $ff->getForums();
- if (is_array($farr) && count($farr) == 0) {
+ if (is_array($farr) && empty($farr)) {
echo $HTML->error_msg(_('No forums found.'));
forum_footer();
exit;
diff --git a/src/www/forum/index.php b/src/www/forum/index.php
index 62eab7e..0239d72 100644
--- a/src/www/forum/index.php
+++ b/src/www/forum/index.php
@@ -47,7 +47,7 @@ if ($group_id) {
}
$farr = $ff->getForums();
- if (count($farr) == 0) {
+ if (empty($farr)) {
$localInformation = $HTML->information(sprintf(_('No Forums
found for %s'), $g->getPublicName()));
}
@@ -79,7 +79,7 @@ if ($group_id) {
forum_header(array('title' => sprintf(_('Forums for %s'),
$g->getPublicName()) ));
- if ( count($farr) < 1) {
+ if (empty($farr)) {
echo $localInformation;
forum_footer();
exit;
diff --git a/src/www/forum/myforums.php b/src/www/forum/myforums.php
index ec00972..a710e9b 100644
--- a/src/www/forum/myforums.php
+++ b/src/www/forum/myforums.php
@@ -62,7 +62,7 @@ if (!is_array($monitoredForumsIdsArray)) {
exit;
}
-if (count($monitoredForumsIdsArray) < 1) {
+if (empty($monitoredForumsIdsArray)) {
echo $HTML->information(_('You have no monitored forums'));
forum_footer();
exit;
diff --git a/src/www/people/people_utils.php b/src/www/people/people_utils.php
index a5e25ff..39ec284 100644
--- a/src/www/people/people_utils.php
+++ b/src/www/people/people_utils.php
@@ -392,7 +392,7 @@ function people_show_category_table() {
$i++;
}
}
- if (count($categories) < 1) {
+ if (empty($categories)) {
$return = $HTML->warning_msg(_('No categories found.'));
} else {
$return = $HTML->listTableTop($title_arr);
@@ -449,7 +449,7 @@ function people_show_job_list($result) {
}
}
- if (count($projects) < 1) {
+ if (empty($projects)) {
$return = $HTML->warning_msg(_('None Found'));
} else {
$return = $HTML->listTableTop($title_arr);
diff --git a/src/www/pm/admin/index.php b/src/www/pm/admin/index.php
index c1e07b4..eb93f73 100644
--- a/src/www/pm/admin/index.php
+++ b/src/www/pm/admin/index.php
@@ -412,7 +412,7 @@ if ($add_cat && $group_project_id) {
$pg_arr = $pgf->getProjectGroups();
- if (count($pg_arr) < 1 || $pg_arr == false) {
+ if ($pg_arr == false || empty($pg_arr)) {
echo $HTML->information(_('No Subprojects Found in this
Project'));
echo '<p>' . _('You may add new Subprojects using the “Add a
Subproject” link above.') . '</p>';
echo db_error();
diff --git a/src/www/pm/index.php b/src/www/pm/index.php
index d72bc39..925b2b9 100644
--- a/src/www/pm/index.php
+++ b/src/www/pm/index.php
@@ -60,7 +60,7 @@ pm_header(array('title' => sprintf(_('Subprojects for %s'),
$g->getPublicName())
plugin_hook('blocks', 'tasks index');
-if (count($pg_arr) < 1 || $pg_arr == false) {
+if ($pg_arr == false || empty($pg_arr)) {
echo $HTML->information(_('No Subprojects Found'));
echo '<p>'._('No subprojects have been set up, or you cannot view
them.').'</p>';
echo '<p class="important">'._('The Admin for this project will have to
set up subprojects using the admin page.').'</p>';
diff --git a/src/www/pm/task.php b/src/www/pm/task.php
index 3c88f62..594bdc3 100644
--- a/src/www/pm/task.php
+++ b/src/www/pm/task.php
@@ -142,7 +142,7 @@ switch (getStringFromRequest('func')) {
if
(!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$duration,$parent_id))
{
exit_error($pt->getErrorMessage(),'pm');
} else {
- if (count($add_artifact_id) > 0) {
+ if (!empty($add_artifact_id)) {
if
(!$pt->addRelatedArtifacts($add_artifact_id)) {
exit_error('addRelatedArtifacts:
'.$pt->getErrorMessage(),'pm');
}
diff --git a/src/www/project/admin/users.php b/src/www/project/admin/users.php
index 21e690e..8f1b5ce 100644
--- a/src/www/project/admin/users.php
+++ b/src/www/project/admin/users.php
@@ -192,7 +192,7 @@ $cells = array();
// Pending requests
$reqs =& get_group_join_requests($group);
-if (count($reqs) > 0) {
+if (!empty($reqs)) {
$content .= $HTML->boxTop(_("Pending Membership Requests"));
for ($i = 0; $i < count($reqs); $i++) {
$user =& user_get_object($reqs[$i]->getUserId());
diff --git a/src/www/register/index.php b/src/www/register/index.php
index 8f45496..1b8be4f 100644
--- a/src/www/register/index.php
+++ b/src/www/register/index.php
@@ -82,7 +82,7 @@ if (getStringFromRequest('submit')) {
} elseif (forge_get_config('allow_project_without_template')) {
// Empty projects allowed
$built_from_template = 0 ;
- } elseif (count($template_projects) == 0) {
+ } elseif (empty($template_projects)) {
// No empty projects allowed, but no template available
$built_from_template = 0 ;
} else {
diff --git a/src/www/scm/admin/index.php b/src/www/scm/admin/index.php
index eec678b..69000eb 100644
--- a/src/www/scm/admin/index.php
+++ b/src/www/scm/admin/index.php
@@ -184,7 +184,7 @@ $hook_params['group_id'] = $group_id ;
$SCMFactory = new SCMFactory();
$scm_plugins = $SCMFactory->getSCMs();
-if (count($scm_plugins) != 0) {
+if (!empty($scm_plugins)) {
echo $HTML->information(_('Note: Changing the repository does not
delete the previous repository. It only affects the information displayed under
the SCM tab.'));
if (count($scm_plugins) == 1) {
$myPlugin = plugin_get_object($scm_plugins[0]);
diff --git a/src/www/scm/index.php b/src/www/scm/index.php
index 5917cb6..38604df 100644
--- a/src/www/scm/index.php
+++ b/src/www/scm/index.php
@@ -45,7 +45,7 @@ foreach ($av_scm_plugins as $av_scm_plugin) {
$scm_plugins[] = plugin_get_object($av_scm_plugin);
}
}
-if (count($scm_plugins) == 0) {
+if (empty($scm_plugins)) {
$warning_msg = _("This project has no associated Source Code Management
tool defined, please configure one using the Administration submenu.");
}
diff --git a/src/www/soap/docman/docman.php b/src/www/soap/docman/docman.php
index 5a87e1e..a97e20f 100644
--- a/src/www/soap/docman/docman.php
+++ b/src/www/soap/docman/docman.php
@@ -523,7 +523,7 @@ function getDocumentGroups($session_ser, $group_id) {
//
function documentsGroup_to_soap($dg_arr) {
$return = array();
- if (is_array($dg_arr) && count($dg_arr) > 0) {
+ if (is_array($dg_arr) && !empty($dg_arr)) {
for ($i=0; $i<count($dg_arr); $i++) {
if ($dg_arr[$i]->isError()) {
//skip if error
diff --git a/src/www/soap/frs/frs.php b/src/www/soap/frs/frs.php
index b4a4132..199a689 100644
--- a/src/www/soap/frs/frs.php
+++ b/src/www/soap/frs/frs.php
@@ -282,7 +282,7 @@ function getPackages($session_ser, $group_id) {
function packages_to_soap(&$pkg_arr) {
$return = array();
- if (is_array($pkg_arr) && count($pkg_arr) > 0) {
+ if (is_array($pkg_arr) && !empty($pkg_arr)) {
for ($i=0; $i<count($pkg_arr); $i++) {
if ($pkg_arr[$i]->isError()) {
//skip if error
@@ -352,7 +352,7 @@ function getReleases($session_ser, $group_id, $package_id) {
function releases_to_soap(&$release_arr) {
$return = array();
- if (is_array($release_arr) && count($release_arr) > 0) {
+ if (is_array($release_arr) && !empty($release_arr)) {
for ($i=0; $i<count($release_arr); $i++) {
if ($release_arr[$i]->isError()) {
//skip if error
@@ -429,7 +429,7 @@ function getFiles($session_ser, $group_id, $package_id,
$release_id) {
function files_to_soap($files_arr) {
$return = array();
- if (is_array($files_arr) && count($files_arr) > 0) {
+ if (is_array($files_arr) && !empty($files_arr)) {
for ($i=0; $i<count($files_arr); $i++) {
if ($files_arr[$i]->isError()) {
//skip if error
@@ -454,7 +454,7 @@ function files_to_soap($files_arr) {
function filetypes_to_soap($files_arr) {
$return = array();
- if (is_array($files_arr) && count($files_arr) > 0) {
+ if (is_array($files_arr) && !empty($files_arr)) {
for ($i=0; $i<count($files_arr); $i++) {
if ($files_arr[$i]->isError()) {
//skip if error
@@ -472,7 +472,7 @@ function filetypes_to_soap($files_arr) {
function fileprocessortypes_to_soap($files_arr) {
$return = array();
- if (is_array($files_arr) && count($files_arr) > 0) {
+ if (is_array($files_arr) && !empty($files_arr)) {
for ($i=0; $i<count($files_arr); $i++) {
if ($files_arr[$i]->isError()) {
//skip if error
diff --git a/src/www/soap/tracker/query.php b/src/www/soap/tracker/query.php
index 4d322c7..a88d558 100644
--- a/src/www/soap/tracker/query.php
+++ b/src/www/soap/tracker/query.php
@@ -137,7 +137,7 @@ function queries_to_soap($queries) {
// print_r($queries[1]->getExtraFields());
// die();
- if (is_array($queries) && count($queries) > 0) {
+ if (is_array($queries) && !empty($queries)) {
for ($i=0; $i < count($queries); $i++) {
$artifactQuery =& $queries[$i];
diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php
index cc7e9f2..043cca9 100644
--- a/src/www/soap/tracker/tracker.php
+++ b/src/www/soap/tracker/tracker.php
@@ -598,7 +598,7 @@ function getArtifactTypes($session_ser, $group_id) {
//
function artifacttype_to_soap($at_arr) {
$return = array();
- if (is_array($at_arr) && count($at_arr) > 0) {
+ if (is_array($at_arr) && !empty($at_arr)) {
for ($i=0; $i<count($at_arr); $i++) {
if ($at_arr[$i]->isError()) {
//skip if error
@@ -615,7 +615,7 @@ function arrangeExtraFields($extra_fields,
$extra_field_info) {
$efields=array();
$fieldsdata=array();
if (is_array($extra_fields)) {
- while(list($eky,)=each($extra_fields)) {
+ foreach ($extra_fields as $eky => $evl) {
$efields=$extra_fields[$eky];
$efid = $efields['extra_field_id'];
$data = $efields['field_data'];
@@ -835,7 +835,7 @@ function getArtifact($session_ser, $group_id,
$group_artifact_id, $artifact_id)
//
function artifacts_to_soap($at_arr) {
$return = array();
- if (is_array($at_arr) && count($at_arr) > 0) {
+ if (is_array($at_arr) && !empty($at_arr)) {
for ($i=0; $i<count($at_arr); $i++) {
if ($at_arr[$i]->isError()) {
//skip if error
@@ -845,7 +845,9 @@ function artifacts_to_soap($at_arr) {
// Retrieving the artifact details
//**checks whether there is any artifact
details exists for this object, if not continue with next loop
- if(count($at_arr[$i]) < 1) { continue; }
+ if (empty($at_arr[$i])) {
+ continue;
+ }
$flddata=array();
$extrafieldsdata=array();
$extrafieldsdata=$at_arr[$i]->getExtraFieldData();
@@ -854,10 +856,10 @@ function artifacts_to_soap($at_arr) {
//** Retrieving the extra field data and the
element data
//** checks whether there is any extra fields
data available for this artifact
//** and checks for the extra element data for
the multiselect and checkbox type
- if(is_array($extrafieldsdata) &&
count($extrafieldsdata)>0) {
- while(list($ky,
$vl)=each($extrafieldsdata)) {
+ if (is_array($extrafieldsdata) &&
!empty($extrafieldsdata)) {
+ foreach ($extrafieldsdata as $ky =>
$vl) {
$fldarr=array();
-
if(is_array($extrafieldsdata[$ky])) {
+ if
(is_array($extrafieldsdata[$ky])) {
//** Retrieving the
multiselect and checkbox type data element
$fldarr=array('extra_field_id' => $ky, 'field_data'=>implode(",",
$extrafieldsdata[$ky]));
} else {
@@ -894,7 +896,7 @@ function artifacts_to_soap($at_arr) {
//
function flattedartifacts_to_soap($at_arr) {
$return = array();
- if (is_array($at_arr) && count($at_arr) > 0) {
+ if (is_array($at_arr) && !empty($at_arr)) {
for ($i=0; $i<count($at_arr); $i++) {
if ($at_arr[$i]->isError()) {
//skip if error
@@ -904,7 +906,9 @@ function flattedartifacts_to_soap($at_arr) {
// Retrieving the artifact details
//**checks whether there is any artifact
details exists for this object, if not continue with next loop
- if(count($at_arr[$i]) < 1) { continue; }
+ if (count($at_arr[$i]) < 1) {
+ continue;
+ }
$flddata=array();
$extrafieldsdatatext=array();
$extrafieldsdatatext=$at_arr[$i]->getExtraFieldDataText();
diff --git a/src/www/survey/include/SurveyHTML.class.php
b/src/www/survey/include/SurveyHTML.class.php
index 8f24016..de0eb45 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -206,7 +206,7 @@ class SurveyHTML extends FFError {
$arr_to_add = & $s->getAddableQuestionInstances();
$arr_to_del = & $s->getQuestionInstances();
- if (count($arr_to_add)>0) {
+ if (!empty($arr_to_add)) {
$ret.='<h2>'. _('Addable Questions').'</h2>';
$title_arr[] = " ";
$title_arr[] = _('Questions');
@@ -235,7 +235,7 @@ class SurveyHTML extends FFError {
}
}
- if (count($arr_to_add)>0) {
+ if (!empty($arr_to_add)) {
/* Fill the remain cells */
if ($i%3==1) {
$ret.='<td> </td><td> </td></tr>';
@@ -247,7 +247,7 @@ class SurveyHTML extends FFError {
}
/* Deletable questions */
- if (count($arr_to_del) > 0) {
+ if (!empty($arr_to_del)) {
$ret.='<h2>'. _('Questions in this Survey').'</h2>';
$title_arr = array('', _('Question'), _('Type'),
_('Order'), _('Delete from this Survey'));
$ret.= $HTML->listTableTop($title_arr);
@@ -272,7 +272,7 @@ class SurveyHTML extends FFError {
}
- if (count($arr_to_del)) {
+ if (!empty($arr_to_del)) {
$ret.= $HTML->listTableBottom();
}
@@ -298,7 +298,7 @@ class SurveyHTML extends FFError {
$title_arr = array(_('Question ID'), _('Question'), _('Type'),
_('Edit/Delete'));
$ret.= $HTML->listTableTop($title_arr);
- for($i = 0; $i < count($questions); $i++) {
+ for ($i = 0; $i < count($questions); $i++) {
if ($questions[$i]->isError()) {
echo $questions[$i]->getErrorMessage();
continue;
@@ -690,12 +690,10 @@ class SurveyHTML extends FFError {
sprintf(ngettext('View All %s Comment',
'View All %s Comments', $totalCount), $totalCount)).
'</li></ul>';
}
-
break;
default:
break;
}
-
return $ret;
}
@@ -819,7 +817,3 @@ class SurveyHTML extends FFError {
}
}
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/www/trove/include/utils.php b/src/www/trove/include/utils.php
index 9d2931e..e52d896 100644
--- a/src/www/trove/include/utils.php
+++ b/src/www/trove/include/utils.php
@@ -41,7 +41,7 @@ function getFilterUrl($filterArray, $currentId = 0) {
unset($filterArray[$currentPosition]);
}
}
- if(sizeof($filterArray) > 0) {
+ if(!empty($filterArray)) {
$url = '&discrim='.implode(',', $filterArray);
}
return $url;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=580ba1ebb49deb7266f0f5bf425ab95e88c39f01
commit 580ba1ebb49deb7266f0f5bf425ab95e88c39f01
Author: Franck Villaume <[email protected]>
Date: Fri May 14 15:08:34 2021 +0200
clean-up: constructor PHP4
diff --git a/src/cronjobs/misc/forum_gateway.php
b/src/cronjobs/misc/forum_gateway.php
index afe1195..9c7eb21 100755
--- a/src/cronjobs/misc/forum_gateway.php
+++ b/src/cronjobs/misc/forum_gateway.php
@@ -51,7 +51,7 @@ class ForumGateway extends FFError {
var $ForumId=-1;
var $Message="";
- function ForumGateway() {
+ function __construct() {
parent::__construct();
/* Copy mail message to tmp file */
diff --git a/src/cronjobs/misc/tracker_gateway.php
b/src/cronjobs/misc/tracker_gateway.php
index 55c34c7..a8bca29 100755
--- a/src/cronjobs/misc/tracker_gateway.php
+++ b/src/cronjobs/misc/tracker_gateway.php
@@ -52,7 +52,7 @@ class TrackerGateway extends FFError {
var $ArtifactId=-1;
var $Artifact=null;
- function TrackerGateway() {
+ function __construct() {
parent::__construct();
/* Copy mail message to tmp file */
diff --git
a/src/plugins/globalactivity/include/GlobalactivityPluginDescriptor.class.php
b/src/plugins/globalactivity/include/GlobalactivityPluginDescriptor.class.php
index 9d0286c..4cdf5fe 100644
---
a/src/plugins/globalactivity/include/GlobalactivityPluginDescriptor.class.php
+++
b/src/plugins/globalactivity/include/GlobalactivityPluginDescriptor.class.php
@@ -25,7 +25,7 @@ require_once 'common/plugin/PluginDescriptor.class.php';
class GlobalactivityPluginDescriptor extends PluginDescriptor {
- function GlobalactivityPluginDescriptor() {
+ function __construct() {
$this->PluginDescriptor(_('Globalactivity'), 'v1.0', _('Global
activity in the forge'));
}
}
diff --git a/src/plugins/globalactivity/include/globalactivityPlugin.class.php
b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
index ec7438d..0c1572b 100644
--- a/src/plugins/globalactivity/include/globalactivityPlugin.class.php
+++ b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
@@ -21,7 +21,7 @@
*/
class globalactivityPlugin extends Plugin {
- public function __construct($id=0) {
+ public function __construct($id = 0) {
parent::__construct($id);
$this->name = "globalactivity";
$this->text = "Global Activity";
diff --git a/src/plugins/hudson/include/HudsonBuild.class.php
b/src/plugins/hudson/include/HudsonBuild.class.php
index adf6d0e..cfad836 100644
--- a/src/plugins/hudson/include/HudsonBuild.class.php
+++ b/src/plugins/hudson/include/HudsonBuild.class.php
@@ -33,7 +33,7 @@ class HudsonBuild {
/**
* Construct an Hudson build from a build URL
*/
- function HudsonBuild($hudson_build_url) {
+ function __construct($hudson_build_url) {
$parsed_url = parse_url($hudson_build_url);
if ( ! $parsed_url || ! array_key_exists('scheme', $parsed_url)
) {
diff --git a/src/plugins/hudson/include/HudsonJob.class.php
b/src/plugins/hudson/include/HudsonJob.class.php
index 7b8b81f..a5a2d5c 100644
--- a/src/plugins/hudson/include/HudsonJob.class.php
+++ b/src/plugins/hudson/include/HudsonJob.class.php
@@ -36,7 +36,7 @@ class HudsonJob {
/**
* Construct an Hudson job from a job URL
*/
- function HudsonJob($hudson_job_url) {
+ function __construct($hudson_job_url) {
$parsed_url = parse_url($hudson_job_url);
if ( ! $parsed_url || ! array_key_exists('scheme', $parsed_url)
) {
diff --git a/src/plugins/hudson/include/HudsonTestResult.class.php
b/src/plugins/hudson/include/HudsonTestResult.class.php
index 29b9825..39b3bd7 100644
--- a/src/plugins/hudson/include/HudsonTestResult.class.php
+++ b/src/plugins/hudson/include/HudsonTestResult.class.php
@@ -33,7 +33,7 @@ class HudsonTestResult {
/**
* Construct an Hudson job from a job URL
*/
- function HudsonTestResult($hudson_job_url) {
+ function __construct($hudson_job_url) {
$parsed_url = parse_url($hudson_job_url);
if ( ! $parsed_url || ! array_key_exists('scheme', $parsed_url)
) {
diff --git a/src/plugins/hudson/include/hudson.class.php
b/src/plugins/hudson/include/hudson.class.php
index ef56f0a..fd9f9ee 100644
--- a/src/plugins/hudson/include/hudson.class.php
+++ b/src/plugins/hudson/include/hudson.class.php
@@ -29,7 +29,7 @@ class hudson extends Controler {
private $themePath;
- function hudson() {
+ function __construct() {
$p = PluginManager::instance()->getPluginByName('hudson');
$this->themePath = '/'.$p->getThemePath();
}
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index 708b309..5351b71 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -32,13 +32,8 @@ require_once 'PluginHudsonJobDao.class.php';
class hudsonViews extends Views {
- function hudsonViews(&$controler, $view=null) {
- $request =& HTTPRequest::instance();
- $this->View($controler, $view,
array('title'=>$this->_getTitle(),'group' => $request->get('group_id'),
'toptab' => 'hudson'));
- }
-
- function header() {
- parent::header();
+ function __construct(&$controler, $view=null) {
+ $this->View($controler, $view,
array('title'=>$this->_getTitle(),'group' => getIntFromRequest('group_id'),
'toptab' => 'hudson'));
}
function _getTitle() {
@@ -57,10 +52,6 @@ class hudsonViews extends Views {
return '<b><a
href="javascript:help_window(\''.get_server_url().'help/guide/ContinuousIntegrationIntroduction.html'.$section.'\');">'.$help_label.'</a></b>';
}
- function footer() {
- parent::footer();
- }
-
// {{{ Views
function projectOverview() {
$request =& HTTPRequest::instance();
@@ -174,7 +165,6 @@ class hudsonViews extends Views {
function test_trend() {
global $HTML;
- $request =& HTTPRequest::instance();
$job_id = getIntFromRequest('job_id');
$job_dao = new
PluginHudsonJobDao(CodendiDataAccess::instance());
$dar = $job_dao->searchByJobID($job_id);
diff --git a/src/plugins/hudson/tests/AllTests.php
b/src/plugins/hudson/tests/AllTests.php
index db9872a..08c2618 100644
--- a/src/plugins/hudson/tests/AllTests.php
+++ b/src/plugins/hudson/tests/AllTests.php
@@ -10,7 +10,7 @@ require_once
'../../../codendi_tools/tests/simpletest/mock_objects.php';
//We define a group of test
class HudsonGroupTest extends GroupTest {
- function HudsonGroupTest($name = 'All Hudson Plugin tests') {
+ function __construct($name = 'All Hudson Plugin tests') {
$this->GroupTest($name);
$this->addTestFile(dirname(__FILE__).'/HudsonJobTest.php');
diff --git a/src/plugins/hudson/tests/HudsonBuildTest.php
b/src/plugins/hudson/tests/HudsonBuildTest.php
index e923304..c626f04 100644
--- a/src/plugins/hudson/tests/HudsonBuildTest.php
+++ b/src/plugins/hudson/tests/HudsonBuildTest.php
@@ -33,7 +33,7 @@ class HudsonBuildTest extends UnitTestCase {
* Constructor of the test. Can be ommitted.
* Usefull to set the name of the test
*/
- function HudsonBuildTest($name = 'HudsonBuild test') {
+ function __construct($name = 'HudsonBuild test') {
$this->UnitTestCase($name);
}
diff --git a/src/plugins/hudson/tests/HudsonJobTest.php
b/src/plugins/hudson/tests/HudsonJobTest.php
index 21fdc3d..abe4177 100644
--- a/src/plugins/hudson/tests/HudsonJobTest.php
+++ b/src/plugins/hudson/tests/HudsonJobTest.php
@@ -41,7 +41,7 @@ class HudsonJobTest extends UnitTestCase {
* Constructor of the test. Can be ommitted.
* Usefull to set the name of the test
*/
- function HudsonJobTest($name = 'HudsonJob test') {
+ function __construct($name = 'HudsonJob test') {
$this->UnitTestCase($name);
}
diff --git a/src/plugins/hudson/tests/HudsonTestResultTest.php
b/src/plugins/hudson/tests/HudsonTestResultTest.php
index 32ffd00..6af643f 100644
--- a/src/plugins/hudson/tests/HudsonTestResultTest.php
+++ b/src/plugins/hudson/tests/HudsonTestResultTest.php
@@ -36,7 +36,7 @@ class HudsonTestResultTest extends UnitTestCase {
* Constructor of the test. Can be ommitted.
* Usefull to set the name of the test
*/
- function HudsonTestResultTest($name = 'HudsonTestResult test') {
+ function __construct($name = 'HudsonTestResult test') {
$this->UnitTestCase($name);
}
diff --git a/src/plugins/mediawiki/www/DatabaseForgeMysql.php
b/src/plugins/mediawiki/www/DatabaseForgeMysql.php
index 2964e85..0174a01 100644
--- a/src/plugins/mediawiki/www/DatabaseForgeMysql.php
+++ b/src/plugins/mediawiki/www/DatabaseForgeMysql.php
@@ -20,14 +20,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-class DatabaseForge extends DataBase{
- function DatabaseForge($server=false, $user=false, $password=false,
- $dbName=false, $failFunction=false, $flags=0) {
+class DatabaseForge extends DataBase {
+ function __construct($server=false, $user=false, $password=false,
$dbName=false, $failFunction=false, $flags=0) {
global $wgDBtype;
-
$wgDBtype = "mysql";
- return Database::__construct($server, $user,
- $password, $dbName,
$failFunction, $flags);
+ return Database::__construct($server, $user, $password,
$dbName, $failFunction, $flags);
}
function tableName($name) {
@@ -39,8 +36,3 @@ class DatabaseForge extends DataBase{
}
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/mediawiki/www/DatabaseForgePgsql.php
b/src/plugins/mediawiki/www/DatabaseForgePgsql.php
index 7710d26..fb10462 100644
--- a/src/plugins/mediawiki/www/DatabaseForgePgsql.php
+++ b/src/plugins/mediawiki/www/DatabaseForgePgsql.php
@@ -22,13 +22,10 @@
require_once("$IP/includes/db/DatabasePostgres.php");
class DatabaseForge extends DatabasePostgres {
- function __construct($server=false, $user=false, $password=false,
- $dbName=false, $failFunction=false, $flags=0) {
+ function __construct($server=false, $user=false, $password=false,
$dbName=false, $failFunction=false, $flags=0) {
global $wgDBtype;
-
$wgDBtype = "postgres";
- return parent::__construct($server, $user,
- $password, $dbName, $failFunction, $flags);
+ return parent::__construct($server, $user, $password, $dbName,
$failFunction, $flags);
}
function fieldInfo($table, $field) {
@@ -93,8 +90,3 @@ class DatabaseForge extends DatabasePostgres {
return $v;
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git
a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
index 77a9fd9..3430734 100644
--- a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
+++ b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
@@ -40,7 +40,7 @@ class TaskBoardBasicAdapter extends FFError {
var $_fields = array();
var $_elements = array(); // hash of extra fields values tracker_id =>
extra_field_id => element_name => element_id
- function TaskBoardBasicAdapter($TaskBoard) {
+ function __construct($TaskBoard) {
$this->TaskBoard = $TaskBoard;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Group.class.php | 2 +-
src/common/include/User.class.php | 2 +-
src/common/include/sqlparser.php | 2 +-
src/common/include/tag_cloud.php | 2 +-
src/common/pm/ProjectTask.class.php | 37 +++++++-------
src/common/survey/Survey.class.php | 4 +-
src/common/tracker/Artifact.class.php | 10 ++--
src/common/tracker/ArtifactFactory.class.php | 2 +-
src/common/tracker/actions/admin-ind.php | 2 +-
src/common/tracker/actions/ind.php | 4 +-
src/common/tracker/actions/tracker.php | 2 +-
.../tracker/include/ArtifactTypeHtml.class.php | 2 +-
src/common/tracker/views/form-clonetracker.php | 4 +-
src/common/tracker/views/form-workflow.php | 2 +-
.../widget/Widget_ProjectPublicAreas.class.php | 2 +-
src/common/widget/Widget_TrackerContent.class.php | 8 +--
src/cronjobs/db/massmail.php | 2 +-
src/cronjobs/misc/forum_gateway.php | 2 +-
src/cronjobs/misc/tracker_gateway.php | 2 +-
.../GlobalactivityPluginDescriptor.class.php | 2 +-
.../include/globalactivityPlugin.class.php | 2 +-
src/plugins/hudson/include/HudsonBuild.class.php | 2 +-
src/plugins/hudson/include/HudsonJob.class.php | 2 +-
.../hudson/include/HudsonTestResult.class.php | 2 +-
src/plugins/hudson/include/hudson.class.php | 2 +-
src/plugins/hudson/include/hudsonViews.class.php | 14 +-----
src/plugins/hudson/tests/AllTests.php | 2 +-
src/plugins/hudson/tests/HudsonBuildTest.php | 2 +-
src/plugins/hudson/tests/HudsonJobTest.php | 2 +-
src/plugins/hudson/tests/HudsonTestResultTest.php | 2 +-
src/plugins/mantisbt/view/viewIssues.php | 4 +-
src/plugins/mediawiki/www/DatabaseForgeMysql.php | 14 ++----
src/plugins/mediawiki/www/DatabaseForgePgsql.php | 12 +----
src/plugins/scmbzr/common/BzrPlugin.class.php | 2 +-
src/plugins/scmcvs/bin/aclcheck.php | 2 +-
src/plugins/scmcvs/www/acl.php | 4 +-
src/plugins/scmdarcs/common/DarcsPlugin.class.php | 2 +-
src/plugins/scmgit/common/GitPlugin.class.php | 2 +-
src/plugins/scmhg/common/HgPlugin.class.php | 2 +-
src/plugins/scmsvn/common/SVNPlugin.class.php | 4 +-
.../adapters/TaskBoardBasicAdapter.class.php | 2 +-
src/plugins/taskboard/common/views/admin/ind.php | 2 +-
.../taskboard/common/views/admin/trackers.php | 4 +-
src/plugins/taskboard/common/views/ind.php | 2 +-
.../taskboard/common/views/releases/burndown.php | 2 +-
src/www/activity/index.php | 4 +-
src/www/export/rss20_docman.php | 2 +-
src/www/export/rss20_forum.php | 58 +++++++++++-----------
src/www/export/rss20_tracker.php | 2 +-
src/www/forum/admin/index.php | 2 +-
src/www/forum/index.php | 4 +-
src/www/forum/myforums.php | 2 +-
src/www/people/people_utils.php | 4 +-
src/www/pm/admin/index.php | 2 +-
src/www/pm/index.php | 2 +-
src/www/pm/task.php | 2 +-
src/www/project/admin/users.php | 2 +-
src/www/register/index.php | 2 +-
src/www/scm/admin/index.php | 2 +-
src/www/scm/index.php | 2 +-
src/www/soap/docman/docman.php | 2 +-
src/www/soap/frs/frs.php | 10 ++--
src/www/soap/tracker/query.php | 2 +-
src/www/soap/tracker/tracker.php | 22 ++++----
src/www/survey/include/SurveyHTML.class.php | 16 ++----
src/www/trove/include/utils.php | 2 +-
66 files changed, 151 insertions(+), 182 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
