oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-08 08:14:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Configuration for widgets

Browse source
This commit is contained in:
Michael 2024-03-24 20:00:19 +00:00
parent f78b0e7c51
commit 200cf29a8d
7 changed files with 275 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Module/Admin/Features.php
View file

@ -34,23 +34,16 @@ class Features extends BaseAdmin
self::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');
$features = Feature::get(false);
foreach ($features as $fname => $fdata) {
foreach (Feature::get(false) as $fdata) {
foreach (array_slice($fdata, 1) as $f) {
$feature = $f[0];
$feature_state = 'feature_' . $feature;
$featurelock = 'featurelock_' . $feature;
if (!empty($_POST[$feature_state])) {
$val = intval($_POST[$feature_state]);
} else {
$val = 0;
}
DI::config()->set('feature', $feature, $val);
DI::config()->set('feature', $feature, !empty($_POST[$feature_state]));
if (!empty($_POST[$featurelock])) {
DI::config()->set('feature_lock', $feature, 1);
DI::config()->set('feature_lock', $feature, true);
} else {
DI::config()->delete('feature_lock', $feature);
}
@ -71,10 +64,11 @@ class Features extends BaseAdmin
$features[$fname][0] = $fdata[0];
foreach (array_slice($fdata, 1) as $f) {
$set = DI::config()->get('feature', $f[0], $f[3]);
$features[$fname][1][] = [
['feature_' . $f[0], $f[1], $set, $f[2]],
['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), $f[4], '']
];
$feature = [['feature_' . $f[0], $f[1], $set, $f[2]]];
if (empty($f[5])) {
$feature[] = ['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), $f[4], ''];
}
$features[$fname][1][] = $feature;
}
}

36
src/Module/Conversation/Network.php
View file

@ -130,20 +130,34 @@ class Network extends Timeline
$o = '';
$this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId);
$this->page['aside'] .= GroupManager::widget($this->session->getLocalUserId());
$this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false);
$this->page['aside'] .= Widget::networks($module, $this->network);
$this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString);
$this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId());
$this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
$this->page['aside'] .= Widget::fileAs('filed', '');
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::CIRCLES)) {
$this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId);
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::GROUPS)) {
$this->page['aside'] .= GroupManager::widget($this->session->getLocalUserId());
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::ARCHIVE)) {
$this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false);
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::NETWORKS)) {
$this->page['aside'] .= Widget::networks($module, $this->network);
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::ACCOUNTS)) {
$this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString);
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::CHANNELS)) {
$this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId());
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::SEARCHES)) {
$this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::FOLDERS)) {
$this->page['aside'] .= Widget::fileAs('filed', '');
}
if (($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) &&
!in_array($this->selectedTab, [Channel::FOLLOWERS, Channel::FORYOU, Channel::DISCOVER])) {
!in_array($this->selectedTab, [Channel::FOLLOWERS, Channel::FORYOU, Channel::DISCOVER]) && Feature::isEnabled($this->session->getLocalUserId(), Feature::NOSHARER)) {
$this->page['aside'] .= $this->getNoSharerWidget('network');
}
if (Feature::isEnabled($this->session->getLocalUserId(), Feature::TRENDING_TAGS)) {
$this->page['aside'] .= TrendingTags::getHTML($this->selectedTab);
}

7
src/Module/Settings/Features.php
View file

@ -49,7 +49,7 @@ class Features extends BaseSettings
BaseSettings::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
foreach ($request as $k => $v) {
if (strpos($k, 'feature_') === 0) {
$this->pConfig->set($this->session->getLocalUserId(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
$this->pConfig->set($this->session->getLocalUserId(), 'feature', substr($k, 8), (bool)$v);
}
}
}
@ -58,9 +58,8 @@ class Features extends BaseSettings
{
parent::content($request);
$arr = [];
$features = Feature::get();
foreach ($features as $name => $feature) {
$arr = [];
foreach (Feature::get() as $name => $feature) {
$arr[$name] = [];
$arr[$name][0] = $feature[0];
foreach (array_slice($feature, 1) as $f) {