use Friendica\App;
use Friendica\BaseModule;
-use Friendica\BaseObject;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Core\ACL;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
-use Friendica\Core\System;
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\Login;
+use Friendica\Module\Security\Login;
use Friendica\Protocol\Email;
-use Friendica\Util\ACLFormatter;
-use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
use Friendica\Worker\Delivery;
{
$theme = Strings::sanitizeFilePathItem($theme);
- $a = \get_app();
+ $a = DI::app();
$base_theme = $a->theme_info['extends'] ?? '';
if (file_exists("view/theme/$theme/config.php")) {
function settings_init(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
// These lines provide the javascript needed by the acl selector
$tpl = Renderer::getMarkupTemplate('settings/head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
- '$ispublic' => L10n::t('everybody')
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ '$ispublic' => DI::l10n()->t('everybody')
]);
$tabs = [
[
- 'label' => L10n::t('Account'),
+ 'label' => DI::l10n()->t('Account'),
'url' => 'settings',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o',
];
$tabs[] = [
- 'label' => L10n::t('Two-factor authentication'),
+ 'label' => DI::l10n()->t('Two-factor authentication'),
'url' => 'settings/2fa',
'selected' => (($a->argc > 1) && ($a->argv[1] === '2fa') ? 'active' : ''),
'accesskey' => 'o',
];
$tabs[] = [
- 'label' => L10n::t('Profiles'),
- 'url' => 'profiles',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''),
+ 'label' => DI::l10n()->t('Profile'),
+ 'url' => 'settings/profile',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'profile')?'active':''),
'accesskey' => 'p',
];
if (Feature::get()) {
$tabs[] = [
- 'label' => L10n::t('Additional features'),
+ 'label' => DI::l10n()->t('Additional features'),
'url' => 'settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
}
$tabs[] = [
- 'label' => L10n::t('Display'),
+ 'label' => DI::l10n()->t('Display'),
'url' => 'settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i',
];
$tabs[] = [
- 'label' => L10n::t('Social Networks'),
+ 'label' => DI::l10n()->t('Social Networks'),
'url' => 'settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w',
];
$tabs[] = [
- 'label' => L10n::t('Addons'),
+ 'label' => DI::l10n()->t('Addons'),
'url' => 'settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l',
];
$tabs[] = [
- 'label' => L10n::t('Delegations'),
+ 'label' => DI::l10n()->t('Delegations'),
'url' => 'settings/delegation',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation')?'active':''),
'accesskey' => 'd',
];
$tabs[] = [
- 'label' => L10n::t('Connected apps'),
+ 'label' => DI::l10n()->t('Connected apps'),
'url' => 'settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b',
];
$tabs[] = [
- 'label' => L10n::t('Export personal data'),
+ 'label' => DI::l10n()->t('Export personal data'),
'url' => 'settings/userexport',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport')?'active':''),
'accesskey' => 'e',
];
$tabs[] = [
- 'label' => L10n::t('Remove account'),
+ '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");
- $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
- '$title' => L10n::t('Settings'),
+ DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
+ '$title' => DI::l10n()->t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
]);
}
if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
$key = $_POST['remove'];
DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
- $a->internalRedirect('settings/oauth/', true);
+ DI::baseUrl()->redirect('settings/oauth/', true);
return;
}
$icon = $_POST['icon'] ?? '';
if ($name == "" || $key == "" || $secret == "") {
- notice(L10n::t("Missing some important data!"));
+ notice(DI::l10n()->t("Missing some important data!"));
} else {
- if ($_POST['submit'] == L10n::t("Update")) {
+ if ($_POST['submit'] == DI::l10n()->t("Update")) {
q("UPDATE clients SET
client_id='%s',
pw='%s',
);
}
}
- $a->internalRedirect('settings/oauth/', true);
+ DI::baseUrl()->redirect('settings/oauth/', true);
return;
}
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
if (!empty($_POST['general-submit'])) {
- PConfig::set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer']));
- PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
- PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
- PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
- PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
- PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
+ DI::pConfig()->set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer']));
+ DI::pConfig()->set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
+ DI::pConfig()->set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
+ DI::pConfig()->set(local_user(), 'system', 'attach_link_title', intval($_POST['attach_link_title']));
+ DI::pConfig()->set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+ DI::pConfig()->set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
+ DI::pConfig()->set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
} elseif (!empty($_POST['imap-submit'])) {
$mail_server = $_POST['mail_server'] ?? '';
$mail_port = $_POST['mail_port'] ?? '';
$mail_pubmail = $_POST['mail_pubmail'] ?? '';
if (
- !Config::get('system', 'dfrn_only')
+ !DI::config()->get('system', 'dfrn_only')
&& function_exists('imap_open')
- && !Config::get('system', 'imap_disabled')
+ && !DI::config()->get('system', 'imap_disabled')
) {
$failed = false;
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
unset($dcrpass);
if (!$mbox) {
$failed = true;
- notice(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.') . EOL);
}
}
}
if (!$failed) {
- info(L10n::t('Email settings updated.') . EOL);
+ info(DI::l10n()->t('Email settings updated.') . EOL);
}
}
}
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
foreach ($_POST as $k => $v) {
if (strpos($k, 'feature_') === 0) {
- PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
+ DI::pConfig()->set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info(L10n::t('Features updated') . EOL);
+ 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;
- $smart_threading = !empty($_POST['smart_threading']) ? intval($_POST['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;
+ $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) {
}
if ($mobile_theme !== '') {
- PConfig::set(local_user(), 'system', 'mobile_theme', $mobile_theme);
+ DI::pConfig()->set(local_user(), 'system', 'mobile_theme', $mobile_theme);
}
- PConfig::set(local_user(), 'system', 'nowarn_insecure' , $nowarn_insecure);
- PConfig::set(local_user(), 'system', 'update_interval' , $browser_update);
- PConfig::set(local_user(), 'system', 'itemspage_network' , $itemspage_network);
- PConfig::set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
- PConfig::set(local_user(), 'system', 'no_smilies' , $nosmile);
- PConfig::set(local_user(), 'system', 'first_day_of_week' , $first_day_of_week);
- PConfig::set(local_user(), 'system', 'ignore_info' , $noinfo);
- PConfig::set(local_user(), 'system', 'infinite_scroll' , $infinite_scroll);
- PConfig::set(local_user(), 'system', 'no_auto_update' , $no_auto_update);
- PConfig::set(local_user(), 'system', 'bandwidth_saver' , $bandwidth_saver);
- PConfig::set(local_user(), 'system', 'smart_threading' , $smart_threading);
+ 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']) {
DBA::update('user', ['theme' => $theme], ['uid' => local_user()]);
}
} else {
- notice(L10n::t('The theme you chose isn\'t available.'));
+ notice(DI::l10n()->t('The theme you chose isn\'t available.'));
}
Hook::callAll('display_settings_post', $_POST);
- $a->internalRedirect('settings/display');
+ DI::baseUrl()->redirect('settings/display');
return; // NOTREACHED
}
// was there an error
if ($_FILES['importcontact-filename']['error'] > 0) {
Logger::notice('Contact CSV file upload error');
- info(L10n::t('Contact CSV file upload error'));
+ info(DI::l10n()->t('Contact CSV file upload error'));
} else {
$csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));
// import contacts
// "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]);
}
}
- info(L10n::t('Importing Contacts done'));
+
+ info(DI::l10n()->t('Importing Contacts done'));
// delete temp file
- unlink($filename);
+ unlink($_FILES['importcontact-filename']['tmp_name']);
}
}
}
if (!empty($_POST['resend_relocate'])) {
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user());
- info(L10n::t("Relocate message has been send to your contacts"));
- $a->internalRedirect('settings');
+ info(DI::l10n()->t("Relocate message has been send to your contacts"));
+ DI::baseUrl()->redirect('settings');
}
Hook::callAll('settings_post', $_POST);
try {
if ($newpass != $confirm) {
- throw new Exception(L10n::t('Passwords do not match.'));
+ throw new Exception(DI::l10n()->t('Passwords do not match.'));
}
// check if the old password was supplied correctly before changing it to the new value
$result = User::updatePassword(local_user(), $newpass);
if (!DBA::isResult($result)) {
- throw new Exception(L10n::t('Password update failed. Please try again.'));
+ throw new Exception(DI::l10n()->t('Password update failed. Please try again.'));
}
- info(L10n::t('Password changed.'));
+ info(DI::l10n()->t('Password changed.'));
} catch (Exception $e) {
notice($e->getMessage());
- notice(L10n::t('Password unchanged.'));
+ notice(DI::l10n()->t('Password unchanged.'));
}
}
if ($username != $a->user['username']) {
if (strlen($username) > 40) {
- $err .= L10n::t(' Please use a shorter name.');
+ $err .= DI::l10n()->t(' Please use a shorter name.');
}
if (strlen($username) < 3) {
- $err .= 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 .= L10n::t('Wrong Password') . EOL;
+ $err .= DI::l10n()->t('Wrong Password') . EOL;
$email = $a->user['email'];
}
// check the email is valid
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
- $err .= L10n::t('Invalid email.');
+ $err .= DI::l10n()->t('Invalid email.');
}
// ensure new email is not the admin mail
- if (Config::get('config', 'admin_email')) {
- $adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email'))));
+ if (DI::config()->get('config', 'admin_email')) {
+ $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email'))));
if (in_array(strtolower($email), $adminlist)) {
- $err .= L10n::t('Cannot change to that email.');
+ $err .= DI::l10n()->t('Cannot change to that email.');
$email = $a->user['email'];
}
}
date_default_timezone_set($timezone);
}
- /** @var ACLFormatter $aclFormatter */
- $aclFormatter = BaseObject::getClass(ACLFormatter::class);
+ $aclFormatter = DI::aclFormatter();
$str_group_allow = !empty($_POST['group_allow']) ? $aclFormatter->toString($_POST['group_allow']) : '';
$str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : '';
$str_group_deny = !empty($_POST['group_deny']) ? $aclFormatter->toString($_POST['group_deny']) : '';
$str_contact_deny = !empty($_POST['contact_deny']) ? $aclFormatter->toString($_POST['contact_deny']) : '';
- PConfig::set(local_user(), 'expire', 'items', $expire_items);
- PConfig::set(local_user(), 'expire', 'notes', $expire_notes);
- PConfig::set(local_user(), 'expire', 'starred', $expire_starred);
- PConfig::set(local_user(), 'expire', 'photos', $expire_photos);
- PConfig::set(local_user(), 'expire', 'network_only', $expire_network_only);
+ DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items);
+ DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes);
+ DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred);
+ DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos);
+ DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only);
- PConfig::set(local_user(), 'system', 'suggestme', $suggestme);
+ DI::pConfig()->set(local_user(), 'system', 'suggestme', $suggestme);
- PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
- PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
+ DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
+ DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
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(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.'). EOL);
$str_group_allow = '<' . $def_gid . '>';
} else {
- notice(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.') . EOL);
}
}
}
$fields = ['username' => $username, 'email' => $email, 'timezone' => $timezone,
'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny,
- 'notify-flags' => $notify, 'page-flags' => $notify, 'account-type' => $account_type, 'default-location' => $defloc,
+ 'notify-flags' => $notify, 'page-flags' => $page_flags, 'account-type' => $account_type, 'default-location' => $defloc,
'allow_location' => $allow_location, 'maxreq' => $maxreq, 'expire' => $expire, 'def_gid' => $def_gid, 'blockwall' => $blockwall,
- 'hidewall' => $hide_wall, 'blocktags' => $blocktags, 'unkmail' => $unkmail, 'cntunkmail' => $cntunkmail, 'language' => $language];
+ 'hidewall' => $hidewall, 'blocktags' => $blocktags, 'unkmail' => $unkmail, 'cntunkmail' => $cntunkmail, 'language' => $language];
if ($delete_openid) {
$fields['openid'] = '';
}
if (DBA::update('user', $fields, ['uid' => local_user()])) {
- info(L10n::t('Settings updated.') . EOL);
+ info(DI::l10n()->t('Settings updated.') . EOL);
}
// clear session language
`name` = '%s',
`net-publish` = %d,
`hide-friends` = %d
- WHERE `is-default` = 1 AND `uid` = %d",
+ WHERE `uid` = %d",
intval($publish),
DBA::escape($username),
intval($net_publish),
if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(Config::get('system', 'directory'))) {
+ if ($url && strlen(DI::config()->get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url);
}
}
// Update the global contact for the user
GContact::updateForUser(local_user());
- $a->internalRedirect('settings');
+ DI::baseUrl()->redirect('settings');
return; // NOTREACHED
}
Nav::setSelected('settings');
if (!local_user()) {
- //notice(L10n::t('Permission denied.') . EOL);
+ //notice(DI::l10n()->t('Permission denied.') . EOL);
return Login::form();
}
if (!empty($_SESSION['submanage'])) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
$tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
- '$title' => L10n::t('Add application'),
- '$submit' => L10n::t('Save Settings'),
- '$cancel' => L10n::t('Cancel'),
- '$name' => ['name', L10n::t('Name'), '', ''],
- '$key' => ['key', L10n::t('Consumer Key'), '', ''],
- '$secret' => ['secret', L10n::t('Consumer Secret'), '', ''],
- '$redirect' => ['redirect', L10n::t('Redirect'), '', ''],
- '$icon' => ['icon', L10n::t('Icon url'), '', ''],
+ '$title' => DI::l10n()->t('Add application'),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$cancel' => DI::l10n()->t('Cancel'),
+ '$name' => ['name', DI::l10n()->t('Name'), '', ''],
+ '$key' => ['key', DI::l10n()->t('Consumer Key'), '', ''],
+ '$secret' => ['secret', DI::l10n()->t('Consumer Secret'), '', ''],
+ '$redirect' => ['redirect', DI::l10n()->t('Redirect'), '', ''],
+ '$icon' => ['icon', DI::l10n()->t('Icon url'), '', ''],
]);
return $o;
}
local_user());
if (!DBA::isResult($r)) {
- notice(L10n::t("You can't edit this application."));
+ notice(DI::l10n()->t("You can't edit this application."));
return;
}
$app = $r[0];
$tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
- '$title' => L10n::t('Add application'),
- '$submit' => L10n::t('Update'),
- '$cancel' => L10n::t('Cancel'),
- '$name' => ['name', L10n::t('Name'), $app['name'] , ''],
- '$key' => ['key', L10n::t('Consumer Key'), $app['client_id'], ''],
- '$secret' => ['secret', L10n::t('Consumer Secret'), $app['pw'], ''],
- '$redirect' => ['redirect', L10n::t('Redirect'), $app['redirect_uri'], ''],
- '$icon' => ['icon', L10n::t('Icon url'), $app['icon'], ''],
+ '$title' => DI::l10n()->t('Add application'),
+ '$submit' => DI::l10n()->t('Update'),
+ '$cancel' => DI::l10n()->t('Cancel'),
+ '$name' => ['name', DI::l10n()->t('Name'), $app['name'] , ''],
+ '$key' => ['key', DI::l10n()->t('Consumer Key'), $app['client_id'], ''],
+ '$secret' => ['secret', DI::l10n()->t('Consumer Secret'), $app['pw'], ''],
+ '$redirect' => ['redirect', DI::l10n()->t('Redirect'), $app['redirect_uri'], ''],
+ '$icon' => ['icon', DI::l10n()->t('Icon url'), $app['icon'], ''],
]);
return $o;
}
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
- $a->internalRedirect('settings/oauth/', true);
+ DI::baseUrl()->redirect('settings/oauth/', true);
return;
}
$tpl = Renderer::getMarkupTemplate('settings/oauth.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
- '$baseurl' => $a->getBaseURL(true),
- '$title' => L10n::t('Connected Apps'),
- '$add' => L10n::t('Add application'),
- '$edit' => L10n::t('Edit'),
- '$delete' => L10n::t('Delete'),
- '$consumerkey' => L10n::t('Client key starts with'),
- '$noname' => L10n::t('No name'),
- '$remove' => L10n::t('Remove authorization'),
+ '$baseurl' => DI::baseUrl()->get(true),
+ '$title' => DI::l10n()->t('Connected Apps'),
+ '$add' => DI::l10n()->t('Add application'),
+ '$edit' => DI::l10n()->t('Edit'),
+ '$delete' => DI::l10n()->t('Delete'),
+ '$consumerkey' => DI::l10n()->t('Client key starts with'),
+ '$noname' => DI::l10n()->t('No name'),
+ '$remove' => DI::l10n()->t('Remove authorization'),
'$apps' => $r,
]);
return $o;
$r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
if (!DBA::isResult($r)) {
- $settings_addons = L10n::t('No Addon settings configured');
+ $settings_addons = DI::l10n()->t('No Addon settings configured');
}
Hook::callAll('addon_settings', $settings_addons);
$tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
- '$title' => L10n::t('Addon Settings'),
+ '$title' => DI::l10n()->t('Addon Settings'),
'$settings_addons' => $settings_addons
]);
return $o;
$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],[L10n::t('Off'), L10n::t('On')]];
+ $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')]];
}
}
$tpl = Renderer::getMarkupTemplate('settings/features.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_features"),
- '$title' => L10n::t('Additional Features'),
+ '$title' => DI::l10n()->t('Additional Features'),
'$features' => $arr,
- '$submit' => L10n::t('Save Settings'),
+ '$submit' => DI::l10n()->t('Save Settings'),
]);
return $o;
}
if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
- $accept_only_sharer = intval(PConfig::get(local_user(), 'system', 'accept_only_sharer'));
- $disable_cw = intval(PConfig::get(local_user(), 'system', 'disable_cw'));
- $no_intelligent_shortening = intval(PConfig::get(local_user(), 'system', 'no_intelligent_shortening'));
- $ostatus_autofriend = intval(PConfig::get(local_user(), 'system', 'ostatus_autofriend'));
- $default_group = PConfig::get(local_user(), 'ostatus', 'default_group');
- $legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
+ $accept_only_sharer = intval(DI::pConfig()->get(local_user(), 'system', 'accept_only_sharer'));
+ $disable_cw = intval(DI::pConfig()->get(local_user(), 'system', 'disable_cw'));
+ $no_intelligent_shortening = intval(DI::pConfig()->get(local_user(), 'system', 'no_intelligent_shortening'));
+ $attach_link_title = intval(DI::pConfig()->get(local_user(), 'system', 'attach_link_title'));
+ $ostatus_autofriend = intval(DI::pConfig()->get(local_user(), 'system', 'ostatus_autofriend'));
+ $default_group = DI::pConfig()->get(local_user(), 'ostatus', 'default_group');
+ $legacy_contact = DI::pConfig()->get(local_user(), 'ostatus', 'legacy_contact');
if (!empty($legacy_contact)) {
/// @todo Isn't it supposed to be a $a->internalRedirect() call?
- $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
+ DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
}
$settings_connectors = '';
Hook::callAll('connector_settings', $settings_connectors);
if (is_site_admin()) {
- $diasp_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? L10n::t('enabled') : L10n::t('disabled')));
- $ostat_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t("GNU Social \x28OStatus\x29"), ((Config::get('system', 'ostatus_disabled')) ? L10n::t('disabled') : 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 = "";
}
- $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
- if (Config::get('system', 'dfrn_only')) {
+ $mail_disabled = ((function_exists('imap_open') && (!DI::config()->get('system', 'imap_disabled'))) ? 0 : 1);
+ if (DI::config()->get('system', 'dfrn_only')) {
$mail_disabled = 1;
}
if (!$mail_disabled) {
$tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
- $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
+ $mail_disabled_message = ($mail_disabled ? DI::l10n()->t('Email access is disabled on this site.') : '');
+
+ $ssl_options = ['TLS' => 'TLS', 'SSL' => 'SSL'];
+
+ if (DI::config()->get('system', 'insecure_imap')) {
+ $ssl_options['notls'] = DI::l10n()->t('None');
+ }
$o .= Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
- '$title' => L10n::t('Social Networks'),
+ '$title' => DI::l10n()->t('Social Networks'),
'$diasp_enabled' => $diasp_enabled,
'$ostat_enabled' => $ostat_enabled,
- '$general_settings' => L10n::t('General Social Media Settings'),
- '$accept_only_sharer' => ['accept_only_sharer', L10n::t('Accept only top level posts by contacts you follow'), $accept_only_sharer, L10n::t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')],
- '$disable_cw' => ['disable_cw', L10n::t('Disable Content Warning'), $disable_cw, L10n::t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')],
- '$no_intelligent_shortening' => ['no_intelligent_shortening', L10n::t('Disable intelligent shortening'), $no_intelligent_shortening, L10n::t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
- '$ostatus_autofriend' => ['snautofollow', L10n::t("Automatically follow any GNU Social \x28OStatus\x29 followers/mentioners"), $ostatus_autofriend, L10n::t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
- '$default_group' => Group::displayGroupSelection(local_user(), $default_group, L10n::t("Default group for OStatus contacts")),
- '$legacy_contact' => ['legacy_contact', L10n::t('Your legacy GNU Social account'), $legacy_contact, L10n::t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")],
+ '$general_settings' => DI::l10n()->t('General Social Media Settings'),
+ '$accept_only_sharer' => ['accept_only_sharer', DI::l10n()->t('Accept only top level posts by contacts you follow'), $accept_only_sharer, DI::l10n()->t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')],
+ '$disable_cw' => ['disable_cw', DI::l10n()->t('Disable Content Warning'), $disable_cw, DI::l10n()->t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')],
+ '$no_intelligent_shortening' => ['no_intelligent_shortening', DI::l10n()->t('Disable intelligent shortening'), $no_intelligent_shortening, DI::l10n()->t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
+ '$attach_link_title' => ['attach_link_title', DI::l10n()->t('Attach the link title'), $attach_link_title, DI::l10n()->t('When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.')],
+ '$ostatus_autofriend' => ['snautofollow', DI::l10n()->t("Automatically follow any GNU Social \x28OStatus\x29 followers/mentioners"), $ostatus_autofriend, DI::l10n()->t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
+ '$default_group' => Group::displayGroupSelection(local_user(), $default_group, DI::l10n()->t("Default group for OStatus contacts")),
+ '$legacy_contact' => ['legacy_contact', DI::l10n()->t('Your legacy GNU Social account'), $legacy_contact, DI::l10n()->t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")],
- '$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus',
- '$repair_ostatus_text' => L10n::t('Repair OStatus subscriptions'),
+ '$repair_ostatus_url' => DI::baseUrl() . '/repair_ostatus',
+ '$repair_ostatus_text' => DI::l10n()->t('Repair OStatus subscriptions'),
'$settings_connectors' => $settings_connectors,
- '$h_imap' => L10n::t('Email/Mailbox Setup'),
- '$imap_desc' => L10n::t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
- '$imap_lastcheck' => ['imap_lastcheck', L10n::t('Last successful email check:'), $mail_chk, ''],
+ '$h_imap' => DI::l10n()->t('Email/Mailbox Setup'),
+ '$imap_desc' => DI::l10n()->t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+ '$imap_lastcheck' => ['imap_lastcheck', DI::l10n()->t('Last successful email check:'), $mail_chk, ''],
'$mail_disabled' => $mail_disabled_message,
- '$mail_server' => ['mail_server', L10n::t('IMAP server name:'), $mail_server, ''],
- '$mail_port' => ['mail_port', L10n::t('IMAP port:'), $mail_port, ''],
- '$mail_ssl' => ['mail_ssl', L10n::t('Security:'), strtoupper($mail_ssl), '', ['notls'=>L10n::t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
- '$mail_user' => ['mail_user', L10n::t('Email login name:'), $mail_user, ''],
- '$mail_pass' => ['mail_pass', L10n::t('Email password:'), '', ''],
- '$mail_replyto' => ['mail_replyto', L10n::t('Reply-to address:'), $mail_replyto, 'Optional'],
- '$mail_pubmail' => ['mail_pubmail', L10n::t('Send public posts to all email contacts:'), $mail_pubmail, ''],
- '$mail_action' => ['mail_action', L10n::t('Action after import:'), $mail_action, '', [0=>L10n::t('None'), /*1=>L10n::t('Delete'),*/ 2=>L10n::t('Mark as seen'), 3=>L10n::t('Move to folder')]],
- '$mail_movetofolder' => ['mail_movetofolder', L10n::t('Move to folder:'), $mail_movetofolder, ''],
- '$submit' => L10n::t('Save Settings'),
+ '$mail_server' => ['mail_server', DI::l10n()->t('IMAP server name:'), $mail_server, ''],
+ '$mail_port' => ['mail_port', DI::l10n()->t('IMAP port:'), $mail_port, ''],
+ '$mail_ssl' => ['mail_ssl', DI::l10n()->t('Security:'), strtoupper($mail_ssl), '', $ssl_options],
+ '$mail_user' => ['mail_user', DI::l10n()->t('Email login name:'), $mail_user, ''],
+ '$mail_pass' => ['mail_pass', DI::l10n()->t('Email password:'), '', ''],
+ '$mail_replyto' => ['mail_replyto', DI::l10n()->t('Reply-to address:'), $mail_replyto, 'Optional'],
+ '$mail_pubmail' => ['mail_pubmail', DI::l10n()->t('Send public posts to all email contacts:'), $mail_pubmail, ''],
+ '$mail_action' => ['mail_action', DI::l10n()->t('Action after import:'), $mail_action, '', [0 => DI::l10n()->t('None'), 1 => DI::l10n()->t('Delete'), 2 => DI::l10n()->t('Mark as seen'), 3 => DI::l10n()->t('Move to folder')]],
+ '$mail_movetofolder' => ['mail_movetofolder', DI::l10n()->t('Move to folder:'), $mail_movetofolder, ''],
+ '$submit' => DI::l10n()->t('Save Settings'),
]);
Hook::callAll('display_settings', $o);
* DISPLAY SETTINGS
*/
if (($a->argc > 1) && ($a->argv[1] === 'display')) {
- $default_theme = Config::get('system', 'theme');
+ $default_theme = DI::config()->get('system', 'theme');
if (!$default_theme) {
$default_theme = 'default';
}
- $default_mobile_theme = Config::get('system', 'mobile-theme');
+ $default_mobile_theme = DI::config()->get('system', 'mobile-theme');
if (!$default_mobile_theme) {
$default_mobile_theme = 'none';
}
$allowed_themes = Theme::getAllowedList();
$themes = [];
- $mobile_themes = ["---" => L10n::t('No special theme for mobile devices')];
+ $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 && (Config::get('experimentals', 'exp_themes')==1 || is_null(Config::get('experimentals', 'exp_themes'))))) {
+ 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 = L10n::t('%s - (Unsupported)', $theme_name);
+ $theme_name = DI::l10n()->t('%s - (Unsupported)', $theme_name);
} elseif ($is_experimental) {
- $theme_name = L10n::t('%s - (Experimental)', $theme_name);
+ $theme_name = DI::l10n()->t('%s - (Experimental)', $theme_name);
}
if ($is_mobile) {
$theme_selected = $a->user['theme'] ?: $default_theme;
$mobile_theme_selected = Session::get('mobile-theme', $default_mobile_theme);
- $nowarn_insecure = intval(PConfig::get(local_user(), 'system', 'nowarn_insecure'));
+ $nowarn_insecure = intval(DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure'));
- $browser_update = intval(PConfig::get(local_user(), 'system', 'update_interval'));
+ $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(PConfig::get(local_user(), 'system', 'itemspage_network'));
+ $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(PConfig::get(local_user(), 'system', 'itemspage_mobile_network'));
+ $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 = PConfig::get(local_user(), 'system', 'no_smilies', 0);
- $first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
- $weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")];
+ $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 = PConfig::get(local_user(), 'system', 'ignore_info', 0);
- $infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0);
- $no_auto_update = PConfig::get(local_user(), 'system', 'no_auto_update', 0);
- $bandwidth_saver = PConfig::get(local_user(), 'system', 'bandwidth_saver', 0);
- $smart_threading = PConfig::get(local_user(), 'system', 'smart_threading', 0);
+ $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) {
$tpl = Renderer::getMarkupTemplate('settings/display.tpl');
$o = Renderer::replaceMacros($tpl, [
- '$ptitle' => L10n::t('Display Settings'),
+ '$ptitle' => DI::l10n()->t('Display Settings'),
'$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
- '$submit' => L10n::t('Save Settings'),
- '$baseurl' => System::baseUrl(true),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$baseurl' => DI::baseUrl()->get(true),
'$uid' => local_user(),
- '$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes, true],
- '$mobile_theme' => ['mobile_theme', L10n::t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
- '$nowarn_insecure' => ['nowarn_insecure', L10n::t('Suppress warning of insecure networks'), $nowarn_insecure, 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', L10n::t("Update browser every xx seconds"), $browser_update, L10n::t('Minimum of 10 seconds. Enter -1 to disable it.')],
- '$itemspage_network' => ['itemspage_network', L10n::t("Number of items to display per page:"), $itemspage_network, L10n::t('Maximum of 100 items')],
- '$itemspage_mobile_network' => ['itemspage_mobile_network', L10n::t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, L10n::t('Maximum of 100 items')],
- '$nosmile' => ['nosmile', L10n::t("Don't show emoticons"), $nosmile, ''],
- '$calendar_title' => L10n::t('Calendar'),
- '$first_day_of_week' => ['first_day_of_week', L10n::t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
- '$noinfo' => ['noinfo', L10n::t("Don't show notices"), $noinfo, ''],
- '$infinite_scroll' => ['infinite_scroll', L10n::t("Infinite scroll"), $infinite_scroll, ''],
- '$no_auto_update' => ['no_auto_update', L10n::t("Automatic updates only at the top of the network page"), $no_auto_update, L10n::t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
- '$bandwidth_saver' => ['bandwidth_saver', L10n::t('Bandwidth Saver Mode'), $bandwidth_saver, L10n::t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
- '$smart_threading' => ['smart_threading', L10n::t('Smart Threading'), $smart_threading, L10n::t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')],
-
- '$d_tset' => L10n::t('General Theme Settings'),
- '$d_ctset' => L10n::t('Custom Theme Settings'),
- '$d_cset' => L10n::t('Content Settings'),
- 'stitle' => L10n::t('Theme settings'),
+ '$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,
]);
* ACCOUNT SETTINGS
*/
- $profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
+ $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]);
if (!DBA::isResult($profile)) {
- notice(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.') . EOL);
return;
}
$unkmail = $a->user['unkmail'];
$cntunkmail = $a->user['cntunkmail'];
- $expire_items = PConfig::get(local_user(), 'expire', 'items', true);
- $expire_notes = PConfig::get(local_user(), 'expire', 'notes', true);
- $expire_starred = PConfig::get(local_user(), 'expire', 'starred', true);
- $expire_photos = PConfig::get(local_user(), 'expire', 'photos', false);
- $expire_network_only = PConfig::get(local_user(), 'expire', 'network_only', false);
- $suggestme = PConfig::get(local_user(), 'system', 'suggestme', false);
+ $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true);
+ $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true);
+ $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
$pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
$pagetype = Renderer::replaceMacros($pageset_tpl, [
- '$account_types' => L10n::t("Account Types"),
- '$user' => L10n::t("Personal Page Subtypes"),
- '$community' => L10n::t("Community Forum Subtypes"),
+ '$account_types' => DI::l10n()->t("Account Types"),
+ '$user' => DI::l10n()->t("Personal Page Subtypes"),
+ '$community' => DI::l10n()->t("Community Forum Subtypes"),
'$account_type' => $a->user['account-type'],
'$type_person' => User::ACCOUNT_TYPE_PERSON,
'$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION,
'$type_news' => User::ACCOUNT_TYPE_NEWS,
'$type_community' => User::ACCOUNT_TYPE_COMMUNITY,
- '$account_person' => ['account-type', L10n::t('Personal Page'), User::ACCOUNT_TYPE_PERSON,
- L10n::t('Account for a personal profile.'),
+ '$account_person' => ['account-type', DI::l10n()->t('Personal Page'), User::ACCOUNT_TYPE_PERSON,
+ DI::l10n()->t('Account for a personal profile.'),
($a->user['account-type'] == User::ACCOUNT_TYPE_PERSON)],
- '$account_organisation' => ['account-type', L10n::t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION,
- L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
+ '$account_organisation' => ['account-type', DI::l10n()->t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION,
+ DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)],
- '$account_news' => ['account-type', L10n::t('News Page'), User::ACCOUNT_TYPE_NEWS,
- L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
+ '$account_news' => ['account-type', DI::l10n()->t('News Page'), User::ACCOUNT_TYPE_NEWS,
+ DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == User::ACCOUNT_TYPE_NEWS)],
- '$account_community' => ['account-type', L10n::t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY,
- L10n::t('Account for community discussions.'),
+ '$account_community' => ['account-type', DI::l10n()->t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY,
+ DI::l10n()->t('Account for community discussions.'),
($a->user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)],
- '$page_normal' => ['page-flags', L10n::t('Normal Account Page'), User::PAGE_FLAGS_NORMAL,
- L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
+ '$page_normal' => ['page-flags', DI::l10n()->t('Normal Account Page'), User::PAGE_FLAGS_NORMAL,
+ DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
($a->user['page-flags'] == User::PAGE_FLAGS_NORMAL)],
- '$page_soapbox' => ['page-flags', L10n::t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX,
- L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
+ '$page_soapbox' => ['page-flags', DI::l10n()->t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX,
+ DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'),
($a->user['page-flags'] == User::PAGE_FLAGS_SOAPBOX)],
- '$page_community' => ['page-flags', L10n::t('Public Forum'), User::PAGE_FLAGS_COMMUNITY,
- L10n::t('Automatically approves all contact requests.'),
+ '$page_community' => ['page-flags', DI::l10n()->t('Public Forum'), User::PAGE_FLAGS_COMMUNITY,
+ DI::l10n()->t('Automatically approves all contact requests.'),
($a->user['page-flags'] == User::PAGE_FLAGS_COMMUNITY)],
- '$page_freelove' => ['page-flags', L10n::t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE,
- L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
+ '$page_freelove' => ['page-flags', DI::l10n()->t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE,
+ DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'),
($a->user['page-flags'] == User::PAGE_FLAGS_FREELOVE)],
- '$page_prvgroup' => ['page-flags', L10n::t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP,
- L10n::t('Requires manual approval of contact requests.'),
+ '$page_prvgroup' => ['page-flags', DI::l10n()->t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP,
+ DI::l10n()->t('Requires manual approval of contact requests.'),
($a->user['page-flags'] == User::PAGE_FLAGS_PRVGROUP)],
]);
- $noid = Config::get('system', 'no_openid');
+ $noid = DI::config()->get('system', 'no_openid');
if ($noid) {
$openid_field = false;
} else {
- $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"];
+ $openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"];
}
- $opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl");
- if (Config::get('system', 'publish_all')) {
+ $opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl");
+ if (DI::config()->get('system', 'publish_all')) {
$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
} else {
$profile_in_dir = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], 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.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
+ '$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')]
]);
}
- if (strlen(Config::get('system', 'directory'))) {
+ if (strlen(DI::config()->get('system', 'directory'))) {
$profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], 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.', Config::get('system', 'directory'), Config::get('system', 'directory')) . " " . 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."), [L10n::t('No'), L10n::t('Yes')]]
+ '$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.")]
]);
} else {
$profile_in_net_dir = '';
}
$hide_friends = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], 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'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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')],
]);
$hide_wall = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['hidewall', L10n::t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], 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.'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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.')],
]);
$blockwall = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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')],
]);
$blocktags = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('Your contacts can add additional tags to your posts.'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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.')],
]);
$suggestme = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica may suggest new members to add you as a contact.'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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.')],
]);
$unkmail = Renderer::replaceMacros($opt_tpl, [
- '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('Friendica network users may send you private messages even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]],
+ '$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.')],
]);
if (!$profile['publish'] && !$profile['net-publish']) {
- info(L10n::t('Profile is <strong>not published</strong>.') . EOL);
+ info(DI::l10n()->t('Profile is <strong>not published</strong>.') . EOL);
}
$tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl');
$prof_addr = Renderer::replaceMacros($tpl_addr,[
- '$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->getHostName() . $a->getURLPath(), System::baseUrl() . '/profile/' . $nickname),
- '$basepath' => $a->getHostName()
+ '$desc' => DI::l10n()->t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname),
+ '$basepath' => DI::baseUrl()->getHostname()
]);
$stpl = Renderer::getMarkupTemplate('settings/settings.tpl');
$expire_arr = [
- 'days' => ['expire', L10n::t("Automatically expire posts after this many days:"), $expire, L10n::t('If empty, posts will not expire. Expired posts will be deleted')],
- 'advanced' => L10n::t('Advanced expiration settings'),
- 'label' => L10n::t('Advanced Expiration'),
- 'items' => ['expire_items', L10n::t("Expire posts:"), $expire_items, '', [L10n::t('No'), L10n::t('Yes')]],
- 'notes' => ['expire_notes', L10n::t("Expire personal notes:"), $expire_notes, '', [L10n::t('No'), L10n::t('Yes')]],
- 'starred' => ['expire_starred', L10n::t("Expire starred posts:"), $expire_starred, '', [L10n::t('No'), L10n::t('Yes')]],
- 'photos' => ['expire_photos', L10n::t("Expire photos:"), $expire_photos, '', [L10n::t('No'), L10n::t('Yes')]],
- 'network_only' => ['expire_network_only', L10n::t("Only expire posts by others:"), $expire_network_only, '', [L10n::t('No'), L10n::t('Yes')]],
+ '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],
+ 'notes' => ['expire_notes', DI::l10n()->t("Expire personal notes:"), $expire_notes],
+ 'starred' => ['expire_starred', DI::l10n()->t("Expire starred posts:"), $expire_starred],
+ 'photos' => ['expire_photos', DI::l10n()->t("Expire photos:"), $expire_photos],
+ 'network_only' => ['expire_network_only', DI::l10n()->t("Only expire posts by others:"), $expire_network_only],
];
$group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']);
$private_post = 0;
}
- $query_str = $a->query_string;
+ $query_str = DI::args()->getQueryString();
if (strpos($query_str, 'public=1') !== false) {
$query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
}
}
/* Installed langs */
- $lang_choices = L10n::getAvailableLanguages();
+ $lang_choices = DI::l10n()->getAvailableLanguages();
/// @TODO Fix indending (or so)
$o .= Renderer::replaceMacros($stpl, [
- '$ptitle' => L10n::t('Account Settings'),
+ '$ptitle' => DI::l10n()->t('Account Settings'),
- '$submit' => L10n::t('Save Settings'),
- '$baseurl' => System::baseUrl(true),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$baseurl' => DI::baseUrl()->get(true),
'$uid' => local_user(),
'$form_security_token' => BaseModule::getFormSecurityToken("settings"),
'$nickname_block' => $prof_addr,
- '$h_pass' => L10n::t('Password Settings'),
- '$password1'=> ['password', L10n::t('New Password:'), '', L10n::t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')],
- '$password2'=> ['confirm', L10n::t('Confirm:'), '', L10n::t('Leave password fields blank unless changing')],
- '$password3'=> ['opassword', L10n::t('Current Password:'), '', L10n::t('Your current password to confirm the changes')],
- '$password4'=> ['mpassword', L10n::t('Password:'), '', L10n::t('Your current password to confirm the changes')],
- '$oid_enable' => (!Config::get('system', 'no_openid')),
+ '$h_pass' => DI::l10n()->t('Password Settings'),
+ '$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')],
+ '$oid_enable' => (!DI::config()->get('system', 'no_openid')),
'$openid' => $openid_field,
- '$delete_openid' => ['delete_openid', L10n::t('Delete OpenID URL'), false, ''],
+ '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''],
- '$h_basic' => L10n::t('Basic Settings'),
- '$username' => ['username', L10n::t('Full Name:'), $username, ''],
- '$email' => ['email', L10n::t('Email Address:'), $email, '', '', '', 'email'],
- '$timezone' => ['timezone_select' , L10n::t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''],
- '$language' => ['language', L10n::t('Your Language:'), $language, L10n::t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
- '$defloc' => ['defloc', L10n::t('Default Post Location:'), $defloc, ''],
- '$allowloc' => ['allow_location', L10n::t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
+ '$h_basic' => DI::l10n()->t('Basic Settings'),
+ '$username' => ['username', DI::l10n()->t('Full Name:'), $username, ''],
+ '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', '', 'email'],
+ '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''],
+ '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
+ '$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' => L10n::t('Security and Privacy Settings'),
+ '$h_prv' => DI::l10n()->t('Security and Privacy Settings'),
- '$maxreq' => ['maxreq', L10n::t('Maximum Friend Requests/Day:'), $maxreq , L10n::t("\x28to prevent spam abuse\x29")],
- '$permissions' => L10n::t('Default Post Permissions'),
- '$permdesc' => L10n::t("\x28click to open/close\x29"),
+ '$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($a->user),
+ '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user),
'$suggestme' => $suggestme,
- '$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
- '$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$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' => L10n::t('Show to Groups'),
- '$contact_perms' => L10n::t('Show to Contacts'),
- '$private' => L10n::t('Default Private Post'),
- '$public' => L10n::t('Default Public Post'),
+ '$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' => L10n::t('Default Permissions for New Posts'),
+ '$settings_perms' => DI::l10n()->t('Default Permissions for New Posts'),
'$group_select' => $group_select,
'$hide_friends' => $hide_friends,
'$hide_wall' => $hide_wall,
'$unkmail' => $unkmail,
- '$cntunkmail' => ['cntunkmail', L10n::t('Maximum private messages per day from unknown people:'), $cntunkmail , L10n::t("\x28to prevent spam abuse\x29")],
+ '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")],
- '$h_not' => L10n::t('Notification Settings'),
- '$lbl_not' => L10n::t('Send a notification email when:'),
- '$notify1' => ['notify1', L10n::t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
- '$notify2' => ['notify2', L10n::t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
- '$notify3' => ['notify3', L10n::t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
- '$notify4' => ['notify4', L10n::t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
- '$notify5' => ['notify5', L10n::t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
- '$notify6' => ['notify6', L10n::t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
- '$notify7' => ['notify7', L10n::t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
- '$notify8' => ['notify8', L10n::t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
+ '$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), 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', L10n::t('Activate desktop notifications') , false, L10n::t('Show desktop popup on new notifications')],
+ '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],
- '$email_textonly' => ['email_textonly', L10n::t('Text-only notification emails'),
- PConfig::get(local_user(), 'system', 'email_textonly'),
- L10n::t('Send text only notification emails, without the html part')],
+ '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'),
+ DI::pConfig()->get(local_user(), 'system', 'email_textonly'),
+ DI::l10n()->t('Send text only notification emails, without the html part')],
- '$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
- PConfig::get(local_user(), 'system', 'detailed_notif'),
- L10n::t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
+ '$detailed_notif' => ['detailed_notif', DI::l10n()->t('Show detailled notifications'),
+ DI::pConfig()->get(local_user(), 'system', 'detailed_notif'),
+ DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
- '$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
- '$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'),
+ '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'),
+ '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
- '$importcontact' => L10n::t('Import Contacts'),
- '$importcontact_text' => L10n::t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'),
- '$importcontact_button' => L10n::t('Upload File'),
- '$relocate' => L10n::t('Relocate'),
- '$relocate_text' => L10n::t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
- '$relocate_button' => L10n::t("Resend relocate message to contacts"),
+ '$importcontact' => DI::l10n()->t('Import Contacts'),
+ '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'),
+ '$importcontact_button' => DI::l10n()->t('Upload File'),
+ '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720),
+ '$relocate' => DI::l10n()->t('Relocate'),
+ '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
+ '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"),
]);
projects / friendica.git / blobdiff