aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-11-07 19:41:22 +0000
committerMario <mario@mariovavti.com>2022-11-07 19:41:22 +0000
commit839c5a8e412aa3f22365d9fa8fe7a08cd2bc9378 (patch)
tree5117971b14459c195cfb545f718b98919485120c
parent40d74fa779bbb079e844f9644d7677b06103b8f3 (diff)
downloadvolse-hubzilla-839c5a8e412aa3f22365d9fa8fe7a08cd2bc9378.tar.gz
volse-hubzilla-839c5a8e412aa3f22365d9fa8fe7a08cd2bc9378.tar.bz2
volse-hubzilla-839c5a8e412aa3f22365d9fa8fe7a08cd2bc9378.zip
fix regression where automatically created directories were not public and pinned/featured state of apps was not displayed correctly
-rw-r--r--Zotlabs/Lib/Apps.php4
-rw-r--r--Zotlabs/Module/Wall_upload.php22
-rw-r--r--include/attach.php11
3 files changed, 18 insertions, 19 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index a9c7d0a2a..497a9d299 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -605,8 +605,8 @@ class Apps {
'$deleted' => $papp['deleted'] ?? false,
'$feature' => ((isset($papp['embed']) || $mode == 'edit') ? false : true),
'$pin' => ((isset($papp['embed']) || $mode == 'edit') ? false : true),
- '$featured' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
- '$pinned' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_pinned_app') === false) ? false : true),
+ '$featured' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_featured_app') !== false) ? true : false),
+ '$pinned' => ((isset($papp['categories']) && strpos($papp['categories'], 'nav_pinned_app') !== false) ? true : false),
'$mode' => $mode,
'$add' => t('Add to app-tray'),
'$remove' => t('Remove from app-tray'),
diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php
index 6d58e4032..3e979588c 100644
--- a/Zotlabs/Module/Wall_upload.php
+++ b/Zotlabs/Module/Wall_upload.php
@@ -11,10 +11,10 @@ require_once('include/photos.php');
class Wall_upload extends \Zotlabs\Web\Controller {
function post() {
-
-
- $using_api = ((x($_FILES,'media')) ? true : false);
-
+
+
+ $using_api = ((x($_FILES,'media')) ? true : false);
+
if($using_api) {
require_once('include/api.php');
if(api_user())
@@ -24,32 +24,32 @@ class Wall_upload extends \Zotlabs\Web\Controller {
if(argc() > 1)
$channel = channelx_by_nick(argv(1));
}
-
+
if(! $channel) {
if($using_api)
return;
notice( t('Channel not found.') . EOL);
killme();
}
-
+
$observer = \App::get_observer();
-
+
$args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
-
+
$ret = photo_upload($channel,$observer,$args);
-
+
if(! $ret['success']) {
if($using_api)
return;
notice($ret['message']);
killme();
}
-
+
if($using_api)
return("\n\n" . $ret['body'] . "\n\n");
else
echo "\n\n" . $ret['body'] . "\n\n";
killme();
}
-
+
}
diff --git a/include/attach.php b/include/attach.php
index 3b63bd651..fd418103d 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -707,13 +707,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$darr = array('pathname' => $pathname);
- // if we need to create a directory, use the channel default permissions.
-
- $darr['allow_cid'] = $channel['channel_allow_cid'];
- $darr['allow_gid'] = $channel['channel_allow_gid'];
- $darr['deny_cid'] = $channel['channel_deny_cid'];
- $darr['deny_gid'] = $channel['channel_deny_gid'];
+ // if we need to create a directory at this point, make it public
+ $darr['allow_cid'] = '';
+ $darr['allow_gid'] = '';
+ $darr['deny_cid'] = '';
+ $darr['deny_gid'] = '';
$direct = null;