Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Mike Macgirvin 2022-09-04 16:28:17 +10:00
parent 154069bb66
commit ebe3949b7f
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Code/Import/Friendica.php
View file

@ -246,7 +246,7 @@ class Friendica
// right away as a default group for new contacts.
AccessList::add($newuid, t('Friends'));
AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']);
AccessList::member_add($newuid, t('Friends'), $channel['channel_hash']);
// if our role_permissions indicate that we're using a default collection ACL, add it.

2
Code/Module/Directory.php
View file

@ -461,7 +461,7 @@ class Directory extends Controller
];
$blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
$blocked = LibBlock::fetch(local_channel(), BLOCKTYPE_SERVER);
$found_block = false;
if ($blocked) {

5
Code/Module/Help.php
View file

@ -80,8 +80,9 @@ class Help extends Controller
readfile($realpath);
killme();
}
$heading = '';
if (argc() === 1) {
$files = self::listdir('doc');
if ($files) {
@ -92,7 +93,7 @@ class Help extends Controller
if (strpos($file, 'README')) {
continue;
}
if (preg_match('/\/(..|..\-..)\//', $file, $matches)) {
if (preg_match('/\/(..|..-..)\//', $file, $matches)) {
$language = $matches[1];
} else {
$language = t('Unknown language');

15
Code/Module/Settings/Permcats.php
View file

@ -59,7 +59,7 @@ class Permcats
{
if (!local_channel()) {
return;
return '';
}
$channel = App::get_channel();
@ -124,17 +124,17 @@ class Permcats
$tpl = Theme::get_template("settings_permcats.tpl");
$o .= replace_macros($tpl, array(
return replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_permcats"),
'$title' => t('Permission Roles'),
'$desc' => $desc,
'$desc2' => $desc2,
'$tokens' => $t,
'$desc2' => '',
'$tokens' => '',
'$permcats' => $permcats,
'$atoken' => $atoken,
'$atoken' => '',
'$url1' => z_root() . '/channel/' . $channel['channel_address'],
'$url2' => z_root() . '/photos/' . $channel['channel_address'],
'$name' => array('name', t('Role name') . ' <span class="required">*</span>', (($name) ? $name : ''), ''),
'$name' => ['name', t('Role name') . ' <span class="required">*</span>', (($name) ? $name : ''), ''],
'$me' => t('My Settings'),
'$perms' => $perms,
'$hidden_perms' => $hidden_perms,
@ -144,7 +144,6 @@ class Permcats
'$permlbl' => t('Individual Permissions'),
'$permnote' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
'$submit' => t('Submit')
));
return $o;
]);
}
}