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 22f23340e5895949a8f08139387cd8569bb5ac4e (commit)
via 2988b0d911eb6d0105d5466421d58351d1e2b380 (commit)
via 01d9df9c23a5bb19f47e7c0ff431d2a885448c9f (commit)
from c34d7dd1ace54fc4d4e593d24e63cc9bbd8248f1 (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=22f23340e5895949a8f08139387cd8569bb5ac4e
commit 22f23340e5895949a8f08139387cd8569bb5ac4e
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Jul 13 14:46:41 2017 +0200
Whitespace
diff --git a/src/plugins/rest/www/index.php b/src/plugins/rest/www/index.php
index 37c9a49..d85ed2d 100644
--- a/src/plugins/rest/www/index.php
+++ b/src/plugins/rest/www/index.php
@@ -71,118 +71,118 @@ class Rest {
echo json_encode($data);
}
- static function error($message, $code=500) {
+ static function error($message, $code = 500) {
header("X-Status-Reason: $message", true, $code);
}
static function renderUser($user) {
return array(
- 'user_id' => $user->getID(),
- 'user_name' => $user->getUnixName(),
- 'title' => $user->getTitle(),
- 'firstname' => $user->getFirstName(),
- 'lastname' => $user->getLastName(),
- 'status' => $user->getStatus(),
- 'email' => $user->getEmail(),
- 'language' => lang_id_to_language_name($user->getLanguage()),
- 'country_code' => $user->getCountryCode(),
- 'add_date' => date('c', $user->getAddDate()),
- //'last_login_time' => date('c', $user->getLastLoginTime())
+ 'user_id' => $user->getID(),
+ 'user_name' => $user->getUnixName(),
+ 'title' => $user->getTitle(),
+ 'firstname' => $user->getFirstName(),
+ 'lastname' => $user->getLastName(),
+ 'status' => $user->getStatus(),
+ 'email' => $user->getEmail(),
+ 'language' =>
lang_id_to_language_name($user->getLanguage()),
+ 'country_code' => $user->getCountryCode(),
+ 'add_date' => date('c', $user->getAddDate()),
+ //'last_login_time' => date('c',
$user->getLastLoginTime())
);
}
static function renderProject($project) {
return array(
- 'group_id' => $project->getID(),
- 'group_name' => $project->getPublicName(),
- 'homepage' => $project->getHomePage(),
- 'is_public' => $project->isPublic(),
- 'status' => $project->getStatus(),
- 'unix_group_name' => $project->getUnixName(),
- 'short_description' => $project->getDescription(),
- 'register_purpose' => $project->getRegisterPurpose(),
- 'unix_box' => $project->getUnixBox(),
- 'scm_box' => $project->getSCMBox(),
- 'register_time' => date('c', $project->getStartDate()),
- //'built_from_template' => $project->getTemplateProject(),
- 'use_mail' => $project->usesMail(),
- 'use_survey' => $project->usesSurvey(),
- 'use_forum' => $project->usesForum(),
- 'use_pm' => $project->usesPM(),
- //'use_pm_depend_box' =>
$grps[$i]->data_array['use_pm_depend_box'],
- 'use_scm' => $project->usesSCM(),
- 'use_news' => $project->usesNews(),
- 'use_docman' => $project->usesDocman(),
- 'new_doc_address' => $project->getDocEmailAddress(),
- 'send_all_docs' => $project->docEmailAll(),
- 'use_ftp' => $project->usesFTP(),
- 'use_tracker' => $project->usesTracker(),
- 'use_frs' => $project->usesFRS(),
- 'use_stats' => $project->usesStats(),
- 'use_activity' => $project->usesActivity(),
- 'tags'=>$project->getTags(),
- 'admins'=> array_map('rest::renderUser', $project->getAdmins()),
- //'last_update_time' => date('c', $project->getLastUpdateTime())
+ 'group_id' => $project->getID(),
+ 'group_name' => $project->getPublicName(),
+ 'homepage' => $project->getHomePage(),
+ 'is_public' => $project->isPublic(),
+ 'status' => $project->getStatus(),
+ 'unix_group_name' => $project->getUnixName(),
+ 'short_description' => $project->getDescription(),
+ 'register_purpose' => $project->getRegisterPurpose(),
+ 'unix_box' => $project->getUnixBox(),
+ 'scm_box' => $project->getSCMBox(),
+ 'register_time' => date('c', $project->getStartDate()),
+ //'built_from_template' =>
$project->getTemplateProject(),
+ 'use_mail' => $project->usesMail(),
+ 'use_survey' => $project->usesSurvey(),
+ 'use_forum' => $project->usesForum(),
+ 'use_pm' => $project->usesPM(),
+ //'use_pm_depend_box' =>
$grps[$i]->data_array['use_pm_depend_box'],
+ 'use_scm' => $project->usesSCM(),
+ 'use_news' => $project->usesNews(),
+ 'use_docman' => $project->usesDocman(),
+ 'new_doc_address' => $project->getDocEmailAddress(),
+ 'send_all_docs' => $project->docEmailAll(),
+ 'use_ftp' => $project->usesFTP(),
+ 'use_tracker' => $project->usesTracker(),
+ 'use_frs' => $project->usesFRS(),
+ 'use_stats' => $project->usesStats(),
+ 'use_activity' => $project->usesActivity(),
+ 'tags' => $project->getTags(),
+ 'admins' => array_map('rest::renderUser',
$project->getAdmins()),
+ //'last_update_time' => date('c',
$project->getLastUpdateTime())
);
}
static function renderArtifactType($artifact) {
return array(
- 'artifact_id' => $artifact->getID(),
- 'name' => $artifact->getName(),
- 'description' => $artifact->getDescription(),
- 'unix_name' => $artifact->getUnixName(),
- 'is_public' => $artifact->isPublic(),
- 'allow_anon' => $artifact->allowsAnon(),
- 'email_all' => $artifact->emailAll(),
- 'email_address' => $artifact->getEmailAddress(),
- 'due_period' => $artifact->getDuePeriod() / (60*60*24),
- 'use_resolution' => false,
- 'datatype' => $artifact->getDataType(),
- 'submit_instructions' => $artifact->getSubmitInstructions(),
- 'browse_instructions' => $artifact->getBrowseInstructions()
+ 'artifact_id' => $artifact->getID(),
+ 'name' => $artifact->getName(),
+ 'description' => $artifact->getDescription(),
+ 'unix_name' => $artifact->getUnixName(),
+ 'is_public' => $artifact->isPublic(),
+ 'allow_anon' => $artifact->allowsAnon(),
+ 'email_all' => $artifact->emailAll(),
+ 'email_address' => $artifact->getEmailAddress(),
+ 'due_period' => $artifact->getDuePeriod() / (60 * 60 *
24),
+ 'use_resolution' => false,
+ 'datatype' => $artifact->getDataType(),
+ 'submit_instructions' =>
$artifact->getSubmitInstructions(),
+ 'browse_instructions' =>
$artifact->getBrowseInstructions()
);
}
static function renderArtifact($artifact) {
return array(
- 'artifact_id' => $artifact->getID(),
- 'summary' => $artifact->getSummary(),
- 'details' => $artifact->getDetails(),
- 'status_name' => $artifact->getStatusName(),
- 'submitted_by' => $artifact->getSubmittedUnixName(),
- 'open_date' => date('c', $artifact->getOpenDate()),
- 'close_date' => date('c', $artifact->getCloseDate()),
- 'last_modified_date' => date('c',
$artifact->getLastModifiedDate()),
- 'comments' => array_map('rest::renderArtifactComment',
$artifact->getMessageObjects())
+ 'artifact_id' => $artifact->getID(),
+ 'summary' => $artifact->getSummary(),
+ 'details' => $artifact->getDetails(),
+ 'status_name' => $artifact->getStatusName(),
+ 'submitted_by' => $artifact->getSubmittedUnixName(),
+ 'open_date' => date('c', $artifact->getOpenDate()),
+ 'close_date' => date('c', $artifact->getCloseDate()),
+ 'last_modified_date' => date('c',
$artifact->getLastModifiedDate()),
+ 'comments' => array_map('rest::renderArtifactComment',
$artifact->getMessageObjects())
);
}
static function renderArtifactComment($message) {
return array(
- 'message' =>
util_unconvert_htmlspecialchars($message->getBody()),
- 'user_id' => $message->getUserID(),
- 'add_date' => date('c', $message->getAddDate())
+ 'message' =>
util_unconvert_htmlspecialchars($message->getBody()),
+ 'user_id' => $message->getUserID(),
+ 'add_date' => date('c', $message->getAddDate())
);
}
static function renderForumType($forum) {
return array(
- 'forum_id' => $forum->getID(),
- 'name' => $forum->getName(),
- 'description' => $forum->getDescription(),
- 'send_all_posts_to' => $forum->getSendAllPostsTo(),
- 'is_public' => $forum->isPublic(),
- 'moderation_level' => $forum->getModerationLevel()
+ 'forum_id' => $forum->getID(),
+ 'name' => $forum->getName(),
+ 'description' => $forum->getDescription(),
+ 'send_all_posts_to' => $forum->getSendAllPostsTo(),
+ 'is_public' => $forum->isPublic(),
+ 'moderation_level' => $forum->getModerationLevel()
);
}
static function renderForum($message) {
return array(
- 'id' => $message->getID(),
- 'body' => $message->getBody(),
- 'user_id' => $message->getUserID(),
- 'add_date' => date('c', $message->getAddDate())
+ 'id' => $message->getID(),
+ 'body' => $message->getBody(),
+ 'user_id' => $message->getUserID(),
+ 'add_date' => date('c', $message->getAddDate())
);
}
@@ -375,7 +375,7 @@ $router->map('POST', '/v1/trackers/[i:group_id]', function
($group_id) {
return Rest::error($atf->getErrorMessage());
}
- return(Rest::json(Rest::renderArtifactType($atf)));
+ return (Rest::json(Rest::renderArtifactType($atf)));
});
@@ -387,7 +387,7 @@ $router->map('GET',
'/v1/trackers/[i:group_id]/[i:group_artifact_id]', function
return Rest::error($grp->getErrorMessage());
}
- $at = new ArtifactType($grp,$group_artifact_id);
+ $at = new ArtifactType($grp, $group_artifact_id);
if (!$at || !is_object($at)) {
return Rest::error('Could Not Get ArtifactType');
} elseif ($at->isError()) {
@@ -401,7 +401,7 @@ $router->map('GET',
'/v1/trackers/[i:group_id]/[i:group_artifact_id]', function
return Rest::error($af->getErrorMessage());
}
- $af->setup(0,'','',0,false, '', '');
+ $af->setup(0, '', '', 0, false, '', '');
$artifacts = $af->getArtifacts();
if ($artifacts === false) {
return Rest::error($af->getErrorMessage());
@@ -450,16 +450,16 @@ $router->map('POST', '/v1/tracker', function () {
}
if ($input->comments) {
- foreach($input->comments as $comment) {
- $res = $a->addMessage($comment->message);
- if (!$res) {
- return Rest::error('Could Not Create Artifact Comment:
'.$a->getErrorMessage());
- }
-
- $msg_id = db_insertid($res, 'artifact_message', 'id');
- $add_date = strtotime($comment->add_date);
- db_query_params('UPDATE artifact_message SET submitted_by=$1,
adddate=$2 WHERE id=$3',
- array ($comment->user_id, $add_date, $msg_id));
+ foreach ($input->comments as $comment) {
+ $res = $a->addMessage($comment->message);
+ if (!$res) {
+ return Rest::error('Could Not Create Artifact
Comment: '.$a->getErrorMessage());
+ }
+
+ $msg_id = db_insertid($res, 'artifact_message', 'id');
+ $add_date = strtotime($comment->add_date);
+ db_query_params('UPDATE artifact_message SET
submitted_by=$1, adddate=$2 WHERE id=$3',
+ array($comment->user_id, $add_date, $msg_id));
}
}
@@ -510,8 +510,8 @@ if (isset($_SERVER['PHP_AUTH_USER']) &&
isset($_SERVER['PHP_AUTH_PW'])) {
}
// call closure or throw 404 status
-if( $match && is_callable( $match['target'] ) ) {
- call_user_func_array( $match['target'], $match['params'] );
+if ($match && is_callable($match['target'])) {
+ call_user_func_array($match['target'], $match['params']);
} else {
// no route was matched
header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
diff --git a/src/plugins/scmhook/library/scmgit/commitTracker.class.php
b/src/plugins/scmhook/library/scmgit/commitTracker.class.php
index 9c588f1..d52ceb5 100644
--- a/src/plugins/scmhook/library/scmgit/commitTracker.class.php
+++ b/src/plugins/scmhook/library/scmgit/commitTracker.class.php
@@ -167,7 +167,7 @@ class GitCommitTracker extends scmhook {
* getActualVersionLink - Return a link to the actual version File
*
* @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 $Version The string containing a link to
the actual version File
diff --git a/src/www/my/dashboard.php b/src/www/my/dashboard.php
index d547c21..20a8087 100644
--- a/src/www/my/dashboard.php
+++ b/src/www/my/dashboard.php
@@ -51,37 +51,37 @@ if (!session_loggedin()) {
if (count ($projects) < 1) {
echo $HTML->information(_("You're not a member of any active
projects"));
} else {
- $display_col=array('summary'=>1,
- 'changed'=>1,
- 'status'=>0,
- 'priority'=>1,
- 'assigned_to'=>1,
- 'submitted_by'=>1,
- 'related_tasks'=>1);
+ $display_col = array('summary' => 1,
+ 'changed' => 1,
+ 'status' => 0,
+ 'priority' => 1,
+ 'assigned_to' => 1,
+ 'submitted_by' => 1,
+ 'related_tasks' => 1);
- $title_arr=array();
+ $title_arr = array();
- $title_arr[]=_('Id');
+ $title_arr[] = _('Id');
if ($display_col['summary']) {
- $title_arr[]=_('Summary');
+ $title_arr[] = _('Summary');
}
if ($display_col['changed']) {
- $title_arr[]=_('Changed');
+ $title_arr[] = _('Changed');
}
if ($display_col['status']) {
- $title_arr[]=_('Status');
+ $title_arr[] = _('Status');
}
if ($display_col['priority']) {
- $title_arr[]=_('Priority');
+ $title_arr[] = _('Priority');
}
if ($display_col['assigned_to']) {
- $title_arr[]=_('Assigned to');
+ $title_arr[] = _('Assigned to');
}
if ($display_col['submitted_by']) {
- $title_arr[]=_('Submitted by');
+ $title_arr[] = _('Submitted by');
}
if ($display_col['related_tasks']) {
- $title_arr[]=_('Tasks');
+ $title_arr[] = _('Tasks');
}
echo $HTML->listTableTop($title_arr);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2988b0d911eb6d0105d5466421d58351d1e2b380
commit 2988b0d911eb6d0105d5466421d58351d1e2b380
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Jul 13 14:43:40 2017 +0200
No   needed
diff --git a/src/www/pm/mod_task.php b/src/www/pm/mod_task.php
index fce524c..b82d4d3 100644
--- a/src/www/pm/mod_task.php
+++ b/src/www/pm/mod_task.php
@@ -201,7 +201,7 @@ unset($GLOBALS['editor_was_set_up']);
<tr>
<td>
- <label for="hours"><strong><?php echo _('Estimated Hours') .
_(': '); ?></strong></label><br />
+ <label for="hours"><strong><?php echo _('Estimated Hours') .
_(': '); ?></strong></label>
<input id="hours" type="number" name="hours" size="5"
value="<?php echo $pt->getHours(); ?>" />
</td>
@@ -275,7 +275,7 @@ echo '<tr>
<td class="align-center">'. report_day_adjust_box() .'</td>
<td class="align-center"><input id="time-tracking-hours"
type="text" required="required" name="hours" value="" size="3" maxlength="3"
/></td>
<td
class="align-center">'.report_time_category_box('time_code',false).'</td>
- <td> </td>
+ <td></td>
<td class="align-center"><input type="submit" name="add"
value="'._('Add').'" /><input type="submit" name="cancel"
value="'._('Cancel').'" /></td>
</tr>';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=01d9df9c23a5bb19f47e7c0ff431d2a885448c9f
commit 01d9df9c23a5bb19f47e7c0ff431d2a885448c9f
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Jul 13 14:36:37 2017 +0200
Valid HTML 5
diff --git
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
index 0268d21..09576d4 100644
---
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
+++
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
@@ -397,7 +397,7 @@ EOS;
$countCol = 1;
$return = '
- <table cellspacing="10" cellpadding="1" id="advsearch">
+ <table id="advsearch">
<tr class="tablecontent">
<td colspan="3" class="align-center">
<input type="checkbox"
class="checkthemall" />'._('Search All').'
-----------------------------------------------------------------------
Summary of changes:
src/plugins/rest/www/index.php | 184 ++++++++++-----------
.../scmhook/library/scmgit/commitTracker.class.php | 2 +-
src/www/my/dashboard.php | 32 ++--
src/www/pm/mod_task.php | 4 +-
.../AdvancedSearchHtmlSearchRenderer.class.php | 2 +-
5 files changed, 112 insertions(+), 112 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
