diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-13 15:57:28 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-13 15:57:28 -0700 |
| commit | b7be79c5e7bfe25c3c55784733b6f616f18d85dc (patch) | |
| tree | fd7ca742398ee28c5ec754abb26e8348a8e85a69 /include/RedDAV | |
| parent | 3f0009ccd7fb96e8808b3267367ae95ffee37161 (diff) | |
| download | volse-hubzilla-b7be79c5e7bfe25c3c55784733b6f616f18d85dc.tar.gz volse-hubzilla-b7be79c5e7bfe25c3c55784733b6f616f18d85dc.tar.bz2 volse-hubzilla-b7be79c5e7bfe25c3c55784733b6f616f18d85dc.zip | |
isolate the os_storage flag
Diffstat (limited to 'include/RedDAV')
| -rw-r--r-- | include/RedDAV/RedDirectory.php | 4 | ||||
| -rw-r--r-- | include/RedDAV/RedFile.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php index 005d81c75..2f2df54ab 100644 --- a/include/RedDAV/RedDirectory.php +++ b/include/RedDAV/RedDirectory.php @@ -220,7 +220,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $is_photo = 1; } - $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, flags, filetype, filesize, revision, is_photo, data, created, edited, allow_cid, allow_gid, deny_cid, deny_gid ) + $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, data, created, edited, allow_cid, allow_gid, deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", intval($c[0]['channel_account_id']), intval($c[0]['channel_id']), @@ -228,7 +228,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { dbesc($this->auth->observer), dbesc($name), dbesc($this->folder_hash), - dbesc(ATTACH_FLAG_OS), + intval(1), dbesc($mimetype), intval($filesize), intval(0), diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php index b7aa5473a..3a3cb2347 100644 --- a/include/RedDAV/RedFile.php +++ b/include/RedDAV/RedFile.php @@ -102,12 +102,12 @@ class RedFile extends DAV\Node implements DAV\IFile { intval(PAGE_REMOVED) ); - $r = q("SELECT flags, folder, data FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", + $r = q("SELECT flags, folder, os_storage, data FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", dbesc($this->data['hash']), intval($c[0]['channel_id']) ); if ($r) { - if ($r[0]['flags'] & ATTACH_FLAG_OS) { + if (intval($r[0]['os_storage'])) { $fname = dbunescbin($r[0]['data']); $f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : ''); // @todo check return value and set $size directly @@ -179,7 +179,7 @@ class RedFile extends DAV\Node implements DAV\IFile { public function get() { logger('get file ' . basename($this->name), LOGGER_DEBUG); - $r = q("SELECT data, flags, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", + $r = q("SELECT data, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", dbesc($this->data['hash']), intval($this->data['uid']) ); @@ -192,7 +192,7 @@ class RedFile extends DAV\Node implements DAV\IFile { header('Content-type: text/plain'); } - if ($r[0]['flags'] & ATTACH_FLAG_OS ) { + if (intval($r[0]['os_storage'])) { $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . dbunescbin($r[0]['data']); return fopen($f, 'rb'); } |