aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-12 19:52:21 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-12 19:52:21 -0700
commitfc28af8518a422ff1b0a45b8ef006da7bd6d4eb3 (patch)
treec2fc54947e733056820a87ac8401839647be69de
parent6a7079a594bbfa1238fe0bef0dfe265720c2cb4d (diff)
parent3545626950a03f662a16ff3c1b589f2901c9948e (diff)
downloadvolse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.tar.gz
volse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.tar.bz2
volse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/attach.php
-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 a77bf15f7..cb4b525b3 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 50f1d2be7..a556ff775 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -181,7 +181,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;
}
@@ -203,7 +203,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, os_storage, is_dir, is_photo, 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, os_storage, is_dir, is_photo, 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)
);