aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-12 19:49:06 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-12 19:49:06 -0700
commit3545626950a03f662a16ff3c1b589f2901c9948e (patch)
treecce707cfd5361418d47c3205be9143e0282a1539
parent8e7e9b704022333b5701a14435e1cc884695214f (diff)
downloadvolse-hubzilla-3545626950a03f662a16ff3c1b589f2901c9948e.tar.gz
volse-hubzilla-3545626950a03f662a16ff3c1b589f2901c9948e.tar.bz2
volse-hubzilla-3545626950a03f662a16ff3c1b589f2901c9948e.zip
attach_list_files had some problems - wasn't used until now apparently
-rw-r--r--include/api.php8
-rw-r--r--include/attach.php4
2 files changed, 10 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php
index 027779558..8d50e8eea 100644
--- a/include/api.php
+++ b/include/api.php
@@ -8,6 +8,7 @@ require_once("html2plain.php");
require_once('include/security.php');
require_once('include/photos.php');
require_once('include/items.php');
+require_once('include/attach.php');
/*
*
@@ -619,6 +620,13 @@ require_once('include/items.php');
}
api_register_func('api/red/channel/stream','api_channel_stream', true);
+ function api_attach_list(&$a,$type) {
+ logger('api_user: ' . api_user());
+ json_return_and_die(attach_list_files(api_user(),get_observer_hash()));
+ }
+ api_register_func('api/red/files','api_attach_list', true);
+
+
function api_albums(&$a,$type) {
json_return_and_die(photos_albums_list($a->get_channel(),$a->get_observer()));
diff --git a/include/attach.php b/include/attach.php
index 4bbda9530..c16944601 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -180,7 +180,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
$ret = array('success' => false);
- if(! perm_is_allowed($channel_id,$observer, 'read_storage')) {
+ if(! perm_is_allowed($channel_id,$observer, 'view_storage')) {
$ret['message'] = t('Permission denied.');
return $ret;
}
@@ -202,7 +202,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
// Retrieve all columns except 'data'
- $r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra $orderby $limit",
+ $r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit",
intval($channel_id)
);