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 5d24d657b81c78a881e013e80ec1bcc0f1503367 (commit)
from f15e41d79db5c516ac37f3ac497f48fb3af28f7a (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=5d24d657b81c78a881e013e80ec1bcc0f1503367
commit 5d24d657b81c78a881e013e80ec1bcc0f1503367
Author: Franck Villaume <[email protected]>
Date: Fri Jul 1 13:51:28 2016 +0200
fix docman webdav: wrong table/view. doc_data -> docdata_vw
diff --git a/src/common/docman/include/webdav.php
b/src/common/docman/include/webdav.php
index 7c3f9d8..e60cb12 100644
--- a/src/common/docman/include/webdav.php
+++ b/src/common/docman/include/webdav.php
@@ -158,7 +158,7 @@ class HTTP_WebDAV_Server_Docman extends HTTP_WebDAV_Server {
$files['files'][$i]['props'][] =
$this->mkprop('resourcetype', 'collection');
$files['files'][$i]['props'][] =
$this->mkprop('getcontenttype', 'httpd/unix-directory');
}
- $res = db_query_params('select
filename,filetype,filesize,createdate,updatedate from doc_data where group_id =
$1 and doc_group = $2',
+ $res = db_query_params('select
filename,filetype,filesize,createdate,updatedate from docdata_vw where group_id
= $1 and doc_group = $2',
array($group_id, $analysed_path['doc_group']));
if (!$res)
return '404';
@@ -182,7 +182,7 @@ class HTTP_WebDAV_Server_Docman extends HTTP_WebDAV_Server {
$files['files'][$i]['props'][] =
$this->mkprop('getcontenttype', $arr['filetype']);
}
} elseif (isset($analysed_path['docid'])) {
- $res = db_query_params('select
filename,filetype,filesize,createdate,updatedate from doc_data where group_id =
$1 and docid = $2',
+ $res = db_query_params('select
filename,filetype,filesize,createdate,updatedate from docdata_vw where group_id
= $1 and docid = $2',
array($group_id, $analysed_path['docid']));
if (!$res)
return '404';
@@ -263,7 +263,7 @@ class HTTP_WebDAV_Server_Docman extends HTTP_WebDAV_Server {
while ($arr = db_fetch_array($res)) {
echo
'<li>'.util_make_link('/docman/view.php/'.$group_id.'/webdav'.$subpath.$arr['groupname'],
$arr['groupname']).'</li>';
}
- $res = db_query_params('select filename, filetype from
doc_data where group_id = $1 and doc_group = $2 and stateid = ANY ($3)',
+ $res = db_query_params('select filename, filetype from
docdata_vw where group_id = $1 and doc_group = $2 and stateid = ANY ($3)',
array($group_id,
$analysed_path['doc_group'], db_int_array_to_any_clause(array(1, 5))));
if (!$res) {
exit_error(_('webdav db error')._(':
').db_error(),'docman');
@@ -639,7 +639,7 @@ class HTTP_WebDAV_Server_Docman extends HTTP_WebDAV_Server {
return $return_path_array;
}
- $res = db_query_params('select docid from doc_data where
group_id = $1 and doc_group = $2 and filename = $3',
+ $res = db_query_params('select docid from docdata_vw where
group_id = $1 and doc_group = $2 and filename = $3',
array($group_id,
$path_array['doc_group'], $string));
while ($arr = db_fetch_array($res)) {
$return_path_array['docid'] = $arr['docid'];
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/include/webdav.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
