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, feature/subversion-multiple-repositories-per-project has been
updated
via 7a3b3020f262f9355922496397cfafb072a55459 (commit)
via 0fd16310ff683e6bf5e25fdfd70d59e815a8cb06 (commit)
from 2a3699b2b9a8d322ed286909717956849b839156 (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=7a3b3020f262f9355922496397cfafb072a55459
commit 7a3b3020f262f9355922496397cfafb072a55459
Author: Franck Villaume <[email protected]>
Date: Tue Feb 27 15:02:21 2018 +0000
fix PHP warning
diff --git a/src/www/account/check_forwarded_session.php
b/src/www/account/check_forwarded_session.php
index 2f53ef4..9277fce 100644
--- a/src/www/account/check_forwarded_session.php
+++ b/src/www/account/check_forwarded_session.php
@@ -22,7 +22,9 @@
require_once '../env.inc.php';
-$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+}
require_once $gfcommon.'include/pre.php';
echo session_loggedin() ? 'OK' : 'KO';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0fd16310ff683e6bf5e25fdfd70d59e815a8cb06
commit 0fd16310ff683e6bf5e25fdfd70d59e815a8cb06
Author: Franck Villaume <[email protected]>
Date: Tue Feb 27 15:02:04 2018 +0000
enable DAV access
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index d31540b..1484e4c 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -36,7 +36,6 @@ forge_define_config_item('use_dav', 'scmsvn', true);
forge_set_config_item_bool('use_dav', 'scmsvn');
forge_define_config_item('use_ssl', 'scmsvn', true);
forge_set_config_item_bool('use_ssl', 'scmsvn');
-forge_define_config_item('anonsvn_login','scmsvn', 'anonsvn');
forge_define_config_item('ssh_port', 'core', 22);
class SVNPlugin extends SCMPlugin {
@@ -457,37 +456,17 @@ some control over it to the project's administrator.");
function regenApacheAuth(&$params) {
# Enable /authscm/$user/svn URLs
- $config_fname_auth =
forge_get_config('data_path').'/scmsvn-auth.inc';
- $config_f_auth = fopen($config_fname_auth.'.new', 'w');
-
- $res = db_query_params('SELECT unix_group_name, group_id FROM
groups WHERE status = $1 and type_id = $2 and is_template =$3 and register_time
> 0',
- array('A', 1, 0));
+ $config_fname =
forge_get_config('data_path').'/scmsvn-auth.inc';
+ $config_f = fopen($config_fname.'.new', 'w');
+ $res = db_query_params("SELECT login FROM nss_passwd WHERE
status=$1", array('A'));
while ($arr = db_fetch_array($res)) {
- $groupObject = group_get_object($arr['group_id']);
- if ($groupObject->usesPlugin($this->name)) {
- $users = $groupObject->getUsers();
- $repo_list = array();
- $repo_list[] = $arr['unix_group_name'];
- $result = db_query_params('SELECT repo_name
FROM scm_secondary_repos WHERE group_id=$1 AND next_action = $2 AND
plugin_id=$3 ORDER BY repo_name',
- array($arr['group_id'],
SCM_EXTRA_REPO_ACTION_UPDATE, $this->getID()));
- $rows = db_numrows($result);
- for ($i = 0; $i < $rows; $i++) {
- $repo_list[] = db_result($result, $i,
'repo_name');
- }
- foreach ($repo_list as $repo_name) {
- foreach ($users as $user) {
- if
(forge_check_perm_for_user($user, 'scm', $arr['group_id'], 'write')) {
- fwrite($config_f_auth,
'Use ScmsvnUser '.$user->getUnixName().' '.$arr['unix_group_name'].'
'.$repo_name."\n");
- }
- }
- }
- }
+ fwrite($config_f, 'Use ScmsvnUser '.$arr['login']."\n");
}
- fclose($config_f_auth);
- chmod($config_fname_auth.'.new', 0644);
- rename($config_fname_auth.'.new', $config_fname_auth);
+ fclose($config_f);
+ chmod($config_fname.'.new', 0644);
+ rename($config_fname.'.new', $config_fname);
}
function gatherStats($params) {
diff --git a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
index 020a36e..2517c85 100644
--- a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
+++ b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
@@ -1,7 +1,7 @@
-<Macro ScmsvnUser $user_auth $project_auth $repo_auth>
-<Location /authscm/$user_auth/svn/$project_auth/$repo_auth>
+<Macro ScmsvnUser $user>
+<Location /authscm/$user/svn>
DAV svn
- SVNPath ${FF__scmsvn__repos_path}/$project_auth.svn/$repo_auth
+ SVNParentPath ${FF__scmsvn__repos_path}
# Note: ^ this need to be in the macro, doesn't work in a LocationMatch
# This is pretty annoying, because this requires a plugin-specific macro :/
# <LocationMatch /authscm/[^/]+/svn>
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmsvn/common/SVNPlugin.class.php | 35 +++++-----------------
.../etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc | 6 ++--
src/www/account/check_forwarded_session.php | 4 ++-
3 files changed, 13 insertions(+), 32 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
