Index: openacs-4/packages/oacs-dav/catalog/oacs-dav.en_AU.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/catalog/oacs-dav.en_AU.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oacs-dav/catalog/oacs-dav.en_AU.ISO-8859-1.xml 27 Sep 2005 04:04:02 -0000 1.1.4.2 @@ -0,0 +1,18 @@ + + + + Disable + Disable Selected Folders + Disabled + Enable + Enable Selected Folders + Enabled + Folder Name + Folder URL + Selected Folders disabled for WebDAV support. + Selected Folders enabled for WebDAV support. + Package Name + Package Type + Status + WebDAV Folder Administration + Index: openacs-4/packages/oacs-dav/catalog/oacs-dav.es_CO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/catalog/oacs-dav.es_CO.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oacs-dav/catalog/oacs-dav.es_CO.ISO-8859-1.xml 27 Sep 2005 04:04:02 -0000 1.1.4.2 @@ -0,0 +1,18 @@ + + + + Deshabitar + Deshabitar Carpetas Selecciondas + Deshabilitado + Habilitar + Habilitar Carpetas Seleccionadas + Habilitar + Nombre de la Carpeta + Carpeta URL + Carpetas Seleccionadas deshabilitadas para soporte WebDav. + Carpetas Seleccionadas habilitadas para soporte WebDAV. + Nombre del Paquete + Tipo del Paquete + Estado + Administraci�n de la capeta WebDAV + Index: openacs-4/packages/oacs-dav/sql/oracle/upgrade/upgrade-1.0b3-1.0b4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/sql/oracle/upgrade/upgrade-1.0b3-1.0b4.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oacs-dav/sql/oracle/upgrade/upgrade-1.0b3-1.0b4.sql 27 Sep 2005 04:04:04 -0000 1.1.4.2 @@ -0,0 +1,11 @@ +-- +-- +-- +-- @author Dave Bauer (dave@thedesignexperience.org) +-- @creation-date 2005-01-29 +-- @arch-tag: 938abc15-f59c-4397-b882-f5a89884be62 +-- @cvs-id $Id: upgrade-1.0b3-1.0b4.sql,v 1.1.4.2 2005/09/27 04:04:04 victorg Exp $ +-- + +alter table dav_site_node_folder_map drop constraint dav_side_node_folder_map_node_id_fk; +alter table dav_site_node_folder_map add constraint dav_side_node_folder_map_node_id_fk foreign key (node_id) references site_nodes (node_id) on delete cascade; Index: openacs-4/packages/oacs-dav/sql/postgresql/upgrade/upgrade-1.0b3-1.0b4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/sql/postgresql/upgrade/upgrade-1.0b3-1.0b4.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oacs-dav/sql/postgresql/upgrade/upgrade-1.0b3-1.0b4.sql 27 Sep 2005 04:04:05 -0000 1.1.4.2 @@ -0,0 +1,11 @@ +-- +-- +-- +-- @author Dave Bauer (dave@thedesignexperience.org) +-- @creation-date 2005-01-29 +-- @arch-tag: 938abc15-f59c-4397-b882-f5a89884be62 +-- @cvs-id $Id: upgrade-1.0b3-1.0b4.sql,v 1.1.4.2 2005/09/27 04:04:05 victorg Exp $ +-- + +alter table dav_site_node_folder_map drop constraint dav_side_node_folder_map_node_id_fk; +alter table dav_site_node_folder_map add constraint dav_side_node_folder_map_node_id_fk foreign key (node_id) references site_nodes (node_id) on delete cascade; Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql,v diff -u -N -r1.4 -r1.4.2.1 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql 1 Jun 2004 22:54:19 -0000 1.4 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql 27 Sep 2005 04:04:06 -0000 1.4.2.1 @@ -25,29 +25,59 @@ - select coalesce (cr.content_length,0) as content_length, - coalesce(cr.mime_type,'*/*') as mime_type, - to_char(timezone('GMT',o.creation_date) :: timestamptz ,'YYYY-MM-DD"T"HH:MM:SS.MS"Z"') as creation_date, - to_char(timezone('GMT',o.last_modified) :: timestamptz ,'Dy, DD Mon YYYY HH:MM:SS TZ') as last_modified, - ci1.item_id, - case when ci1.item_id=ci2.item_id then '' else ci1.name end as name, - content_item__get_path(ci1.item_id,:folder_id) as item_uri, - case when o.object_type='content_folder' then 1 else 0 end - as collection_p - from cr_items ci1 left join cr_revisions cr on ci1.live_revision = cr.revision_id, - cr_items ci2, - acs_objects o - where ci1.tree_sortkey between ci2.tree_sortkey and - tree_right(ci2.tree_sortkey) - and ci2.item_id=:folder_id - and ci1.item_id = o.object_id - and (tree_level(ci1.tree_sortkey) - tree_level(ci2.tree_sortkey)) - <= :depth :: integer - and exists (select 1 + select + coalesce (cr.content_length,0) as content_length, + coalesce(cr.mime_type,'*/*') as mime_type, + to_char(timezone('GMT',o.creation_date) :: timestamptz ,'YYYY-MM-DD"T"HH:MM:SS.MS"Z"') as creation_date, + to_char(timezone('GMT',o.last_modified) :: timestamptz ,'Dy, DD Mon YYYY HH:MM:SS TZ') as last_modified, + ci1.item_id, + case when ci1.item_id=ci2.item_id then '' else ci1.name end as name, + content_item__get_path(ci1.item_id,:folder_id) as item_uri, + case when o.object_type='content_folder' then 1 else 0 end + as collection_p + from + cr_items ci1, + cr_revisions cr, + cr_items ci2, + acs_objects o + where + ci1.live_revision = cr.revision_id and + ci1.tree_sortkey between ci2.tree_sortkey and tree_right(ci2.tree_sortkey) and + ci2.item_id=:folder_id and + ci1.item_id = o.object_id and + (tree_level(ci1.tree_sortkey) - tree_level(ci2.tree_sortkey)) <= :depth :: integer and + exists (select 1 from acs_object_party_privilege_map m where m.object_id = ci1.item_id and m.party_id = :user_id and m.privilege = 'read') + union + select 0 as content_length, + '*/*' as mime_type, + to_char(timezone('GMT',o.creation_date) :: timestamptz ,'YYYY-MM-DD"T"HH:MM:SS.MS"Z"') as creation_date, + to_char(timezone('GMT',o.last_modified) :: timestamptz ,'Dy, DD Mon YYYY HH:MM:SS TZ') as last_modified, + ci1.item_id, + case when ci1.item_id=ci2.item_id then '' else ci1.name end as name, + content_item__get_path(ci1.item_id,:folder_id) as item_uri, + case when o.object_type='content_folder' then 1 else 0 end + as collection_p + from + cr_items ci1, + cr_items ci2, + acs_objects o + where + ci1.tree_sortkey between ci2.tree_sortkey and tree_right(ci2.tree_sortkey) and + ci2.item_id=:folder_id and + ci1.item_id = o.object_id and + (tree_level(ci1.tree_sortkey) - tree_level(ci2.tree_sortkey)) <= :depth :: integer and + exists (select 1 + from acs_object_party_privilege_map m + where m.object_id = ci1.item_id + and m.party_id = :user_id + and m.privilege = 'read') and + not exists (select 1 + from cr_revisions cr + where cr.revision_id = ci1.live_revision) Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl,v diff -u -N -r1.12.2.1 -r1.12.2.2 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 13 Jun 2005 08:19:32 -0000 1.12.2.1 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 27 Sep 2005 04:04:06 -0000 1.12.2.2 @@ -158,17 +158,17 @@ -object_id $item_id \ -party_id $user_id \ -privilege "read"] \ - && ([permission::permission_p \ - -object_id [oacs_dav::conn dest_parent_id ] \ - -party_id $user_id \ - -privilege "create"] \ - || [permission::permission_p \ - -object_id [oacs_dav::conn dest_parent_id ] \ - -party_id $user_id \ - -privilege "write"])] + && [permission::permission_p \ + -object_id [oacs_dav::conn dest_parent_id ] \ + -party_id $user_id \ + -privilege "create"]\ + || [permission::permission_p \ + -object_id [oacs_dav::conn dest_parent_id ] \ + -party_id $user_id \ + -privilege "write"]] } propfind { - if {!$user_id} { + if {[empty_string_p $user_id]} { ns_returnunauthorized } else { set authorized_p [permission::permission_p \ Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v diff -u -N -r1.7 -r1.7.2.1 --- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 13 Jan 2005 13:58:35 -0000 1.7 +++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 27 Sep 2005 04:04:06 -0000 1.7.2.1 @@ -373,7 +373,7 @@ regsub {^/} $uri {} uri # if lock exists, work. if not, just return. if {[file exists [tdav::get_lock_file $uri]]} { - set lockinfo [tdav::read_lock $uri] + set lockinfo [tdav::read_lock $uri] # check if lock is expired if {[tdav::lock_timeout_left [lindex $lockinfo 4] [lindex $lockinfo 6]] == 0 } { @@ -545,7 +545,7 @@ } else { set name [$p localName] } - if {[catch {set value [[$p childNodes] nodeValue]}]} { + if {[catch {set value [[$p childNodes] nodeValue]}]} { set value "" } lappend prop_req remove [list [list $ns $name] $value] @@ -702,7 +702,7 @@ } else { lappend status [list "HTTP/1.1 200 OK" $k] } - + } remove { #according to WebDAV spec removing a nonexistent @@ -991,7 +991,7 @@ } else { if {[file exists $local_dest]} { if {![string equal "unlocked" [tdav::check_lock $dest]]} { - # ns_return 423 {text/plain} {Resource is locked.} + # ns_return 423 {text/plain} {Resource is locked.} set ret_code 423 set body "Resource is locked." } else { @@ -1048,7 +1048,7 @@ set ret_code 404 } else { if {![string equal "unlocked" [tdav::check_lock $uri]]} { -# ns_return 423 {text/plain} {Resource is locked.} +# ns_return 423 {text/plain} {Resource is locked.} set ret_code 423 set body "Resource is locked." } elseif [file exists $local_dest] { @@ -1109,7 +1109,7 @@ set timeout [ns_config "ns/server/[ns_info server]/tdav" "defaultlocktimeout" "300"] } if {[string equal "" $locktime]} { - set locktime [clock format [clock seconds]] + set locktime [clock format [clock seconds] -format "%T %D"] } set token "opaquelocktoken:[ns_rand 2147483647]" set lock [list $type $scope $owner $token $timeout $depth $locktime] @@ -1276,8 +1276,8 @@ set href "" set body [subst { - - [ns_conn location]${href} + + [ns_conn location]${href} }] foreach res [lindex $response 1] { @@ -1288,7 +1288,7 @@ <$name xmlns='$ns'/> $status - }] + }] } append body { } @@ -1378,7 +1378,7 @@ $pnode setAttribute "b:dt" "dateTime.tz" - } + } if {[string equal "getlastmodified" $name]} { @@ -1387,13 +1387,13 @@ } if {[string equal "D:collection" $j]} { + + $pnode appendChild [$d createElement $j] - $pnode appendChild [$d createElement $j] - } else { + + $pnode appendChild [$d createTextNode $j] - $pnode appendChild [$d createTextNode $j] - } $prop appendChild $pnode @@ -1495,7 +1495,7 @@ return $tdav_conn($var) } else { return [ns_conn $var] - } + } } } }