From 93f48cd8bb93bb3f8d2ef0ce90b3d1b75fc97859 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 16 Jun 2015 12:18:50 +0200 Subject: make photo upload work for remote channels with perms --- mod/photos.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index e88d1497e..2af90610e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -6,6 +6,7 @@ require_once('include/acl_selectors.php'); require_once('include/bbcode.php'); require_once('include/security.php'); require_once('include/Contact.php'); +require_once('include/text.php'); function photos_init(&$a) { @@ -401,9 +402,20 @@ function photos_post(&$a) { * default post action - upload a photo */ + $channel = $a->data['channel']; + $observer = $a->data['observer']; + $_REQUEST['source'] = 'photos'; - $r = photo_upload($a->channel,$a->get_observer(), $_REQUEST); + if(!local_channel()) { + $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']); + $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']); + $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']); + $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); + } + + $r = photo_upload($channel, $observer, $_REQUEST); + if(! $r['success']) { notice($r['message'] . EOL); } -- cgit v1.2.3 From 40ee0d41dc977584a78307f151773137c7f0744d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 16 Jun 2015 12:54:29 +0200 Subject: fix deleting of album for remote channel --- include/photos.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/photos.php b/include/photos.php index 1672e310a..ca8c53679 100644 --- a/include/photos.php +++ b/include/photos.php @@ -452,13 +452,13 @@ function photos_album_rename($channel_id, $oldname, $newname) { function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') { if ($remote_xchan) { - $r = q("SELECT distinct resource_id as from photo where xchan = '%s' and uid = %d and album = '%s' ", + $r = q("SELECT distinct resource_id from photo where xchan = '%s' and uid = %d and album = '%s' ", dbesc($remote_xchan), intval($channel_id), dbesc($album) ); } else { - $r = q("SELECT distinct resource_id from photo where uid = %d and album = '%s' ", + $r = q("SELECT distinct resource_id from photo where uid = %d and album = '%s' ", intval($channel_id), dbesc($album) ); -- cgit v1.2.3 From 24befa2197d3dfc9ebeac10b307eaddcc7dd5cf1 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 16 Jun 2015 13:24:10 +0200 Subject: Small fix in siteinfo --- mod/siteinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 904228f13..c5a1cf12b 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -164,7 +164,7 @@ function siteinfo_content(&$a) { '$visit' => t('Please visit redmatrix.me to learn more about $Projectname.'), '$bug_text' => t('Bug reports and issues: please visit'), '$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues', - '$bug_link_text' => '$projectname issues', + '$bug_link_text' => t('$projectname issues'), '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'), '$donate' => $donate, '$adminlabel' => t('Site Administrators'), -- cgit v1.2.3