aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-01-02 20:45:25 +0000
committerMario <mario@mariovavti.com>2022-01-02 20:45:25 +0000
commitdf8bb0596a2a657cb2b0be951e2bc713f2b5e89d (patch)
treedd0f4fba1747f202d81001dabcf0ff661ae654b3 /Zotlabs
parent0003e0b8a5841bfc9e845f0b833aa206527826de (diff)
downloadvolse-hubzilla-df8bb0596a2a657cb2b0be951e2bc713f2b5e89d.tar.gz
volse-hubzilla-df8bb0596a2a657cb2b0be951e2bc713f2b5e89d.tar.bz2
volse-hubzilla-df8bb0596a2a657cb2b0be951e2bc713f2b5e89d.zip
port new_token from zap, fixes and more cleanup
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Notifier.php2
-rw-r--r--Zotlabs/Module/Tokens.php10
2 files changed, 3 insertions, 9 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 76c17545a..7964621c7 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -240,7 +240,7 @@ class Notifier {
$target_item = $r[0];
- if (in_array($target_item['author']['xchan_network'], ['rss', 'anon'])) {
+ if (in_array($target_item['author']['xchan_network'], ['rss', 'anon', 'token'])) {
logger('notifier: target item author is not a fetchable actor', LOGGER_DEBUG);
return;
}
diff --git a/Zotlabs/Module/Tokens.php b/Zotlabs/Module/Tokens.php
index b1c8bb4bf..1b074171e 100644
--- a/Zotlabs/Module/Tokens.php
+++ b/Zotlabs/Module/Tokens.php
@@ -250,9 +250,6 @@ class Tokens extends Controller {
$desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.');
- $desc2 = t('You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:');
-
-
//TODO: assign role
$pcat = new Permcat(local_channel());
$pcatlist = $pcat->listing();
@@ -266,7 +263,7 @@ class Tokens extends Controller {
if (!$current_permcat) {
- notice(t('Please select a role for this contact!') . EOL);
+ notice(t('Please select a role for this guest!') . EOL);
$permcats[] = '';
}
@@ -282,13 +279,10 @@ class Tokens extends Controller {
'$permcat' => ['permcat', t('Select a role for this token'), $current_permcat, '', $permcats],
'$title' => t('Guest Access Tokens'),
'$desc' => $desc,
- '$desc2' => $desc2,
'$tokens' => $t,
'$atoken' => $atoken,
- '$url1' => z_root() . '/channel/' . $channel['channel_address'],
- '$url2' => z_root() . '/photos/' . $channel['channel_address'],
'$name' => array('name', t('Login Name') . ' <span class="required">*</span>', (($atoken) ? $atoken['atoken_name'] : ''),''),
- '$token'=> array('token', t('Login Password') . ' <span class="required">*</span>',(($atoken) ? $atoken['atoken_token'] : autoname(8)), ''),
+ '$token'=> array('token', t('Login Password') . ' <span class="required">*</span>',(($atoken) ? $atoken['atoken_token'] : new_token()), ''),
'$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''),
'$submit' => t('Submit')
));