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 fb8f905d601368f2547d1a26506e51f2e3f5f6a8 (commit)
from 5df100b35d6fe5d028a2e684e699902e6a2b3545 (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=fb8f905d601368f2547d1a26506e51f2e3f5f6a8
commit fb8f905d601368f2547d1a26506e51f2e3f5f6a8
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Mar 20 13:16:23 2017 +0100
Whitespace
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index e0e8ae5..3fbb8e3 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -136,7 +136,7 @@ if ($set == 'custom') {
}
}
-if (is_array($_extra_fields)){
+if (is_array($_extra_fields)) {
$keys=array_keys($_extra_fields);
foreach ($keys as $key) {
if ($_extra_fields[$key] != 'Array') {
@@ -144,7 +144,7 @@ if (is_array($_extra_fields)){
}
}
} else {
- if (isset($_extra_fields)){
+ if (isset($_extra_fields)) {
$aux_extra_fields = $_extra_fields;
} else {
$aux_extra_fields = '';
@@ -277,7 +277,7 @@ echo $ath->renderBrowseInstructions();
if ($ath->usesCustomStatuses()) {
$aux_extra_fields = array();
- if (is_array($_extra_fields)){
+ if (is_array($_extra_fields)) {
$keys=array_keys($_extra_fields);
foreach ($keys as $key) {
if (!is_array($_extra_fields[$key])) {
diff --git a/src/common/tracker/views/form-addcanned.php
b/src/common/tracker/views/form-addcanned.php
index caff8b9..fdcf9dc 100644
--- a/src/common/tracker/views/form-addcanned.php
+++ b/src/common/tracker/views/form-addcanned.php
@@ -44,7 +44,7 @@ if ($result && $rows > 0) {
$title_arr[]=_('Title');
$title_arr[]=_('Operation');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i=0; $i < $rows; $i++) {
$id = db_result($result, $i, 'id');
diff --git a/src/common/tracker/views/form-addextrafieldoption.php
b/src/common/tracker/views/form-addextrafieldoption.php
index d6f7a1c..2e39edc 100644
--- a/src/common/tracker/views/form-addextrafieldoption.php
+++ b/src/common/tracker/views/form-addextrafieldoption.php
@@ -58,7 +58,7 @@ if (!$ac || !is_object($ac)) {
$g=$ath->getGroup();
$roles = $g->getRoles();
foreach ($roles as $role) {
- if (!in_array(get_class($role),
array('RoleLoggedIn','RoleAnonymous'))){
+ if (!in_array(get_class($role),
array('RoleLoggedIn','RoleAnonymous'))) {
$vals[$role->getID()]=$role->getName();
}
}
@@ -93,7 +93,7 @@ if (!$ac || !is_object($ac)) {
$title_arr[]=_('Default');
}
$title_arr[]='';
- echo $HTML->listTableTop ($title_arr,false, '
');
+ echo $HTML->listTableTop($title_arr, false, '
');
if (in_array($efType,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_CHOICE))) {
$row_attrs =
array('class'=>$HTML->boxGetAltRowStyle(-1,true));
$cells = array();
@@ -184,7 +184,7 @@ if (!$ac || !is_object($ac)) {
echo html_e('strong', array(), _('Status'));
echo $ath->statusBox('status_id',1,false,false);
}
- echo html_e('input', array( 'type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
+ echo html_e('input', array('type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
echo $HTML->closeForm();
}
if ($efType != ARTIFACT_EXTRAFIELDTYPE_USER) {} else {}
diff --git a/src/common/tracker/views/form-customizelist.php
b/src/common/tracker/views/form-customizelist.php
index 0ae04f9..381095c 100644
--- a/src/common/tracker/views/form-customizelist.php
+++ b/src/common/tracker/views/form-customizelist.php
@@ -106,7 +106,7 @@ $title_arr[] = _('Current/New positions');
$title_arr[] = _('Up/Down positions');
$title_arr[] = _('Delete');
-echo $HTML->listTableTop ($title_arr,false, ' ');
+echo $HTML->listTableTop($title_arr,false, ' ');
echo implode('', $rows);
echo '<tr class="noborder">
<td>
diff --git a/src/common/widget/Widget_MyArtifacts.class.php
b/src/common/widget/Widget_MyArtifacts.class.php
index 03313a7..88210a9 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -112,17 +112,17 @@ class Widget_MyArtifacts extends Widget {
global $HTML;
$atf = new
ArtifactsForUser(@UserManager::instance()->getCurrentUser());
$my_artifacts = array();
- if ($this->_artifact_show == 'ASM'){
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select
artifact_monitor.artifact_id FROM artifact_monitor WHERE
artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(
UserManager::instance()->getCurrentUser()->getID()));
+ if ($this->_artifact_show == 'ASM') {
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select
artifact_monitor.artifact_id FROM artifact_monitor WHERE
artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
}
- if ($this->_artifact_show == 'AS'){
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(
UserManager::instance()->getCurrentUser()->getID()));
+ if ($this->_artifact_show == 'AS') {
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
}
- if ($this->_artifact_show == 'AM'){
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id DESC',array(
UserManager::instance()->getCurrentUser()->getID()));
+ if ($this->_artifact_show == 'AM') {
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.assigned_to=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
}
- if ($this->_artifact_show == 'SM'){
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id DESC',array(
UserManager::instance()->getCurrentUser()->getID()));
+ if ($this->_artifact_show == 'SM') {
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.artifact_id IN (select artifact_monitor.artifact_id
FROM artifact_monitor WHERE artifact_monitor.user_id = $1)) AND av.status_id=1
ORDER BY av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
}
if ($this->_artifact_show== 'S') {
$my_artifacts = $atf->getSubmittedArtifactsByGroup();
@@ -131,11 +131,11 @@ class Widget_MyArtifacts extends Widget {
$my_artifacts = $atf->getAssignedArtifactsByGroup();
}
if ($this->_artifact_show== 'M') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id DESC',array(
UserManager::instance()->getCurrentUser()->getID()));;
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));;
}
if (count($my_artifacts) > 0) {
- $html_my_artifacts = $HTML->listTableTop(array());
+ $html_my_artifacts = $HTML->listTableTop();
$html_my_artifacts .=
$this->_display_artifacts($my_artifacts, 1);
$html_my_artifacts .= $HTML->listTableBottom();
} else {
@@ -180,7 +180,7 @@ class Widget_MyArtifacts extends Widget {
$allIds = array();
$pm = ProjectManager::instance();
- foreach ($list_trackers as $trackers_array ) {
+ foreach ($list_trackers as $trackers_array) {
$atid = $trackers_array->getArtifactType()->getID();
$group_id =
$trackers_array->getArtifactType()->getGroup()->getID();
@@ -194,7 +194,8 @@ class Widget_MyArtifacts extends Widget {
//work on the tracker of the last round if
there was one
if ($atid != $atid_old && $count_aids != 0) {
- list($hide_now,$count_diff,$hide_url) =
my_hide_url('artifact', $atid_old, $hide_item_id, $count_aids, $hide_artifact);
+ list($hide_now,$count_diff,$hide_url) =
+ my_hide_url('artifact',
$atid_old, $hide_item_id, $count_aids, $hide_artifact);
$count_new = max(0, $count_diff);
$cells = array();
$cells[] = array($hide_url.
diff --git a/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
b/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
index aa4b451..2521f27 100644
--- a/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
+++ b/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
@@ -69,7 +69,7 @@ class cvstrackerPlugin extends Plugin {
echo '<h4>'._('Links to related CVS commits').':</h4>';
$title_arr=$this->getTitleArr();
- echo $GLOBALS['HTML']->listTableTop ($title_arr);
+ echo $GLOBALS['HTML']->listTableTop($title_arr);
for ($i=0; $i<$Rows; $i++) {
$Row = db_fetch_array($DBResult);
@@ -118,7 +118,7 @@ class cvstrackerPlugin extends Plugin {
* Return a link to the File in cvsweb
*
* @param String $GroupName is the Name of the project
- * @param String $FileName is the FileName ( with path )
+ * @param String $FileName is the FileName (with path)
*
* @return String The string containing a link to the File in the
cvsweb
*
@@ -133,7 +133,7 @@ class cvstrackerPlugin extends Plugin {
* Return a link to the File in cvsweb in the specified Version
*
* @param String $GroupName is the Name of the project
- * @param String $FileName is the FileName ( with path )
+ * @param String $FileName is the FileName (with path)
* @param String $Version the version to retrieve
*
* @return String The string containing a link to the File in the
cvsweb
@@ -150,7 +150,7 @@ class cvstrackerPlugin extends Plugin {
* Return a link to the diff between two versions of a File in cvsweb
*
* @param String $GroupName is the Name of the project
- * @param String $FileName is the FileName ( with path )
+ * @param String $FileName is the FileName (with path)
* @param String $PrevVersion First version to retrieve
* @param String $ActualVersion Second version to retrieve
*
@@ -176,10 +176,10 @@ class cvstrackerPlugin extends Plugin {
$FOut = fopen($path, "a");
if($FOut) {
fwrite($FOut, "# BEGIN added by
gforge-plugin-cvstracker\n");
- if ( $cvs_binary_version == "1.12" ) {
+ if ($cvs_binary_version == "1.12") {
$Line = "ALL ( php -q -d
include_path=".ini_get('include_path')."
".forge_get_config('plugins_path')."/cvstracker/bin/post.php %r %p %{sVv} )\n";
}
- if ( $cvs_binary_version == "1.11") {
+ if ($cvs_binary_version == "1.11") {
$Line = "ALL ( php -q -d
include_path=".ini_get('include_path')."
".forge_get_config('plugins_path')."/cvstracker/bin/post.php
".$group->getUnixName()." %{sVv} )\n";
}
fwrite($FOut,$Line);
@@ -198,7 +198,7 @@ class cvstrackerPlugin extends Plugin {
$cvs_binary_version = get_cvs_binary_version();
$array=array();
$array[]="# BEGIN added by gforge-plugin-cvstracker\n";
- if ( $cvs_binary_version == "1.11" ) {
+ if ($cvs_binary_version == "1.11") {
$array[] = "ALL ( php -q -d
include_path=".ini_get('include_path')."
".forge_get_config('plugins_path')."/cvstracker/bin/post.php
".$group->getUnixName()." %{sVv} )\n";
}else { //it's version 1.12
$array[] = "ALL ( php -q -d
include_path=".ini_get('include_path')."
".forge_get_config('plugins_path')."/cvstracker/bin/post.php %r %p %{sVv} )\n";
@@ -288,8 +288,8 @@ class cvstrackerPlugin extends Plugin {
preg_match("/cvstracker/",$Line)) {
$LineFound =
TRUE;
}
- }
- fclose($FIn);
+ }
+ fclose($FIn);
}
if($LineFound == FALSE) {
$this->addCvsTrackerToFile($Group,
$newfile);
diff --git a/src/www/admin/cronman.php b/src/www/admin/cronman.php
index eb1a65a..97e7a56 100644
--- a/src/www/admin/cronman.php
+++ b/src/www/admin/cronman.php
@@ -72,7 +72,7 @@ if ($totalCount) {
_('Message')
);
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i=0; $i<db_numrows($res); $i++) {
$cells = array();
diff --git a/src/www/forum/forum.php b/src/www/forum/forum.php
index 26c0504..899cbbf 100644
--- a/src/www/forum/forum.php
+++ b/src/www/forum/forum.php
@@ -113,7 +113,7 @@ if ($forum_id) {
$error_msg = $fm->getErrorMessage();
session_redirect('/forum/new.php?forum_id='.$forum_id.'&group_id='.$group_id);
} else {
- if ($fm->isPending() ) {
+ if ($fm->isPending()) {
$feedback = _('Message Queued for moderation ->
Please wait until the admin approves/rejects it');
} else {
$feedback = _('Message Posted Successfully');
@@ -226,13 +226,13 @@ if ($forum_id) {
New slashdot-inspired nested threads,
showing all submessages and bodies
*/
- $ret_val .= $fh->showNestedMessage ( $msg_arr["0"][$i]
).'<br />';
+ $ret_val .=
$fh->showNestedMessage($msg_arr["0"][$i]).'<br />';
- if ( $msg_arr["0"][$i]->hasFollowups() ) {
+ if ($msg_arr["0"][$i]->hasFollowups()) {
//show submessages for this message
$tempid=$msg_arr["0"][$i]->getID();
// echo "<p>before showNestedMessages() $tempid |
". count( $msg_arr["$tempid"] );
- $ret_val .= $fh->showNestedMessages ( $msg_arr,
$tempid );
+ $ret_val .= $fh->showNestedMessages($msg_arr,
$tempid);
}
$i++;
}
@@ -251,7 +251,7 @@ if ($forum_id) {
$title_arr[]=_('Author');
$title_arr[]=_('Date');
- $ret_val .= $HTML->listTableTop ($title_arr);
+ $ret_val .= $HTML->listTableTop($title_arr);
$rows=count($msg_arr[0]);
$avail_rows=$fmf->fetched_rows;
@@ -299,7 +299,7 @@ if ($forum_id) {
$avail_rows=$fmf->fetched_rows;
for ($i=0; ($i<count($msg_arr) && ($i < $max_rows)); $i++) {
- $ret_val .= $fh->showNestedMessage ( $msg_arr[$i]
).'<br />';
+ $ret_val .= $fh->showNestedMessage($msg_arr[$i]).'<br
/>';
}
} else {
@@ -331,7 +331,7 @@ if ($forum_id) {
$title_arr[]=_('Replies');
$title_arr[]=_('Last Post');
- $ret_val .= $HTML->listTableTop ($title_arr);
+ $ret_val .= $HTML->listTableTop($title_arr);
$i=0;
while (($row=db_fetch_array($result)) && ($i <
$max_rows)) {
/*
diff --git a/src/www/forum/message.php b/src/www/forum/message.php
index b88a2aa..740f3e7 100644
--- a/src/www/forum/message.php
+++ b/src/www/forum/message.php
@@ -114,7 +114,7 @@ if ($msg_id) {
// $title_arr=array();
// $title_arr[]=_('Message')._(': ').$msg_id;
-// echo $GLOBALS['HTML']->listTableTop ($title_arr);
+// echo $GLOBALS['HTML']->listTableTop($title_arr);
$url = util_make_url('/forum/message.php?msg_id='. $msg_id
.'&group_id='.$group_id);
@@ -162,7 +162,7 @@ if ($msg_id) {
$title_arr[]=_('Author');
$title_arr[]=_('Date');
- $ret_val = $HTML->listTableTop ($title_arr);
+ $ret_val = $HTML->listTableTop($title_arr);
$rows=count($msg_arr[0]);
diff --git a/src/www/people/people_utils.php b/src/www/people/people_utils.php
index 9d8a9c9..981a766 100644
--- a/src/www/people/people_utils.php
+++ b/src/www/people/people_utils.php
@@ -32,7 +32,7 @@ function people_header($params) {
$params['toptab'] = 'people';
$params['group'] = $group_id;
site_project_header($params);
- } elseif (isset($_SERVER['HTTP_REFERER']) &&
strstr($_SERVER['HTTP_REFERER'], 'account')){
+ } elseif (isset($_SERVER['HTTP_REFERER']) &&
strstr($_SERVER['HTTP_REFERER'], 'account')) {
$params['toptab'] = 'my';
site_user_header($params);
} else {
@@ -131,7 +131,7 @@ function people_show_skill_inventory($user_id) {
$title_arr[]=_('Experience');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
$rows=db_numrows($result);
if (!$result || $rows < 1) {
@@ -162,7 +162,7 @@ function people_edit_skill_inventory($user_id) {
$title_arr[]=_('Experience');
$title_arr[]=_('Action');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
$rows=db_numrows($result);
if (!$result || $rows < 1) {
@@ -245,7 +245,7 @@ function people_show_job_inventory($job_id) {
$title_arr[]=_('Level');
$title_arr[]=_('Experience');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
$rows=db_numrows($result);
if (!$result || $rows < 1) {
@@ -308,7 +308,7 @@ function people_edit_job_inventory($job_id,$group_id) {
$title_arr[]=_('Experience').utils_requiredField();
$title_arr[]=_('Action');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
$rows=db_numrows($result);
if (!$result || $rows < 1) {
@@ -375,7 +375,7 @@ function people_show_category_table() {
if ($added && ((count($categories) - 1) > 0)) {
for ($j = 0; $j < (count($categories) - 1); $j++) {
$found = 0;
- if ( $categories[$j]['category_id'] ==
$categories[$i]['category_id'] ) {
+ if ($categories[$j]['category_id'] ==
$categories[$i]['category_id']) {
$categories[$j]['total'] +=
$categories[$i]['total'];
$found = 1;
break;
@@ -451,7 +451,7 @@ function people_show_job_list($result) {
if (count($projects) < 1) {
$return = $HTML->warning_msg(_('None Found'));
} else {
- $return = $HTML->listTableTop ($title_arr);
+ $return = $HTML->listTableTop($title_arr);
for ($i = 0; $i < count($projects); $i++) {
$return .= '
<tr '. $HTML->boxGetAltRowStyle($i) . '>
diff --git a/src/www/pm/admin/index.php b/src/www/pm/admin/index.php
index 51b68c2..170959c 100644
--- a/src/www/pm/admin/index.php
+++ b/src/www/pm/admin/index.php
@@ -188,7 +188,7 @@ if ($add_cat && $group_project_id) {
$title_arr=array();
$title_arr[]=_('Id');
$title_arr[]=_('Title');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i=0; $i < $rows; $i++) {
$cells = array();
$cells[][] = db_result($result, $i, 'category_id');
diff --git a/src/www/pm/browse_task.php b/src/www/pm/browse_task.php
index 1179b7a..a640042 100644
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@ -277,7 +277,7 @@ if ($rows < 1) {
if ($_view=="detail") {
echo '
<tr class="priority'.$pt_arr[$i]->getPriority() .'">
- <td> </td><td
colspan="'.(count($title_arr)-1).'">'. nl2br( $pt_arr[$i]->getDetails() )
.'</td>
+ <td> </td><td
colspan="'.(count($title_arr)-1).'">'. nl2br($pt_arr[$i]->getDetails()) .'</td>
</tr>';
}
}
diff --git a/src/www/pm/include/ProjectTaskHTML.class.php
b/src/www/pm/include/ProjectTaskHTML.class.php
index 547ba66..9af7f82 100644
--- a/src/www/pm/include/ProjectTaskHTML.class.php
+++ b/src/www/pm/include/ProjectTaskHTML.class.php
@@ -41,11 +41,11 @@ class ProjectTaskHTML extends ProjectTask {
}
function multipleAssignedBox ($name='assigned_to[]') {
- $engine = RBACEngine::getInstance () ;
+ $engine = RBACEngine::getInstance();
$techs = $engine->getUsersByAllowedAction ('pm',
$this->ProjectGroup->getID(), 'tech') ;
- $tech_id_arr = array () ;
- $tech_name_arr = array () ;
+ $tech_id_arr = array();
+ $tech_name_arr = array();
foreach ($techs as $tech) {
$tech_id_arr[] = $tech->getID() ;
@@ -54,7 +54,7 @@ class ProjectTaskHTML extends ProjectTask {
//get the data so we can mark items as SELECTED
$arr2 = $this->getAssignedTo();
- return html_build_multiple_select_box_from_arrays
($tech_id_arr,$tech_name_arr,$name,$arr2);
+ return
html_build_multiple_select_box_from_arrays($tech_id_arr,$tech_name_arr,$name,$arr2);
}
function showDependentTasks () {
@@ -63,7 +63,7 @@ class ProjectTaskHTML extends ProjectTask {
FROM project_task,project_dependencies
WHERE
project_task.project_task_id=project_dependencies.project_task_id
AND project_dependencies.is_dependent_on_task_id=$1',
- array($this->getID() ));
+ array($this->getID()));
$rows=db_numrows($result);
if ($rows > 0) {
echo html_e('h3', array(), _('Tasks That Depend on This
Task'));
@@ -72,7 +72,7 @@ class ProjectTaskHTML extends ProjectTask {
$title_arr[]=_('Task Id');
$title_arr[]=_('Task Summary');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i = 0; $i < $rows; $i++) {
$cells = array();
@@ -107,7 +107,7 @@ class ProjectTaskHTML extends ProjectTask {
$title_arr[]=_('Open Date');
(($is_admin) ? $title_arr[]=_('Remove Relation') : '');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i = 0; $i < $rows; $i++) {
$cells = array();
@@ -189,7 +189,7 @@ class ProjectTaskHTML extends ProjectTask {
$title_arr[]=_('Date');
$title_arr[]=_('By');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i = 0; $i < $rows; $i++) {
$field = db_result($result, $i, 'field_name');
diff --git a/src/www/project/admin/project_admin_utils.php
b/src/www/project/admin/project_admin_utils.php
index 0089077..1c2c56e 100644
--- a/src/www/project/admin/project_admin_utils.php
+++ b/src/www/project/admin/project_admin_utils.php
@@ -161,7 +161,7 @@ function show_grouphistory($group_id) {
$title_arr[]=_('Date');
$title_arr[]=_('By');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
for ($i=0; $i < $rows; $i++) {
$field = db_result($result, $i, 'field_name');
$cells = array();
diff --git a/src/www/reporting/projecttime.php
b/src/www/reporting/projecttime.php
index 05922e3..5ce2ec7 100644
--- a/src/www/reporting/projecttime.php
+++ b/src/www/reporting/projecttime.php
@@ -92,15 +92,14 @@ if ($g_id && $typ=='r') {
$labels = $report->labels;
$data = $report->getData();
- echo $HTML->listTableTop (array(_('Type'),
- _('Time')));
+ echo $HTML->listTableTop(array(_('Type'), _('Time')));
for ($i=0; $i<count($labels); $i++) {
echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
'<td>'. $labels[$i] .'</td><td>'. $data[$i] .'</td></tr>';
}
- echo $HTML->listTableBottom ();
+ echo $HTML->listTableBottom();
} elseif ($g_id && $start != $end) {
report_timegraph('project', $type, $start, $end, $g_id);
diff --git a/src/www/reporting/sitetime.php b/src/www/reporting/sitetime.php
index 506af3f..185319e 100644
--- a/src/www/reporting/sitetime.php
+++ b/src/www/reporting/sitetime.php
@@ -92,14 +92,14 @@ if ($typ =='r') {
$labels = $report->labels;
$data = $report->getData();
- echo $HTML->listTableTop (array(_('Type'), _('Time')));
+ echo $HTML->listTableTop(array(_('Type'), _('Time')));
for ($i=0; $i<count($labels); $i++) {
echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
'<td>'. $labels[$i] .'</td><td>'. $data[$i]
.'</td></tr>';
}
- echo $HTML->listTableBottom ();
+ echo $HTML->listTableBottom();
} elseif ($start != $end) {
report_timegraph('site', $type, $start, $end);
}
diff --git a/src/www/reporting/sitetimebar.php
b/src/www/reporting/sitetimebar.php
index b8b72a0..1a13b11 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -94,8 +94,7 @@ if ($typ=='r') {
$report->setData($res,1);
$data=$report->getData();
$labels=$report->getDates();
- echo $HTML->listTableTop (array(_('Week'),
- _('Time')));
+ echo $HTML->listTableTop(array(_('Week'), _('Time')));
for ($i=0; $i<count($labels); $i++) {
@@ -104,7 +103,7 @@ if ($typ=='r') {
}
- echo $HTML->listTableBottom ();
+ echo $HTML->listTableBottom();
} elseif ($start != $end) {
report_sitetimebargraph($start, $end);
diff --git a/src/www/reporting/timeadd.php b/src/www/reporting/timeadd.php
index bba13d8..a1be33b 100644
--- a/src/www/reporting/timeadd.php
+++ b/src/www/reporting/timeadd.php
@@ -150,7 +150,7 @@ if ($week) {
$xi = 0;
$total_hours = 0;
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
while ($r=db_fetch_array($res)) {
echo '<tr '.$HTML->boxGetAltRowStyle($xi++).'>
<td class="align-center">'.$r['name'].'</td>
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index 5f5ca7b..78a91e6 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -115,7 +115,7 @@ if ($sw) {
}
- echo $HTML->listTableBottom ();
+ echo $HTML->listTableBottom();
} elseif ($dev_id && $start != $end) {
report_timegraph('user', $type, $start, $end, $dev_id);
diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index 6c760aa..8bff5ff 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -69,7 +69,7 @@ if ($type=='snippet') {
$title_arr[]= _('Author');
$title_arr[]= _('Delete');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
/*
get the newest version of this snippet, so we can
display its code
@@ -153,7 +153,7 @@ if ($type=='snippet') {
$title_arr[]= _('Author');
$title_arr[]= _('Actions');
- echo $HTML->listTableTop ($title_arr);
+ echo $HTML->listTableTop($title_arr);
/*
determine the newest version of this package,
diff --git a/src/www/survey/include/SurveyHTML.class.php
b/src/www/survey/include/SurveyHTML.class.php
index f7c1c49..33bf016 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -46,7 +46,7 @@ class SurveyHTML extends FFError {
$params['toptab'] = 'surveys';
$params['group'] = $group_id;
- if ($project = group_get_object($group_id)){
+ if ($project = group_get_object($group_id)) {
if (!$project->usesSurvey()) {
exit_disabled();
}
@@ -99,7 +99,7 @@ class SurveyHTML extends FFError {
* @param Survey $q Question Question Object
* @return string
*/
- function showAddQuestionForm( &$q ) {
+ function showAddQuestionForm(&$q) {
global $group_id;
global $HTML;
@@ -144,7 +144,7 @@ class SurveyHTML extends FFError {
* @param Survey $s Question Question Object
* @return string
*/
- function showAddSurveyForm( &$s) {
+ function showAddSurveyForm(&$s) {
global $group_id;
global $survey_id;
global $HTML;
@@ -153,7 +153,7 @@ class SurveyHTML extends FFError {
if (! $survey_id && ! count($s->getAddableQuestionInstances()))
{
$ret = '<p>' . sprintf(_('Please %1$s create a question
%2$s before creating a survey'),
'<a
href="'.util_make_url('/survey/admin/question.php?group_id='.$group_id).'">',
- '</a>') .
+ '</a>') .
'</p>';
return $ret;
}
@@ -205,7 +205,7 @@ class SurveyHTML extends FFError {
$title_arr[] = " ";
$title_arr[] = _('Questions');
$title_arr[] = " ";
- $ret.= $HTML->listTableTop ($title_arr);
+ $ret.= $HTML->listTableTop($title_arr);
}
for($i = 0; $i < count($arr_to_add); $i++) {
@@ -294,7 +294,7 @@ class SurveyHTML extends FFError {
/* Head information */
$title_arr = array(_('Question ID'), _('Question'), _('Type'),
_('Edit/Delete'));
- $ret.= $HTML->listTableTop ($title_arr);
+ $ret.= $HTML->listTableTop($title_arr);
for($i = 0; $i < count($questions); $i++) {
if ($questions[$i]->isError()) {
@@ -327,7 +327,7 @@ class SurveyHTML extends FFError {
$show_vote=0, $show_edit=0, $show_result=0,
$show_result_graph=0, $show_result_comment=0,
$show_result_csv=0,
- $show_inactive=0 ) {
+ $show_inactive=0) {
global $user_id;
global $group_id;
global $HTML;
@@ -370,7 +370,7 @@ class SurveyHTML extends FFError {
$title_arr[] = _("CSV");
}
- $ret.= $HTML->listTableTop ($title_arr);
+ $ret.= $HTML->listTableTop($title_arr);
/* Color index for table */
$color_index=0;
@@ -655,7 +655,7 @@ class SurveyHTML extends FFError {
//print 100 chars in words per line
foreach ($words as $word) {
// if we have a stupidly
strange word with lots of letters, we'll make a new line for it and split it
- if ( (strlen($word)>100) &&
((strlen($word)+$linelength)>100)) {
+ if ((strlen($word)>100) &&
((strlen($word)+$linelength)>100)) {
$chunks =
$this->split_str($word,50);
foreach ($chunks as
$chunk) {
$ret .= $chunk;
@@ -702,7 +702,7 @@ class SurveyHTML extends FFError {
for ($i=0;$i<$cnt;$i+=$split_lengt) {
$rslt[]= substr($str,$i,$split_lengt);
}
- return $rslt;
+ return $rslt;
}
/**
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/browse.php | 6 +++---
src/common/tracker/views/form-addcanned.php | 2 +-
.../tracker/views/form-addextrafieldoption.php | 6 +++---
src/common/tracker/views/form-customizelist.php | 2 +-
src/common/widget/Widget_MyArtifacts.class.php | 25 +++++++++++-----------
.../cvstracker/common/cvstrackerPlugin.class.php | 18 ++++++++--------
src/www/admin/cronman.php | 2 +-
src/www/forum/forum.php | 14 ++++++------
src/www/forum/message.php | 4 ++--
src/www/people/people_utils.php | 14 ++++++------
src/www/pm/admin/index.php | 2 +-
src/www/pm/browse_task.php | 2 +-
src/www/pm/include/ProjectTaskHTML.class.php | 16 +++++++-------
src/www/project/admin/project_admin_utils.php | 2 +-
src/www/reporting/projecttime.php | 5 ++---
src/www/reporting/sitetime.php | 4 ++--
src/www/reporting/sitetimebar.php | 5 ++---
src/www/reporting/timeadd.php | 2 +-
src/www/reporting/usertime.php | 2 +-
src/www/snippet/detail.php | 4 ++--
src/www/survey/include/SurveyHTML.class.php | 20 ++++++++---------
21 files changed, 78 insertions(+), 79 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
