<?php
/**
- * @file mod/settings.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
use Friendica\App;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
-use Friendica\Core\Session;
-use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
-use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Notify\Type;
use Friendica\Model\User;
+use Friendica\Module\BaseSettings;
use Friendica\Module\Security\Login;
use Friendica\Protocol\Email;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
use Friendica\Worker\Delivery;
-function get_theme_config_file($theme)
-{
- $theme = Strings::sanitizeFilePathItem($theme);
-
- $a = DI::app();
- $base_theme = $a->theme_info['extends'] ?? '';
-
- if (file_exists("view/theme/$theme/config.php")) {
- return "view/theme/$theme/config.php";
- }
- if ($base_theme && file_exists("view/theme/$base_theme/config.php")) {
- return "view/theme/$base_theme/config.php";
- }
- return null;
-}
-
function settings_init(App $a)
{
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
- // These lines provide the javascript needed by the acl selector
-
- $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
- DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
- '$ispublic' => DI::l10n()->t('everybody')
- ]);
-
- $tabs = [
- [
- 'label' => DI::l10n()->t('Account'),
- 'url' => 'settings',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
- 'accesskey' => 'o',
- ],
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Two-factor authentication'),
- 'url' => 'settings/2fa',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === '2fa') ? 'active' : ''),
- 'accesskey' => 'o',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Profile'),
- 'url' => 'settings/profile',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'profile')?'active':''),
- 'accesskey' => 'p',
- ];
-
- if (Feature::get()) {
- $tabs[] = [
- 'label' => DI::l10n()->t('Additional features'),
- 'url' => 'settings/features',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
- 'accesskey' => 't',
- ];
- }
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Display'),
- 'url' => 'settings/display',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- 'accesskey' => 'i',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Social Networks'),
- 'url' => 'settings/connectors',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- 'accesskey' => 'w',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Addons'),
- 'url' => 'settings/addon',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- 'accesskey' => 'l',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Delegations'),
- 'url' => 'settings/delegation',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation')?'active':''),
- 'accesskey' => 'd',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Connected apps'),
- 'url' => 'settings/oauth',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- 'accesskey' => 'b',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Export personal data'),
- 'url' => 'settings/userexport',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport')?'active':''),
- 'accesskey' => 'e',
- ];
-
- $tabs[] = [
- 'label' => DI::l10n()->t('Remove account'),
- 'url' => 'removeme',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
- 'accesskey' => 'r',
- ];
-
-
- $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
- DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
- '$title' => DI::l10n()->t('Settings'),
- '$class' => 'settings-widget',
- '$items' => $tabs,
- ]);
-
+ BaseSettings::content();
}
function settings_post(App $a)
}
if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
intval($mail_pubmail),
intval(local_user())
);
- Logger::log("mail: updating mailaccount. Response: ".print_r($r, true));
+ Logger::notice('updating mailaccount', ['response' => $r]);
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
unset($dcrpass);
if (!$mbox) {
$failed = true;
- notice(DI::l10n()->t('Failed to connect with email account using the settings provided.') . EOL);
+ notice(DI::l10n()->t('Failed to connect with email account using the settings provided.'));
}
}
}
- if (!$failed) {
- info(DI::l10n()->t('Email settings updated.') . EOL);
- }
}
}
DI::pConfig()->set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info(DI::l10n()->t('Features updated') . EOL);
return;
}
- if (($a->argc > 1) && ($a->argv[1] === 'display')) {
- BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
-
- $theme = !empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : $a->user['theme'];
- $mobile_theme = !empty($_POST['mobile_theme']) ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
- $nosmile = !empty($_POST['nosmile']) ? intval($_POST['nosmile']) : 0;
- $first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week']) : 0;
- $noinfo = !empty($_POST['noinfo']) ? intval($_POST['noinfo']) : 0;
- $infinite_scroll = !empty($_POST['infinite_scroll']) ? intval($_POST['infinite_scroll']) : 0;
- $no_auto_update = !empty($_POST['no_auto_update']) ? intval($_POST['no_auto_update']) : 0;
- $bandwidth_saver = !empty($_POST['bandwidth_saver']) ? intval($_POST['bandwidth_saver']) : 0;
- $no_smart_threading = !empty($_POST['no_smart_threading']) ? intval($_POST['no_smart_threading']) : 0;
- $nowarn_insecure = !empty($_POST['nowarn_insecure']) ? intval($_POST['nowarn_insecure']) : 0;
- $browser_update = !empty($_POST['browser_update']) ? intval($_POST['browser_update']) : 0;
- if ($browser_update != -1) {
- $browser_update = $browser_update * 1000;
- if ($browser_update < 10000) {
- $browser_update = 10000;
- }
- }
-
- $itemspage_network = !empty($_POST['itemspage_network']) ? intval($_POST['itemspage_network']) : 40;
- if ($itemspage_network > 100) {
- $itemspage_network = 100;
- }
- $itemspage_mobile_network = !empty($_POST['itemspage_mobile_network']) ? intval($_POST['itemspage_mobile_network']) : 20;
- if ($itemspage_mobile_network > 100) {
- $itemspage_mobile_network = 100;
- }
-
- if ($mobile_theme !== '') {
- DI::pConfig()->set(local_user(), 'system', 'mobile_theme', $mobile_theme);
- }
-
- DI::pConfig()->set(local_user(), 'system', 'nowarn_insecure' , $nowarn_insecure);
- DI::pConfig()->set(local_user(), 'system', 'update_interval' , $browser_update);
- DI::pConfig()->set(local_user(), 'system', 'itemspage_network' , $itemspage_network);
- DI::pConfig()->set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
- DI::pConfig()->set(local_user(), 'system', 'no_smilies' , $nosmile);
- DI::pConfig()->set(local_user(), 'system', 'first_day_of_week' , $first_day_of_week);
- DI::pConfig()->set(local_user(), 'system', 'ignore_info' , $noinfo);
- DI::pConfig()->set(local_user(), 'system', 'infinite_scroll' , $infinite_scroll);
- DI::pConfig()->set(local_user(), 'system', 'no_auto_update' , $no_auto_update);
- DI::pConfig()->set(local_user(), 'system', 'bandwidth_saver' , $bandwidth_saver);
- DI::pConfig()->set(local_user(), 'system', 'no_smart_threading' , $no_smart_threading);
-
- if (in_array($theme, Theme::getAllowedList())) {
- if ($theme == $a->user['theme']) {
- // call theme_post only if theme has not been changed
- if (($themeconfigfile = get_theme_config_file($theme)) !== null) {
- require_once $themeconfigfile;
- theme_post($a);
- }
- } else {
- DBA::update('user', ['theme' => $theme], ['uid' => local_user()]);
- }
- } else {
- notice(DI::l10n()->t('The theme you chose isn\'t available.'));
- }
-
- Hook::callAll('display_settings_post', $_POST);
- DI::baseUrl()->redirect('settings/display');
- return; // NOTREACHED
- }
-
BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
// Import Contacts from CSV file
if (isset($_FILES['importcontact-filename'])) {
// was there an error
if ($_FILES['importcontact-filename']['error'] > 0) {
- Logger::notice('Contact CSV file upload error');
- info(DI::l10n()->t('Contact CSV file upload error'));
+ Logger::notice('Contact CSV file upload error', ['error' => $_FILES['importcontact-filename']['error']]);
+ notice(DI::l10n()->t('Contact CSV file upload error'));
} else {
$csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));
+ Logger::info('Import started', ['lines' => count($csvArray)]);
// import contacts
foreach ($csvArray as $csvRow) {
// The 1st row may, or may not contain the headers of the table
// "http" or "@" to be present in the string.
// All other fields from the row will be ignored
if ((strpos($csvRow[0],'@') !== false) || (strpos($csvRow[0],'http') !== false)) {
- $arr = Contact::createFromProbe($_SESSION['uid'], $csvRow[0], '', false);
+ Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
}
}
+ Logger::info('Import done');
+
info(DI::l10n()->t('Importing Contacts done'));
// delete temp file
- unlink($filename);
+ unlink($_FILES['importcontact-filename']['tmp_name']);
}
+ } else {
+ Logger::info('Import triggered, but no import file was found.');
}
+
+ return;
}
if (!empty($_POST['resend_relocate'])) {
$blocktags = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
$unkmail = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
$cntunkmail = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
- $suggestme = (!empty($_POST['suggestme']) ? intval($_POST['suggestme']) : 0);
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
+ $unlisted = (($_POST['unlisted'] == 1) ? 1: 0);
+ $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0);
$email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0);
$detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
if ($username != $a->user['username']) {
if (strlen($username) > 40) {
- $err .= DI::l10n()->t(' Please use a shorter name.');
+ $err .= DI::l10n()->t('Please use a shorter name.');
}
if (strlen($username) < 3) {
- $err .= DI::l10n()->t(' Name too short.');
+ $err .= DI::l10n()->t('Name too short.');
}
}
if ($email != $a->user['email']) {
// check for the correct password
if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
- $err .= DI::l10n()->t('Wrong Password') . EOL;
+ $err .= DI::l10n()->t('Wrong Password.');
$email = $a->user['email'];
}
// check the email is valid
}
if (strlen($err)) {
- notice($err . EOL);
+ notice($err);
return;
}
DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos);
DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only);
- DI::pConfig()->set(local_user(), 'system', 'suggestme', $suggestme);
-
DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
+ DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted);
+ DI::pConfig()->set(local_user(), 'system', 'accessible-photos', $accessiblephotos);
if ($page_flags == User::PAGE_FLAGS_PRVGROUP) {
$hidewall = 1;
if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
if ($def_gid) {
- info(DI::l10n()->t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+ info(DI::l10n()->t('Private forum has no privacy permissions. Using default privacy group.'));
$str_group_allow = '<' . $def_gid . '>';
} else {
- notice(DI::l10n()->t('Private forum has no privacy permissions and no default privacy group.') . EOL);
+ notice(DI::l10n()->t('Private forum has no privacy permissions and no default privacy group.'));
}
}
}
$fields['openidserver'] = '';
}
- if (DBA::update('user', $fields, ['uid' => local_user()])) {
- info(DI::l10n()->t('Settings updated.') . EOL);
+ if (!DBA::update('user', $fields, ['uid' => local_user()])) {
+ notice(DI::l10n()->t('Settings were not updated.'));
}
// clear session language
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
- // Update the global contact for the user
- GContact::updateForUser(local_user());
-
DI::baseUrl()->redirect('settings');
return; // NOTREACHED
}
Nav::setSelected('settings');
if (!local_user()) {
- //notice(DI::l10n()->t('Permission denied.') . EOL);
+ //notice(DI::l10n()->t('Permission denied.'));
return Login::form();
}
if (!empty($_SESSION['submanage'])) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
$arr[$fname] = [];
$arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) {
- $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[DI::l10n()->t('Off'), DI::l10n()->t('On')]];
+ $arr[$fname][1][] = ['feature_' . $f[0], $f[1], Feature::isEnabled(local_user(), $f[0]), $f[2]];
}
}
Hook::callAll('connector_settings', $settings_connectors);
if (is_site_admin()) {
- $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled')));
- $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t("GNU Social \x28OStatus\x29"), ((DI::config()->get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled')));
+ $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora (Socialhome, Hubzilla)'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled')));
+ $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('OStatus (GNU Social)'), ((DI::config()->get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled')));
} else {
$diasp_enabled = "";
$ostat_enabled = "";
return $o;
}
- /*
- * DISPLAY SETTINGS
- */
- if (($a->argc > 1) && ($a->argv[1] === 'display')) {
- $default_theme = DI::config()->get('system', 'theme');
- if (!$default_theme) {
- $default_theme = 'default';
- }
- $default_mobile_theme = DI::config()->get('system', 'mobile-theme');
- if (!$default_mobile_theme) {
- $default_mobile_theme = 'none';
- }
-
- $allowed_themes = Theme::getAllowedList();
-
- $themes = [];
- $mobile_themes = ["---" => DI::l10n()->t('No special theme for mobile devices')];
- foreach ($allowed_themes as $theme) {
- $is_experimental = file_exists('view/theme/' . $theme . '/experimental');
- $is_unsupported = file_exists('view/theme/' . $theme . '/unsupported');
- $is_mobile = file_exists('view/theme/' . $theme . '/mobile');
- if (!$is_experimental || ($is_experimental && (DI::config()->get('experimentals', 'exp_themes')==1 || is_null(DI::config()->get('experimentals', 'exp_themes'))))) {
- $theme_name = ucfirst($theme);
- if ($is_unsupported) {
- $theme_name = DI::l10n()->t('%s - (Unsupported)', $theme_name);
- } elseif ($is_experimental) {
- $theme_name = DI::l10n()->t('%s - (Experimental)', $theme_name);
- }
-
- if ($is_mobile) {
- $mobile_themes[$theme] = $theme_name;
- } else {
- $themes[$theme] = $theme_name;
- }
- }
- }
-
- $theme_selected = $a->user['theme'] ?: $default_theme;
- $mobile_theme_selected = Session::get('mobile-theme', $default_mobile_theme);
-
- $nowarn_insecure = intval(DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure'));
-
- $browser_update = intval(DI::pConfig()->get(local_user(), 'system', 'update_interval'));
- if (intval($browser_update) != -1) {
- $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
- }
-
- $itemspage_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_network'));
- $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
- $itemspage_mobile_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network'));
- $itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : 20); // default if not set: 20 items
-
- $nosmile = DI::pConfig()->get(local_user(), 'system', 'no_smilies', 0);
- $first_day_of_week = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
- $weekdays = [0 => DI::l10n()->t("Sunday"), 1 => DI::l10n()->t("Monday")];
-
- $noinfo = DI::pConfig()->get(local_user(), 'system', 'ignore_info', 0);
- $infinite_scroll = DI::pConfig()->get(local_user(), 'system', 'infinite_scroll', 0);
- $no_auto_update = DI::pConfig()->get(local_user(), 'system', 'no_auto_update', 0);
- $bandwidth_saver = DI::pConfig()->get(local_user(), 'system', 'bandwidth_saver', 0);
- $no_smart_threading = DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0);
-
- $theme_config = "";
- if (($themeconfigfile = get_theme_config_file($theme_selected)) !== null) {
- require_once $themeconfigfile;
- $theme_config = theme_content($a);
- }
-
- $tpl = Renderer::getMarkupTemplate('settings/display.tpl');
- $o = Renderer::replaceMacros($tpl, [
- '$ptitle' => DI::l10n()->t('Display Settings'),
- '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
- '$submit' => DI::l10n()->t('Save Settings'),
- '$baseurl' => DI::baseUrl()->get(true),
- '$uid' => local_user(),
-
- '$theme' => ['theme', DI::l10n()->t('Display Theme:'), $theme_selected, '', $themes, true],
- '$mobile_theme' => ['mobile_theme', DI::l10n()->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
- '$nowarn_insecure' => ['nowarn_insecure', DI::l10n()->t('Suppress warning of insecure networks'), $nowarn_insecure, DI::l10n()->t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")],
- '$ajaxint' => ['browser_update', DI::l10n()->t("Update browser every xx seconds"), $browser_update, DI::l10n()->t('Minimum of 10 seconds. Enter -1 to disable it.')],
- '$itemspage_network' => ['itemspage_network', DI::l10n()->t("Number of items to display per page:"), $itemspage_network, DI::l10n()->t('Maximum of 100 items')],
- '$itemspage_mobile_network' => ['itemspage_mobile_network', DI::l10n()->t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, DI::l10n()->t('Maximum of 100 items')],
- '$nosmile' => ['nosmile', DI::l10n()->t("Don't show emoticons"), $nosmile, ''],
- '$calendar_title' => DI::l10n()->t('Calendar'),
- '$first_day_of_week' => ['first_day_of_week', DI::l10n()->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
- '$noinfo' => ['noinfo', DI::l10n()->t("Don't show notices"), $noinfo, ''],
- '$infinite_scroll' => ['infinite_scroll', DI::l10n()->t("Infinite scroll"), $infinite_scroll, ''],
- '$no_auto_update' => ['no_auto_update', DI::l10n()->t("Automatic updates only at the top of the network page"), $no_auto_update, DI::l10n()->t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
- '$bandwidth_saver' => ['bandwidth_saver', DI::l10n()->t('Bandwidth Saver Mode'), $bandwidth_saver, DI::l10n()->t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
- '$no_smart_threading' => ['no_smart_threading', DI::l10n()->t('Disable Smart Threading'), $no_smart_threading, DI::l10n()->t('Disable the automatic suppression of extraneous thread indentation.')],
-
- '$d_tset' => DI::l10n()->t('General Theme Settings'),
- '$d_ctset' => DI::l10n()->t('Custom Theme Settings'),
- '$d_cset' => DI::l10n()->t('Content Settings'),
- 'stitle' => DI::l10n()->t('Theme settings'),
- '$theme_config' => $theme_config,
- ]);
-
- return $o;
- }
-
-
/*
* ACCOUNT SETTINGS
*/
$profile = DBA::selectFirst('profile', [], ['uid' => local_user()]);
if (!DBA::isResult($profile)) {
- notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.') . EOL);
+ notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.'));
return;
}
$expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true);
$expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false);
$expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false);
- $suggestme = DI::pConfig()->get(local_user(), 'system', 'suggestme', false);
-
- // nowarn_insecure
if (!strlen($a->user['timezone'])) {
$timezone = date_default_timezone_get();
$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
} else {
$profile_in_dir = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['profile_in_directory', DI::l10n()->t('Publish your default profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]]
+ '$field' => ['profile_in_directory', DI::l10n()->t('Publish your profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory')]
]);
}
+ $net_pub_desc = '';
if (strlen(DI::config()->get('system', 'directory'))) {
- $profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['profile_in_netdirectory', DI::l10n()->t('Publish your default profile in the global social directory?'), $profile['net-publish'], DI::l10n()->t('Your profile will be published in the global friendica directories (e.g. <a href="%s">%s</a>). Your profile will be visible in public.', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory')) . " " . DI::l10n()->t("This setting also determines whether Friendica will inform search engines that your profile should be indexed or not. Third-party search engines may or may not respect this setting."), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]]
- ]);
- } else {
- $profile_in_net_dir = '';
- }
-
- $hide_friends = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], DI::l10n()->t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- $hide_wall = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- $blockwall = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- $blocktags = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- $suggestme = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['suggestme', DI::l10n()->t('Allow us to suggest you as a potential friend to new members?'), $suggestme, DI::l10n()->t('If you like, Friendica may suggest new members to add you as a contact.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- $unkmail = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ]);
-
- if (!$profile['publish'] && !$profile['net-publish']) {
- info(DI::l10n()->t('Profile is <strong>not published</strong>.') . EOL);
+ $net_pub_desc = ' ' . DI::l10n()->t('Your profile will also be published in the global friendica directories (e.g. <a href="%s">%s</a>).', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory'));
}
$tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl');
$stpl = Renderer::getMarkupTemplate('settings/settings.tpl');
- $expire_arr = [
- 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')],
- 'advanced' => DI::l10n()->t('Advanced expiration settings'),
- 'label' => DI::l10n()->t('Advanced Expiration'),
- 'items' => ['expire_items', DI::l10n()->t("Expire posts:"), $expire_items, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- 'notes' => ['expire_notes', DI::l10n()->t("Expire personal notes:"), $expire_notes, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- 'starred' => ['expire_starred', DI::l10n()->t("Expire starred posts:"), $expire_starred, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- 'photos' => ['expire_photos', DI::l10n()->t("Expire photos:"), $expire_photos, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- 'network_only' => ['expire_network_only', DI::l10n()->t("Only expire posts by others:"), $expire_network_only, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
- ];
-
- $group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']);
-
- // Private/public post links for the non-JS ACL form
- $private_post = 1;
- if (!empty($_REQUEST['public']) && !$_REQUEST['public']) {
- $private_post = 0;
- }
-
- $query_str = DI::args()->getQueryString();
- if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
- }
-
- // I think $a->query_string may never have ? in it, but I could be wrong
- // It looks like it's from the index.php?q=[etc] rewrite that the web
- // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
- if (strpos($query_str, '?') === false) {
- $public_post_link = '?public=1';
- } else {
- $public_post_link = '&public=1';
- }
-
/* Installed langs */
$lang_choices = DI::l10n()->getAvailableLanguages();
'$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')],
'$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing')],
'$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
- '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
+ '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address')],
'$oid_enable' => (!DI::config()->get('system', 'no_openid')),
'$openid' => $openid_field,
'$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''],
'$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''],
'$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
-
- '$h_prv' => DI::l10n()->t('Security and Privacy Settings'),
-
- '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")],
- '$permissions' => DI::l10n()->t('Default Post Permissions'),
- '$permdesc' => DI::l10n()->t("\x28click to open/close\x29"),
- '$visibility' => $profile['net-publish'],
- '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user),
- '$suggestme' => $suggestme,
- '$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''),
- '$blocktags'=> $blocktags, // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''),
-
- // ACL permissions box
- '$group_perms' => DI::l10n()->t('Show to Groups'),
- '$contact_perms' => DI::l10n()->t('Show to Contacts'),
- '$private' => DI::l10n()->t('Default Private Post'),
- '$public' => DI::l10n()->t('Default Public Post'),
- '$is_private' => $private_post,
- '$return_path' => $query_str,
- '$public_link' => $public_post_link,
- '$settings_perms' => DI::l10n()->t('Default Permissions for New Posts'),
-
- '$group_select' => $group_select,
-
-
- '$expire' => $expire_arr,
-
- '$profile_in_dir' => $profile_in_dir,
- '$profile_in_net_dir' => $profile_in_net_dir,
- '$hide_friends' => $hide_friends,
- '$hide_wall' => $hide_wall,
- '$unkmail' => $unkmail,
- '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")],
-
+ '$h_prv' => DI::l10n()->t('Security and Privacy Settings'),
+ '$visibility' => $profile['net-publish'],
+ '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")],
+ '$profile_in_dir' => $profile_in_dir,
+ '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc],
+ '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')],
+ '$hide_wall' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')],
+ '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')],
+ '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")],
+ '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''),
+ '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')],
+ '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")],
+ '$group_select' => Group::displayGroupSelection(local_user(), $a->user['def_gid']),
+ '$permissions' => DI::l10n()->t('Default Post Permissions'),
+ '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user),
+
+ '$expire' => [
+ 'label' => DI::l10n()->t('Expiration settings'),
+ 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')],
+ 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')],
+ 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')],
+ 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')],
+ 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')],
+ 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')],
+ ],
'$h_not' => DI::l10n()->t('Notification Settings'),
'$lbl_not' => DI::l10n()->t('Send a notification email when:'),
'$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), Type::INTRO, ''],
- '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), NOTIFY_CONFIRM, ''],
- '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
- '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
- '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
- '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
- '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
- '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
+ '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), Type::CONFIRM, ''],
+ '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Type::WALL), Type::WALL, ''],
+ '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Type::COMMENT), Type::COMMENT, ''],
+ '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''],
+ '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''],
+ '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''],
+ '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''],
'$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],