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 1fde58fcd55cebbf274ed41e442a8f0216904678 (commit)
via 99e98b3a330078dd4dd569c246911677d9cc6bcc (commit)
via b17048171ea0e4e58b34c4fdc3627bf9e3736887 (commit)
via a2214eb9c1aca9f4e2fb8fa5378ac3715704f3c9 (commit)
via ee1b8bab115357d621ae8dc89acf5ff4f3eb3ee5 (commit)
via 20249ac9b4c28551a15c14c35ded30473f4edb16 (commit)
from 496582d51cd099a51eae0f19640a2c9946878a94 (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=1fde58fcd55cebbf274ed41e442a8f0216904678
commit 1fde58fcd55cebbf274ed41e442a8f0216904678
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:19:54 2016 +0200
Whitespace
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 01aaae7..3dbc023 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -733,18 +733,19 @@ if ($art_arr && $art_cnt > 0) {
}
}
$ath->renderExtraFields($sel,true,_('No Change'),false,'',
array(ARTIFACT_EXTRAFIELD_FILTER_INT),true);
- echo '<tr>
- <td><strong>'._('Priority')._(':').'</strong><br />';
+ echo '<tr>';
+ echo '<td><strong>'._('Priority')._(':').'</strong><br />';
build_priority_select_box ('priority', '100', true);
- echo '</td><td>';
-
- echo '</td>
- </tr>
+ echo '</td>';
+ echo '<td>';
+ echo '</td>';
+ echo '</tr>';
- <tr>
- <td><strong>'._('Assigned to')._(':').'</strong><br />'.
- $ath->technicianBox
('assigned_to','100.1',true,_('Nobody'),'100.1',_('No Change')) .'</td>
- <td>';
+ echo '<tr>';
+ echo '<td><strong>'._('Assigned to')._(':').'</strong><br />';
+ echo $ath->technicianBox
('assigned_to','100.1',true,_('Nobody'),'100.1',_('No Change'));
+ echo'</td>';
+ echo '<td>';
if (!$ath->usesCustomStatuses()) {
echo '<strong>'._('State')._(': ').'</strong>
<br />'. $ath->statusBox
('status_id','xzxz',true,_('No Change'));
@@ -752,8 +753,9 @@ if ($art_arr && $art_cnt > 0) {
echo '</td>';
echo '</tr>';
- echo '<tr><td colspan="2"><strong>'._('Canned
Response')._(':').'</strong><br />'.
- $ath->cannedResponseBox ('canned_response')
.'</td></tr>
+ echo '<tr>';
+ echo '<td colspan="2"><strong>'._('Canned
Response')._(':').'</strong><br />';
+ echo $ath->cannedResponseBox ('canned_response') .'</td></tr>
<tr><td colspan="3" class="align-center"><input
type="submit" name="submit" value="'._('Mass Update').'" /></td></tr>
</table>';
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 64cdb1e..0f67c7a 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -145,7 +145,7 @@ foreach ($atf->getArtifactTypes() as $at) {
}
}
-$res = db_query_params ('SELECT group_artifact_id, name
+$res = db_query_params('SELECT group_artifact_id, name
FROM artifact_group_list
WHERE group_artifact_id = ANY ($1)',
array (db_int_array_to_any_clause ($tids))) ;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=99e98b3a330078dd4dd569c246911677d9cc6bcc
commit 99e98b3a330078dd4dd569c246911677d9cc6bcc
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:18:42 2016 +0200
Fix function getHealthDescriptions; no break needed after return
diff --git a/src/plugins/hudson/include/HudsonJob.class.php
b/src/plugins/hudson/include/HudsonJob.class.php
index f61c45e..7b8b81f 100644
--- a/src/plugins/hudson/include/HudsonJob.class.php
+++ b/src/plugins/hudson/include/HudsonJob.class.php
@@ -136,39 +136,30 @@ class HudsonJob {
case "blue":
// The last build was successful.
return _("Success");
- break;
case "blue_anime":
// The last build was successful. A new build
is in progress.
return _("In progress");
- break;
case "yellow":
// The last build was successful but unstable.
This is primarily used to represent test failures.
return _("Unstable");
- break;
case "yellow_anime":
// The last build was successful but unstable.
This is primarily used to represent test failures. A new build is in progress.
return _("In progress");
- break;
case "red":
// The last build fatally failed.
return _("Failure");
- break;
case "red_anime":
// The last build fatally failed. A new build
is in progress.
return _("In progress");
- break;
case "grey":
// The project has never been built before, or
the project is disabled.
return _("Pending");
- break;
case "grey_anime":
// The project has never been built before, or
the project is disabled. The first build of this project is in progress.
return _("In progress");
- break;
default:
// Can we have anime icons here?
return _("Unknown status");
- break;
}
}
@@ -181,39 +172,30 @@ class HudsonJob {
case "blue":
// The last build was successful.
return $this->getIconsPath()."status_blue.png";
- break;
case "blue_anime":
// The last build was successful. A new build
is in progress.
return $this->getIconsPath()."status_blue.png";
- break;
case "yellow":
// The last build was successful but unstable.
This is primarily used to represent test failures.
return
$this->getIconsPath()."status_yellow.png";
- break;
case "yellow_anime":
// The last build was successful but unstable.
A new build is in progress.
return
$this->getIconsPath()."status_yellow.png";
- break;
case "red":
// The last build fatally failed.
return $this->getIconsPath()."status_red.png";
- break;
case "red_anime":
// The last build fatally failed. A new build
is in progress.
return $this->getIconsPath()."status_red.png";
- break;
case "grey":
// The project has never been built before, or
the project is disabled.
return $this->getIconsPath()."status_grey.png";
- break;
case "grey_anime":
// The first build of the project is in
progress.
return $this->getIconsPath()."status_grey.png";
- break;
default:
// Can we have anime icons here?
return
$this->getIconsPath()."status_unknown.png";
- break;
}
}
@@ -264,7 +246,7 @@ class HudsonJob {
function getHealthDescriptions() {
$descs = array();
foreach ($this->dom_job->healthReport as $health_report) {
- $scores[] = $health_report->description;
+ $descs[] = $health_report->description;
}
return $descs;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b17048171ea0e4e58b34c4fdc3627bf9e3736887
commit b17048171ea0e4e58b34c4fdc3627bf9e3736887
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:17:43 2016 +0200
Add sortable
diff --git a/src/common/tracker/actions/ind.php
b/src/common/tracker/actions/ind.php
index f5bca1c..65fda81 100644
--- a/src/common/tracker/actions/ind.php
+++ b/src/common/tracker/actions/ind.php
@@ -52,7 +52,7 @@ if (!$at_arr || count($at_arr) < 1) {
Put the result set (list of trackers for this group) into a
column with folders
*/
$tablearr = array(_('Tracker'),_('Description'),_('Open'),_('Total'));
- echo $HTML->listTableTop($tablearr, false, 'full
sortable_table_tracker', 'sortable_table_tracker');
+ echo $HTML->listTableTop($tablearr, false, 'full sortable
sortable_table_tracker', 'sortable_table_tracker');
for ($j = 0; $j < count($at_arr); $j++) {
if (!is_object($at_arr[$j])) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a2214eb9c1aca9f4e2fb8fa5378ac3715704f3c9
commit a2214eb9c1aca9f4e2fb8fa5378ac3715704f3c9
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:16:51 2016 +0200
Whitespace
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 6a2f3a6..70aeefd 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -2199,7 +2199,7 @@ class Group extends FFError {
//
// audit trail
//
- $this->addHistory(_('Added User'),$user_identifier);
+ $this->addHistory(_('Added User'), $user_identifier);
db_commit();
//
@@ -2914,19 +2914,19 @@ if there is anything we can do to help you.
/**
* validateGroupName - Validate the group name
*
- * @param string Group name.
+ * @param string $group_name Project name.
*
- * @return boolean an error false and set an error is the group
name is invalid otherwise return true
+ * @return bool an error false and set an error is the group
name is invalid otherwise return true
*/
function validateGroupName($group_name) {
if (strlen($group_name)<3) {
- $this->setError(_('Group name is too short'));
+ $this->setError(_('Project name is too short'));
return false;
} elseif (strlen(htmlspecialchars($group_name))>40) {
- $this->setError(_('Group name is too long'));
+ $this->setError(_('Project name is too long'));
return false;
} elseif (group_get_object_by_publicname($group_name)) {
- $this->setError(_('Group name already taken'));
+ $this->setError(_('Project name already taken'));
return false;
}
return true;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ee1b8bab115357d621ae8dc89acf5ff4f3eb3ee5
commit ee1b8bab115357d621ae8dc89acf5ff4f3eb3ee5
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:16:28 2016 +0200
Set forum_messages
diff --git a/src/common/forum/ForumMessageFactory.class.php
b/src/common/forum/ForumMessageFactory.class.php
index 1e22f30..d680414 100644
--- a/src/common/forum/ForumMessageFactory.class.php
+++ b/src/common/forum/ForumMessageFactory.class.php
@@ -262,7 +262,7 @@ class ForumMessageFactory extends FFError {
$this->fetched_rows=$rows;
if (!$result || $rows < 1) {
$this->setError('No Messages Found '.db_error());
- return false;
+ $this->forum_messages = false;
} else {
while ($arr = db_fetch_array($result)) {
$this->forum_messages[] = new
ForumMessage($this->Forum, $arr['msg_id'], $arr);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=20249ac9b4c28551a15c14c35ded30473f4edb16
commit 20249ac9b4c28551a15c14c35ded30473f4edb16
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jun 21 12:15:20 2016 +0200
Whitespace
diff --git a/src/common/forum/Forum.class.php b/src/common/forum/Forum.class.php
index bfff4ea..f3e4cec 100644
--- a/src/common/forum/Forum.class.php
+++ b/src/common/forum/Forum.class.php
@@ -122,7 +122,7 @@ class Forum extends FFError {
$is_news = $res && db_numrows($res) >= 1;
}
- $this->Group =& $Group;
+ $this->Group =& $Group;
if ($group_forum_id) {
if (!$arr || !is_array($arr)) {
@@ -603,7 +603,7 @@ class Forum extends FFError {
$this->setMissingParamsError(_('Please tick all
checkboxes.'));
return false;
}
- if (!forge_check_perm ('forum_admin', $this->Group->getID())) {
+ if (!forge_check_perm('forum_admin', $this->Group->getID())) {
$this->setPermissionDeniedError();
return false;
}
diff --git a/src/common/forum/ForumHTML.class.php
b/src/common/forum/ForumHTML.class.php
index e145013..d0a2017 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -264,7 +264,7 @@ class ForumHTML extends FFError {
$ret_val .= ' on '.date('Y-m-d H:i',$msg->getPostDate());
$ret_val .= '</td><td class="tablecontent align-right">';
$ret_val .= '<a
href="'.$url.'">[forum:'.$msg->getID().']</a><br/>';
- if (forge_check_perm ('forum_admin',
$msgforum->Group->getID())) {
+ if (forge_check_perm('forum_admin', $msgforum->Group->getID()))
{
$ret_val .=
$fa->PrintAdminMessageOptions($msg->getID(),$group_id,$msg->getThreadID(),$msgforum->getID());
}
$ret_val .=
$am->PrintAttachLink($msg,$group_id,$msgforum->getID());
@@ -589,7 +589,7 @@ class ForumHTML extends FFError {
//$text_support->displayTextField('body'); ?>
<br />
<!-- <span class="selected"><?php echo _('HTML tags
will display in your post as text'); ?></span> -->
- <p>
+ <br />
<?php $this->LinkAttachForm();?>
<p><?php
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index 1db8404..9811d83 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -742,7 +742,7 @@ Or reply to this e-mail entering your response between the
following markers:
$text = $this->getBody();
$sanitizer = new TextSanitizer();
$text = $sanitizer->convertNeededTagsForEmail($text);
- $text= strip_tags($this->removebbcode(util_line_wrap($text)));
+ $text = strip_tags($this->removebbcode(util_line_wrap($text)));
$text = $sanitizer->convertExtendedCharsForEmail($text);
$body .= $text .
"\n\n______________________________________________________________________".
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/Forum.class.php | 4 ++--
src/common/forum/ForumHTML.class.php | 4 ++--
src/common/forum/ForumMessage.class.php | 2 +-
src/common/forum/ForumMessageFactory.class.php | 2 +-
src/common/include/Group.class.php | 12 ++++++------
src/common/tracker/actions/browse.php | 26 ++++++++++++++------------
src/common/tracker/actions/ind.php | 2 +-
src/common/tracker/actions/mod.php | 2 +-
src/plugins/hudson/include/HudsonJob.class.php | 20 +-------------------
9 files changed, 29 insertions(+), 45 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
