public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Reworked the entire WebDAV glue in order to get the move functionality to work properly.

Browse Source 
Cleanups.
This commit is contained in:
Kriss Andsten 2010-12-15 02:09:47 +01:00
parent fe06c5d881
commit 4c383fb0b2
1 changed files with 158 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
3.0/modules/webdav/controllers/webdav.php
View File

@ -6,15 +6,19 @@ include 'Sabre/autoload.php';
class webdav_Controller extends Controller { class webdav_Controller extends Controller {
public function gallery() { public function gallery() {
$tree = new Gallery3Album(''); $root = new Gallery3Album('');
$tree = new Gallery3DAVTree($root);
$lock_backend = new Sabre_DAV_Locks_Backend_FS(TMPPATH . 'sabredav'); // Skip the lock plugin for now, we don't want Finder to get write support for the time being.
$lock = new Sabre_DAV_Locks_Plugin($lock_backend); //$lock_backend = new Sabre_DAV_Locks_Backend_FS(TMPPATH . 'sabredav');
//$lock = new Sabre_DAV_Locks_Plugin($lock_backend);
$filter = new Sabre_DAV_TemporaryFileFilterPlugin(TMPPATH . 'sabredav'); $filter = new Sabre_DAV_TemporaryFileFilterPlugin(TMPPATH . 'sabredav');
$server = new Sabre_DAV_Server($tree); $server = new Sabre_DAV_Server($tree);
#$server = new Gallery3DAV($tree);
$server->setBaseUri(url::site('webdav/gallery')); $server->setBaseUri(url::site('webdav/gallery'));
$server->addPlugin($lock); //$server->addPlugin($lock);
$server->addPlugin($filter); $server->addPlugin($filter);
$this->doAuthenticate(); $this->doAuthenticate();
@ -43,50 +47,161 @@ class webdav_Controller extends Controller {
} }
} }
class Gallery3DAVCache {
protected static $cache;
private static $instance;
private function __construct() {
$this->cache = array();
}
private function encodePath($path)
{
$path = trim($path, '/');
$encodedArray = array();
foreach (split('/', $path) as $part)
{
$encodedArray[] = rawurlencode($part);
}
$path = join('/', $encodedArray);
return $path;
}
public function getAlbumOf($path) {
$path = substr($path, 0, strrpos($path, '/'));
return $this->getItemAt($path);
}
public function getItemAt($path)
{
$path = trim($path, '/');
$path = $this->encodePath($path);
if (isset($this->cache[$path])) {
return $this->cache[$path];
}
$item = ORM::factory("item")
->where("relative_path_cache", "=", $path)
->find();
$this->cache[$path] = $item;
return $item;
}
public static function singleton() {
if (!isset(self::$instance)) {
$c = __CLASS__;
self::$instance = new $c;
}
return self::$instance;
}
public function __clone() {}
}
class Gallery3DAVTree extends Sabre_DAV_Tree {
protected $rootNode;
public function __construct(Sabre_DAV_ICollection $rootNode) {
$this->cache = Gallery3DAVCache::singleton();
$this->rootNode = $rootNode;
}
public function move($source, $target) {
$sourceItem = $this->cache->getItemAt($source);
$targetItem = $this->cache->getAlbumOf($target);
if (! access::can('view', $sourceItem)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (! access::can('edit', $sourceItem)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (! access::can('view', $targetItem)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (! access::can('edit', $targetItem)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$sourceItem->parent_id = $targetItem->id;
$sourceItem->save();
return true;
}
public function getNodeForPath($path) {
$path = trim($path,'/');
$currentNode = $this->rootNode;
$item = $this->cache->getItemAt($path);
if (! $item->id) {
throw new Sabre_DAV_Exception_FileNotFound('Could not find node at path: ' . $path);
}
if ($item->type == 'album') { $currentNode = new Gallery3Album($path); }
else { $currentNode = new Gallery3File($path); }
return $currentNode;
}
}
class Gallery3Album extends Sabre_DAV_Directory { class Gallery3Album extends Sabre_DAV_Directory {
private $item; private $item;
private $stat; private $stat;
private $path;
function __construct($name) { function __construct($path) {
$this->item = ORM::factory("item") $this->cache = Gallery3DAVCache::singleton();
->where("relative_path_cache", "=", rawurlencode($name)) $this->path = $path;
->find(); $this->item = $this->cache->getItemAt($path);
} }
function getName() { function getName() {
return $this->item->name; return $this->item->name;
} }
function getChild($name) { function getChildren() {
$rp = $this->item->relative_path() . '/' . rawurlencode($name); $return = array();
if (substr($rp,0,1) == '/') { $rp = substr($rp, 1); } foreach ($this->item->children() as $child) {
$item = $this->getChild($child->name);
if ($item != false) {
$return[] = $item;
}
}
return $return;
}
function getChild($name) {
$rp = $this->path . '/' . $name;
$child = ORM::factory("item") $child = $this->cache->getItemAt($rp);
->where("relative_path_cache", "=", $rp)
->find(); if (! $child->id) {
throw new Sabre_DAV_Exception_FileNotFound('Access denied');
}
if (! access::can('view', $child)) { if (! access::can('view', $child)) {
return false; return false;
}; };
if ($child->type == 'album') { if ($child->type == 'album') {
return new Gallery3Album($this->item->relative_path() . $child->name); return new Gallery3Album($rp);
} else { } else {
return new Gallery3File($rp); return new Gallery3File($rp);
} }
} }
public function createFile($name, $data = null) { public function createFile($name, $data = null) {
if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (! access::can('add', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('add', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (substr($name, 0, 1) == '.') { return true; }; if (substr($name, 0, 1) == '.') { return true; };
$tempfile = tempnam(TMPPATH, 'dav'); $tempfile = tempnam(TMPPATH, 'dav');
$target = fopen($tempfile, 'wb'); $target = fopen($tempfile, 'wb');
stream_copy_to_stream($data, $target); stream_copy_to_stream($data, $target);
fclose($target); fclose($target);
$parent_id = $this->item->__get('id'); $parent_id = $this->item->__get('id');
$item = ORM::factory("item"); $item = ORM::factory("item");
$item->name = $name; $item->name = $name;
@ -99,8 +214,8 @@ class Gallery3Album extends Sabre_DAV_Directory {
} }
public function createDirectory($name) { public function createDirectory($name) {
if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
if (! access::can('add', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('add', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$parent_id = $this->item->__get('id'); $parent_id = $this->item->__get('id');
$album = ORM::factory("item"); $album = ORM::factory("item");
@ -114,28 +229,21 @@ class Gallery3Album extends Sabre_DAV_Directory {
$this->item = ORM::factory("item")->where('id', '=', $parent_id); $this->item = ORM::factory("item")->where('id', '=', $parent_id);
} }
function getLastModified() {
return $this->item->updated;
}
function setName($name) { function setName($name) {
if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$this->item->name = $name; $this->item->name = $name;
$this->item->save(); $this->item->save();
} }
public function delete() { public function delete() {
if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$this->item->delete(); $this->item->delete();
} }
function getChildren() {
$return = array();
foreach ($this->item->children() as $child) {
$item = $this->getChild($child->name);
if ($item != false) {
$return[] = $item;
}
}
return $return;
}
} }
class Gallery3File extends Sabre_DAV_File { class Gallery3File extends Sabre_DAV_File {
@ -144,36 +252,35 @@ class Gallery3File extends Sabre_DAV_File {
private $path; private $path;
function __construct($path) { function __construct($path) {
$this->item = ORM::factory("item") $this->cache = Gallery3DAVCache::singleton();
->where("relative_path_cache", "=", $path) $this->item = $this->cache->getItemAt($path);
->find();
if (access::can('view_full', $this->item)) {
if (access::can('view_full', $this->item)) { $this->stat = stat($this->item->file_path());
$this->stat = stat($this->item->file_path()); $this->path = $this->item->file_path();
$this->path = $this->item->file_path(); } else {
} else { $this->stat = stat($this->item->resize_path());
$this->stat = stat($this->item->resize_path()); $this->path = $this->item->resize_path();
$this->path = $this->item->resize_path(); }
}
} }
public function delete() { public function delete() {
if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$this->item->delete(); $this->item->delete();
} }
function setName($name) { function setName($name) {
if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('edit', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
$this->item->name = $name; $this->item->name = $name;
$this->item->save(); $this->item->save();
} }
public function getLastModified() { public function getLastModified() {
return $this->stat[9]; return $this->item->updated;
} }
function get() { function get() {
if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
return fopen($this->path,'r'); return fopen($this->path,'r');
} }
@ -186,7 +293,7 @@ class Gallery3File extends Sabre_DAV_File {
} }
function getETag() { function getETag() {
if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_FileNotFound('Access denied'); }; if (! access::can('view', $this->item)) { throw new Sabre_DAV_Exception_Forbidden('Access denied'); };
return '"' . md5($this->item->file_path()) . '"'; return '"' . md5($this->item->file_path()) . '"';
} }
} }