diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:28:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:28:52 -0700 |
| commit | 859a2ac8ef1c3ce234b894598be846cbc89cf54a (patch) | |
| tree | 05993acfb095fa16db4145ad84f4db51f377213c /include/RedDAV | |
| parent | 91d92fe6fcbd98e33fb6f76a63e91ebb086aeff0 (diff) | |
| download | volse-hubzilla-859a2ac8ef1c3ce234b894598be846cbc89cf54a.tar.gz volse-hubzilla-859a2ac8ef1c3ce234b894598be846cbc89cf54a.tar.bz2 volse-hubzilla-859a2ac8ef1c3ce234b894598be846cbc89cf54a.zip | |
DB changes for some channel flags
Diffstat (limited to 'include/RedDAV')
| -rw-r--r-- | include/RedDAV/RedDirectory.php | 20 | ||||
| -rw-r--r-- | include/RedDAV/RedFile.php | 5 |
2 files changed, 10 insertions, 15 deletions
diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php index 88a4647a4..dba857cdc 100644 --- a/include/RedDAV/RedDirectory.php +++ b/include/RedDAV/RedDirectory.php @@ -200,9 +200,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $mimetype = z_mime_content_type($name); - $c = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d)>0 LIMIT 1", - intval($this->auth->owner_id), - intval(PAGE_REMOVED) + $c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1", + intval($this->auth->owner_id) ); if (! $c) { @@ -318,9 +317,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } - $r = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d)>0 LIMIT 1", - intval($this->auth->owner_id), - intval(PAGE_REMOVED) + $r = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1", + intval($this->auth->owner_id) ); if ($r) { @@ -389,9 +387,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $channel_name = $path_arr[0]; - $r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' AND NOT ( channel_pageflags & %d )>0 LIMIT 1", - dbesc($channel_name), - intval(PAGE_REMOVED) + $r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' AND channel_removed = 0 LIMIT 1", + dbesc($channel_name) ); if (! $r) { @@ -467,9 +464,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $free = disk_free_space('store'); if ($this->auth->owner_id) { - $c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d)>0 limit 1", - intval($this->auth->owner_id), - intval(PAGE_REMOVED) + $c = q("select * from channel where channel_id = %d and channel_removed = 0 limit 1", + intval($this->auth->owner_id) ); $ulimit = service_class_fetch($c[0]['channel_id'], 'attach_upload_limit'); diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php index 164498676..1fd2dab8f 100644 --- a/include/RedDAV/RedFile.php +++ b/include/RedDAV/RedFile.php @@ -97,9 +97,8 @@ class RedFile extends DAV\Node implements DAV\IFile { $size = 0; // @todo only 3 values are needed - $c = q("SELECT * FROM channel WHERE channel_id = %d AND (channel_pageflags & %d) = 0 LIMIT 1", - intval($this->auth->owner_id), - intval(PAGE_REMOVED) + $c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1", + intval($this->auth->owner_id) ); $is_photo = false; |