diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 19:52:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 19:52:21 -0700 |
| commit | fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3 (patch) | |
| tree | c2fc54947e733056820a87ac8401839647be69de /include/api.php | |
| parent | 6a7079a594bbfa1238fe0bef0dfe265720c2cb4d (diff) | |
| parent | 3545626950a03f662a16ff3c1b589f2901c9948e (diff) | |
| download | volse-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
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 8 |
1 files changed, 8 insertions, 0 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())); |