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 f05e2ef89489d50fec53737040c86aafe8cfb397 (commit)
from d3878a0334a7f126517b0d104165042258757ab0 (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=f05e2ef89489d50fec53737040c86aafe8cfb397
commit f05e2ef89489d50fec53737040c86aafe8cfb397
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 8 11:01:04 2016 +0200
No space at end of lines
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index c65e8bb..8c1448d 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -1031,7 +1031,7 @@ class Document extends FFError {
return false;
}
db_commit();
-
+
foreach ($serialids as $serialid) {
DocumentStorage::instance()->delete($serialid)->commit();
}
diff --git a/src/www/projects b/src/www/projects
index e10ec17..be5704b 100644
--- a/src/www/projects
+++ b/src/www/projects
@@ -46,15 +46,15 @@ function display_content_negociated_hook($hook_name,
$hook_params, $accepted_typ
plugin_hook_by_reference($hook_name, $hook_params);
$content_type = $hook_params['content_type'];
-
+
// If the hooks return a content-type
if($content_type != ''){
-
+
// The returned content-type may be overriden
if($forced_content_type) {
$content_type = $forced_content_type;
}
-
+
header('Content-type: '. $content_type);
echo $hook_params['content'];
}
@@ -120,40 +120,40 @@ if (!isset($group_id) && !isset($project)) {
global $RESTPATH_PROJECTS_SUBPAGE2;
$subpage2 = getStringFromRequest('subpage2');
$subpage2 =
isset($subpage2)?$subpage2:$RESTPATH_PROJECTS_SUBPAGE2;
-
+
if ($subpage == "admin") {
-
+
session_redirect("/project/admin/?group_id=$group_id");
-
- } else if ($subpage == "files" || $subpage == "download" ||
$subpage == "dl") {
-
+
+ } elseif ($subpage == "files" || $subpage == "download" ||
$subpage == "dl") {
+
if ($subpage2 == "release") {
session_redirect("/frs/?group_id=$group_id&view=qrs");
} else {
session_redirect("/frs/?group_id=$group_id");
}
-
- } else if ($subpage == "cvs") {
+
+ } elseif ($subpage == "cvs") {
header("Location:
".account_group_cvsweb_url($project->getUnixName()));
exit();
-
+
} else {
-
+
$script='project_home';
-
+
$accepted_type =
util_negociate_alternate_content_types($script, $default_content_type,
$forced_accept);
-
+
// if a custom content-type is selected, then use
plugin's/hooks rendering
if($accepted_type != $default_content_type) {
-
+
$hook_params = array();
$hook_params['groupname'] =
$project->getUnixName();
$hook_params['group_id'] = $project->getID();
$hook_params['return'] = '';
$hook_params['content_type'] = '';
-
+
display_content_negociated_hook('content_negociated_project_home',
$hook_params, $accepted_type, $forced_content_type);
-
+
} else {
// show the project summary page for HTML
display
include $gfwww.'include/project_home.php';
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 2 +-
src/www/projects | 34 +++++++++++++++++-----------------
2 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
