X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsettings.php;h=84bc230e30ec23c0c943d4d3af8e27ff1d727845;hb=aa2ab3d0e7262fcc9c8c78e4ed943429081af6b0;hp=7628f77825effa074f9502372258cb6e8e698fae;hpb=ec6f5193e20ad0e37daf2b855d59fdf03ae4111d;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 7628f77825..84bc230e30 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -2,126 +2,141 @@
/**
* @file mod/settings.php
*/
+
use Friendica\App;
-use Friendica\Core\System;
-use Friendica\Core\Worker;
+use Friendica\Content\Feature;
+use Friendica\Content\Nav;
+use Friendica\Core\ACL;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
+use Friendica\Core\System;
+use Friendica\Core\Theme;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
use Friendica\Model\User;
+use Friendica\Protocol\Email;
+use Friendica\Util\Network;
+use Friendica\Util\Temporal;
-require_once 'include/group.php';
-
-function get_theme_config_file($theme) {
+function get_theme_config_file($theme)
+{
$a = get_app();
- $base_theme = $a->theme_info['extends'];
+ $base_theme = defaults($a->theme_info, 'extends');
if (file_exists("view/theme/$theme/config.php")) {
return "view/theme/$theme/config.php";
}
- if (file_exists("view/theme/$base_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) {
-
+function settings_init(App $a)
+{
if (!local_user()) {
- notice(t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
// These lines provide the javascript needed by the acl selector
- $tpl = get_markup_template("settings-head.tpl");
- $a->page['htmlhead'] .= replace_macros($tpl,array(
- '$ispublic' => t('everybody')
- ));
-
-
+ $tpl = get_markup_template('settings/head.tpl');
+ $a->page['htmlhead'] .= replace_macros($tpl, [
+ '$ispublic' => L10n::t('everybody')
+ ]);
- $tabs = array(
- array(
- 'label' => t('Account'),
+ $tabs = [
+ [
+ 'label' => L10n::t('Account'),
'url' => 'settings',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o',
- ),
- );
-
- if (get_features()) {
- $tabs[] = array(
- 'label' => t('Additional features'),
+ ],
+ ];
+
+ $tabs[] = [
+ 'label' => L10n::t('Profiles'),
+ 'url' => 'profiles',
+ 'selected' => (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''),
+ 'accesskey' => 'p',
+ ];
+
+ if (Feature::get()) {
+ $tabs[] = [
+ 'label' => L10n::t('Additional features'),
'url' => 'settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
- );
+ ];
}
- $tabs[] = array(
- 'label' => t('Display'),
+ $tabs[] = [
+ 'label' => L10n::t('Display'),
'url' => 'settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Social Networks'),
+ $tabs[] = [
+ 'label' => L10n::t('Social Networks'),
'url' => 'settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Plugins'),
+ $tabs[] = [
+ 'label' => L10n::t('Addons'),
'url' => 'settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Delegations'),
+ $tabs[] = [
+ 'label' => L10n::t('Delegations'),
'url' => 'delegate',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
'accesskey' => 'd',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Connected apps'),
+ $tabs[] = [
+ 'label' => L10n::t('Connected apps'),
'url' => 'settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Export personal data'),
+ $tabs[] = [
+ 'label' => L10n::t('Export personal data'),
'url' => 'uexport',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
'accesskey' => 'e',
- );
+ ];
- $tabs[] = array(
- 'label' => t('Remove account'),
+ $tabs[] = [
+ 'label' => L10n::t('Remove account'),
'url' => 'removeme',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
'accesskey' => 'r',
- );
+ ];
$tabtpl = get_markup_template("generic_links_widget.tpl");
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$title' => t('Settings'),
+ $a->page['aside'] = replace_macros($tabtpl, [
+ '$title' => L10n::t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
- ));
+ ]);
}
-
-function settings_post(App $a) {
-
+function settings_post(App $a)
+{
if (!local_user()) {
return;
}
@@ -131,7 +146,7 @@ function settings_post(App $a) {
}
if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
- notice(t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -141,28 +156,25 @@ function settings_post(App $a) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove'];
- q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
- dbesc($key),
- local_user());
+ DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
-
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
- $name = ((x($_POST, 'name')) ? $_POST['name'] : '');
- $key = ((x($_POST, 'key')) ? $_POST['key'] : '');
- $secret = ((x($_POST, 'secret')) ? $_POST['secret'] : '');
- $redirect = ((x($_POST, 'redirect')) ? $_POST['redirect'] : '');
- $icon = ((x($_POST, 'icon')) ? $_POST['icon'] : '');
- if ($name=="" || $key=="" || $secret=="") {
- notice(t("Missing some important data!"));
+ $name = defaults($_POST, 'name' , '');
+ $key = defaults($_POST, 'key' , '');
+ $secret = defaults($_POST, 'secret' , '');
+ $redirect = defaults($_POST, 'redirect', '');
+ $icon = defaults($_POST, 'icon' , '');
+ if ($name == "" || $key == "" || $secret == "") {
+ notice(L10n::t("Missing some important data!"));
} else {
- if ($_POST['submit']==t("Update")) {
- $r = q("UPDATE clients SET
+ if ($_POST['submit'] == L10n::t("Update")) {
+ q("UPDATE clients SET
client_id='%s',
pw='%s',
name='%s',
@@ -170,23 +182,25 @@ function settings_post(App $a) {
icon='%s',
uid=%d
WHERE client_id='%s'",
- dbesc($key),
- dbesc($secret),
- dbesc($name),
- dbesc($redirect),
- dbesc($icon),
- local_user(),
- dbesc($key));
+ DBA::escape($key),
+ DBA::escape($secret),
+ DBA::escape($name),
+ DBA::escape($redirect),
+ DBA::escape($icon),
+ local_user(),
+ DBA::escape($key)
+ );
} else {
- $r = q("INSERT INTO clients
+ q("INSERT INTO clients
(client_id, pw, name, redirect_uri, icon, uid)
VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
- dbesc($key),
- dbesc($secret),
- dbesc($name),
- dbesc($redirect),
- dbesc($icon),
- local_user());
+ DBA::escape($key),
+ DBA::escape($secret),
+ DBA::escape($name),
+ DBA::escape($redirect),
+ DBA::escape($icon),
+ local_user()
+ );
}
}
goaway(System::baseUrl(true)."/settings/oauth/");
@@ -196,15 +210,15 @@ function settings_post(App $a) {
if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
- call_hooks('plugin_settings_post', $_POST);
+ Addon::callHooks('addon_settings_post', $_POST);
return;
}
if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
if (x($_POST, 'general-submit')) {
+ 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']);
@@ -232,24 +246,24 @@ function settings_post(App $a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
- if (!DBM::is_result($r)) {
- dba::insert('mailacct', array('uid' => local_user()));
+ if (!DBA::isResult($r)) {
+ DBA::insert('mailacct', ['uid' => local_user()]);
}
if (strlen($mail_pass)) {
$pass = '';
openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
- dba::update('mailacct', array('pass' => bin2hex($pass)), array('uid' => local_user()));
+ DBA::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
}
$r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
`action` = %d, `movetofolder` = '%s',
`mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d",
- dbesc($mail_server),
+ DBA::escape($mail_server),
intval($mail_port),
- dbesc($mail_ssl),
- dbesc($mail_user),
+ DBA::escape($mail_ssl),
+ DBA::escape($mail_user),
intval($mail_action),
- dbesc($mail_movetofolder),
- dbesc($mail_replyto),
+ DBA::escape($mail_movetofolder),
+ DBA::escape($mail_replyto),
intval($mail_pubmail),
intval(local_user())
);
@@ -257,28 +271,28 @@ function settings_post(App $a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$eacct = $r[0];
- require_once('include/email.php');
- $mb = construct_mailbox_name($eacct);
+ $mb = Email::constructMailboxName($eacct);
+
if (strlen($eacct['server'])) {
$dcrpass = '';
openssl_private_decrypt(hex2bin($eacct['pass']), $dcrpass, $a->user['prvkey']);
- $mbox = email_connect($mb, $mail_user, $dcrpass);
+ $mbox = Email::connect($mb, $mail_user, $dcrpass);
unset($dcrpass);
if (!$mbox) {
$failed = true;
- notice(t('Failed to connect with email account using the settings provided.') . EOL);
+ notice(L10n::t('Failed to connect with email account using the settings provided.') . EOL);
}
}
}
if (!$failed) {
- info(t('Email settings updated.') . EOL);
+ info(L10n::t('Email settings updated.') . EOL);
}
}
}
- call_hooks('connector_settings_post', $_POST);
+ Addon::callHooks('connector_settings_post', $_POST);
return;
}
@@ -289,7 +303,7 @@ function settings_post(App $a) {
PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info(t('Features updated') . EOL);
+ info(L10n::t('Features updated') . EOL);
return;
}
@@ -341,19 +355,19 @@ function settings_post(App $a) {
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);
+ if (($themeconfigfile = get_theme_config_file($theme)) !== null) {
+ require_once $themeconfigfile;
theme_post($a);
}
}
-
+ Theme::install($theme);
$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
- dbesc($theme),
+ DBA::escape($theme),
intval(local_user())
);
- call_hooks('display_settings_post', $_POST);
+ Addon::callHooks('display_settings_post', $_POST);
goaway('settings/display');
return; // NOTREACHED
}
@@ -362,49 +376,48 @@ function settings_post(App $a) {
if (x($_POST,'resend_relocate')) {
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
- info(t("Relocate message has been send to your contacts"));
+ info(L10n::t("Relocate message has been send to your contacts"));
goaway('settings');
}
- call_hooks('settings_post', $_POST);
+ Addon::callHooks('settings_post', $_POST);
if (x($_POST, 'password') || x($_POST, 'confirm')) {
-
$newpass = $_POST['password'];
$confirm = $_POST['confirm'];
$err = false;
if ($newpass != $confirm) {
- notice(t('Passwords do not match. Password unchanged.') . EOL);
+ notice(L10n::t('Passwords do not match. Password unchanged.') . EOL);
$err = true;
}
if (!x($newpass) || !x($confirm)) {
- notice(t('Empty passwords are not allowed. Password unchanged.') . EOL);
+ notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
$err = true;
- }
+ }
- // check if the old password was supplied correctly before
- // changing it to the new value
- if (User::authenticate(intval(local_user()), $_POST['opassword'])) {
- notice(t('Wrong password.') . EOL);
- $err = true;
- }
+ if (!Config::get('system', 'disable_password_exposed', false) && User::isPasswordExposed($newpass)) {
+ notice(L10n::t('The new password has been exposed in a public data dump, please choose another.') . EOL);
+ $err = true;
+ }
+
+ // check if the old password was supplied correctly before changing it to the new value
+ if (!User::authenticate(intval(local_user()), $_POST['opassword'])) {
+ notice(L10n::t('Wrong password.') . EOL);
+ $err = true;
+ }
if (!$err) {
- $password = hash('whirlpool', $newpass);
- $r = q("UPDATE `user` SET `password` = '%s' WHERE `uid` = %d",
- dbesc($password),
- intval(local_user())
- );
- if ($r)
- info(t('Password changed.') . EOL);
- else
- notice(t('Password update failed. Please try again.') . EOL);
+ $result = User::updatePassword(local_user(), $newpass);
+ if (DBA::isResult($result)) {
+ info(L10n::t('Password changed.') . EOL);
+ } else {
+ notice(L10n::t('Password update failed. Please try again.') . EOL);
+ }
}
}
-
$username = ((x($_POST, 'username')) ? notags(trim($_POST['username'])) : '');
$email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : '');
$timezone = ((x($_POST, 'timezone')) ? notags(trim($_POST['timezone'])) : '');
@@ -436,9 +449,6 @@ function settings_post(App $a) {
$suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
- $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
- $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
- $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
$email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0);
$detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0);
@@ -471,29 +481,26 @@ function settings_post(App $a) {
}
// Adjust the page flag if the account type doesn't fit to the page flag.
- if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
- $page_flags = PAGE_NORMAL;
- } elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
- $page_flags = PAGE_SOAPBOX;
- } elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
- $page_flags = PAGE_SOAPBOX;
- } elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
- $page_flags = PAGE_COMMUNITY;
+ if (($account_type == Contact::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [Contact::PAGE_NORMAL, Contact::PAGE_SOAPBOX, Contact::PAGE_FREELOVE])) {
+ $page_flags = Contact::PAGE_NORMAL;
+ } elseif (($account_type == Contact::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+ $page_flags = Contact::PAGE_SOAPBOX;
+ } elseif (($account_type == Contact::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+ $page_flags = Contact::PAGE_SOAPBOX;
+ } elseif (($account_type == Contact::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
+ $page_flags = Contact::PAGE_COMMUNITY;
}
$email_changed = false;
$err = '';
- $name_change = false;
-
if ($username != $a->user['username']) {
- $name_change = true;
if (strlen($username) > 40) {
- $err .= t(' Please use a shorter name.');
+ $err .= L10n::t(' Please use a shorter name.');
}
if (strlen($username) < 3) {
- $err .= t(' Name too short.');
+ $err .= L10n::t(' Name too short.');
}
}
@@ -501,19 +508,18 @@ function settings_post(App $a) {
$email_changed = true;
// check for the correct password
if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
- $err .= t('Wrong Password') . EOL;
+ $err .= L10n::t('Wrong Password') . EOL;
$email = $a->user['email'];
}
// check the email is valid
if (!valid_email($email)) {
- $err .= t(' Not valid email.');
+ $err .= L10n::t('Invalid email.');
}
// ensure new email is not the admin mail
- //if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) {
- if (x($a->config, 'admin_email')) {
- $adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
+ if (Config::get('config', 'admin_email')) {
+ $adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email'))));
if (in_array(strtolower($email), $adminlist)) {
- $err .= t(' Cannot change to that email.');
+ $err .= L10n::t('Cannot change to that email.');
$email = $a->user['email'];
}
}
@@ -528,22 +534,19 @@ function settings_post(App $a) {
date_default_timezone_set($timezone);
}
- $str_group_allow = perms2str($_POST['group_allow']);
- $str_contact_allow = perms2str($_POST['contact_allow']);
- $str_group_deny = perms2str($_POST['group_deny']);
- $str_contact_deny = perms2str($_POST['contact_deny']);
+ $str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : '';
+ $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+ $str_group_deny = !empty($_POST['group_deny']) ? perms2str($_POST['group_deny']) : '';
+ $str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
$openidserver = $a->user['openidserver'];
//$openid = normalise_openid($openid);
// If openid has changed or if there's an openid but no openidserver, try and discover it.
-
if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
- $tmp_str = $openid;
- if (strlen($tmp_str) && validate_url($tmp_str)) {
+ if (Network::isUrlValid($openid)) {
logger('updating openidserver');
- require_once('library/openid.php');
- $open_id_obj = new LightOpenID;
+ $open_id_obj = new LightOpenID($a->get_hostname());
$open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity);
} else {
@@ -558,21 +561,18 @@ function settings_post(App $a) {
PConfig::set(local_user(), 'expire', 'network_only', $expire_network_only);
PConfig::set(local_user(), 'system', 'suggestme', $suggestme);
- PConfig::set(local_user(), 'system', 'post_newfriend', $post_newfriend);
- PConfig::set(local_user(), 'system', 'post_joingroup', $post_joingroup);
- PConfig::set(local_user(), 'system', 'post_profilechange', $post_profilechange);
PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
- if ($page_flags == PAGE_PRVGROUP) {
+ if ($page_flags == Contact::PAGE_PRVGROUP) {
$hidewall = 1;
if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
if ($def_gid) {
- info(t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+ info(L10n::t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
$str_group_allow = '<' . $def_gid . '>';
} else {
- notice(t('Private forum has no privacy permissions and no default privacy group.') . EOL);
+ notice(L10n::t('Private forum has no privacy permissions and no default privacy group.') . EOL);
}
}
}
@@ -586,33 +586,33 @@ function settings_post(App $a) {
`def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d,
`unkmail` = %d, `cntunkmail` = %d, `language` = '%s'
WHERE `uid` = %d",
- dbesc($username),
- dbesc($email),
- dbesc($openid),
- dbesc($timezone),
- dbesc($str_contact_allow),
- dbesc($str_group_allow),
- dbesc($str_contact_deny),
- dbesc($str_group_deny),
+ DBA::escape($username),
+ DBA::escape($email),
+ DBA::escape($openid),
+ DBA::escape($timezone),
+ DBA::escape($str_contact_allow),
+ DBA::escape($str_group_allow),
+ DBA::escape($str_contact_deny),
+ DBA::escape($str_group_deny),
intval($notify),
intval($page_flags),
intval($account_type),
- dbesc($defloc),
+ DBA::escape($defloc),
intval($allow_location),
intval($maxreq),
intval($expire),
- dbesc($openidserver),
+ DBA::escape($openidserver),
intval($def_gid),
intval($blockwall),
intval($hidewall),
intval($blocktags),
intval($unkmail),
intval($cntunkmail),
- dbesc($language),
+ DBA::escape($language),
intval(local_user())
);
- if ($r) {
- info(t('Settings updated.') . EOL);
+ if (DBA::isResult($r)) {
+ info(L10n::t('Settings updated.') . EOL);
}
// clear session language
@@ -625,20 +625,13 @@ function settings_post(App $a) {
`hide-friends` = %d
WHERE `is-default` = 1 AND `uid` = %d",
intval($publish),
- dbesc($username),
+ DBA::escape($username),
intval($net_publish),
intval($hide_friends),
intval(local_user())
);
-
- if ($name_change) {
- q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
- dbesc($username),
- dbesc(datetime_convert()),
- intval(local_user())
- );
- }
+ Contact::updateSelfFromUserID(local_user());
if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
@@ -651,93 +644,80 @@ function settings_post(App $a) {
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
// Update the global contact for the user
- GlobalContact::updateForUser(local_user());
-
- //$_SESSION['theme'] = $theme;
- if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
-
- /// @TODO set to un-verified, blocked and redirect to logout
- /// @TODO Why? Are we verifying people or email addresses?
-
- }
+ GContact::updateForUser(local_user());
goaway('settings');
return; // NOTREACHED
}
-function settings_content(App $a) {
-
+function settings_content(App $a)
+{
$o = '';
- nav_set_selected('settings');
+ Nav::setSelected('settings');
if (!local_user()) {
- //notice(t('Permission denied.') . EOL);
+ //notice(L10n::t('Permission denied.') . EOL);
return;
}
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
- notice(t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
-
-
if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
-
if (($a->argc > 2) && ($a->argv[2] === 'add')) {
- $tpl = get_markup_template("settings_oauth_edit.tpl");
- $o .= replace_macros($tpl, array(
+ $tpl = get_markup_template('settings/oauth_edit.tpl');
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Save Settings'),
- '$cancel' => t('Cancel'),
- '$name' => array('name', t('Name'), '', ''),
- '$key' => array('key', t('Consumer Key'), '', ''),
- '$secret' => array('secret', t('Consumer Secret'), '', ''),
- '$redirect' => array('redirect', t('Redirect'), '', ''),
- '$icon' => array('icon', t('Icon url'), '', ''),
- ));
+ '$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'), '', ''],
+ ]);
return $o;
}
if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
- dbesc($a->argv[3]),
+ DBA::escape($a->argv[3]),
local_user());
- if (!DBM::is_result($r)) {
- notice(t("You can't edit this application."));
+ if (!DBA::isResult($r)) {
+ notice(L10n::t("You can't edit this application."));
return;
}
$app = $r[0];
- $tpl = get_markup_template("settings_oauth_edit.tpl");
- $o .= replace_macros($tpl, array(
+ $tpl = get_markup_template('settings/oauth_edit.tpl');
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Update'),
- '$cancel' => t('Cancel'),
- '$name' => array('name', t('Name'), $app['name'] , ''),
- '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
- '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
- '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
- '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
- ));
+ '$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'], ''],
+ ]);
return $o;
}
if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
- $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
- dbesc($a->argv[3]),
- local_user());
+ DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
- /// @TODO validate result with DBM::is_result()
+ /// @TODO validate result with DBA::isResult()
$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
FROM clients
LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -746,119 +726,82 @@ function settings_content(App $a) {
local_user());
- $tpl = get_markup_template("settings_oauth.tpl");
- $o .= replace_macros($tpl, array(
+ $tpl = get_markup_template('settings/oauth.tpl');
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
'$baseurl' => System::baseUrl(true),
- '$title' => t('Connected Apps'),
- '$add' => t('Add application'),
- '$edit' => t('Edit'),
- '$delete' => t('Delete'),
- '$consumerkey' => t('Client key starts with'),
- '$noname' => t('No name'),
- '$remove' => t('Remove authorization'),
+ '$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'),
'$apps' => $r,
- ));
+ ]);
return $o;
-
}
if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
$settings_addons = "";
- $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
- if (!DBM::is_result($r)) {
- $settings_addons = t('No Plugin settings configured');
+ $r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
+ if (!DBA::isResult($r)) {
+ $settings_addons = L10n::t('No Addon settings configured');
}
- call_hooks('plugin_settings', $settings_addons);
+ Addon::callHooks('addon_settings', $settings_addons);
- $tpl = get_markup_template("settings_addons.tpl");
- $o .= replace_macros($tpl, array(
+ $tpl = get_markup_template('settings/addons.tpl');
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_addon"),
- '$title' => t('Plugin Settings'),
+ '$title' => L10n::t('Addon Settings'),
'$settings_addons' => $settings_addons
- ));
+ ]);
return $o;
}
if (($a->argc > 1) && ($a->argv[1] === 'features')) {
- $arr = array();
- $features = get_features();
+ $arr = [];
+ $features = Feature::get();
foreach ($features as $fname => $fdata) {
- $arr[$fname] = array();
+ $arr[$fname] = [];
$arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) {
- $arr[$fname][1][] = array('feature_' .$f[0], $f[1],((intval(feature_enabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
+ $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[L10n::t('Off'), L10n::t('On')]];
}
}
-
- $tpl = get_markup_template("settings_features.tpl");
- $o .= replace_macros($tpl, array(
+ $tpl = get_markup_template('settings/features.tpl');
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_features"),
- '$title' => t('Additional Features'),
+ '$title' => L10n::t('Additional Features'),
'$features' => $arr,
- '$submit' => t('Save Settings'),
- ));
+ '$submit' => L10n::t('Save Settings'),
+ ]);
return $o;
}
if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
-
- $settings_connectors = '';
- $settings_connectors .= ''. t('General Social Media Settings').' ';
- $settings_connectors .= ' ';
- $settings_connectors .= '
';
- $settings_connectors .= '
';
- $settings_connectors .= ''. t('General Social Media Settings').' ';
- $settings_connectors .= ' ';
-
- $checked = ((PConfig::get(local_user(), 'system', 'no_intelligent_shortening')) ? ' checked="checked" ' : '');
-
- $settings_connectors .= '
';
- $settings_connectors .= ''. t('Disable intelligent shortening'). ' ';
- $settings_connectors .= ' ';
- $settings_connectors .= ''.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.').' ';
- $settings_connectors .= '
';
-
- $checked = ((PConfig::get(local_user(), 'system', 'ostatus_autofriend')) ? ' checked="checked" ' : '');
-
- $settings_connectors .= '
';
- $settings_connectors .= ''. t('Automatically follow any GNU Social (OStatus) followers/mentioners'). ' ';
- $settings_connectors .= ' ';
- $settings_connectors .= ''.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.').' ';
- $settings_connectors .= '
';
-
- $default_group = PConfig::get(local_user(), 'ostatus', 'default_group');
- $legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
-
- $settings_connectors .= mini_group_select(local_user(), $default_group, t("Default group for OStatus contacts"));
-
- /// @TODO Found to much different usage to test empty/non-empty strings (e.g. empty(), trim() == '') which is wanted?
- if ($legacy_contact != "") {
- $a->page['htmlhead'] = '
';
+ $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');
+
+ if (x($legacy_contact)) {
+ /// @todo Isn't it supposed to be a goaway() call?
+ $a->page['htmlhead'] = '
';
}
- $settings_connectors .= '
';
- $settings_connectors .= ''. t('Your legacy GNU Social account'). ' ';
- $settings_connectors .= ' ';
- $settings_connectors .= ''.t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.').' ';
- $settings_connectors .= '
';
-
- $settings_connectors .= '
'.t("Repair OStatus subscriptions").'
';
-
- $settings_connectors .= '
';
-
- $settings_connectors .= '
';
-
- call_hooks('connector_settings', $settings_connectors);
+ $settings_connectors = '';
+ Addon::callHooks('connector_settings', $settings_connectors);
if (is_site_admin()) {
- $diasp_enabled = sprintf(t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? t('enabled') : t('disabled')));
- $ostat_enabled = sprintf(t('Built-in support for %s connectivity is %s'), t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? t('disabled') : t('enabled')));
+ $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')));
} else {
$diasp_enabled = "";
$ostat_enabled = "";
@@ -876,48 +819,58 @@ function settings_content(App $a) {
$r = null;
}
- $mail_server = ((DBM::is_result($r)) ? $r[0]['server'] : '');
- $mail_port = ((DBM::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
- $mail_ssl = ((DBM::is_result($r)) ? $r[0]['ssltype'] : '');
- $mail_user = ((DBM::is_result($r)) ? $r[0]['user'] : '');
- $mail_replyto = ((DBM::is_result($r)) ? $r[0]['reply_to'] : '');
- $mail_pubmail = ((DBM::is_result($r)) ? $r[0]['pubmail'] : 0);
- $mail_action = ((DBM::is_result($r)) ? $r[0]['action'] : 0);
- $mail_movetofolder = ((DBM::is_result($r)) ? $r[0]['movetofolder'] : '');
- $mail_chk = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
+ $mail_server = ((DBA::isResult($r)) ? $r[0]['server'] : '');
+ $mail_port = ((DBA::isResult($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+ $mail_ssl = ((DBA::isResult($r)) ? $r[0]['ssltype'] : '');
+ $mail_user = ((DBA::isResult($r)) ? $r[0]['user'] : '');
+ $mail_replyto = ((DBA::isResult($r)) ? $r[0]['reply_to'] : '');
+ $mail_pubmail = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
+ $mail_action = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
+ $mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
+ $mail_chk = ((DBA::isResult($r)) ? $r[0]['last_check'] : NULL_DATE);
- $tpl = get_markup_template("settings_connectors.tpl");
+ $tpl = get_markup_template('settings/connectors.tpl');
- $mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
+ $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
- $o .= replace_macros($tpl, array(
+ $o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_connectors"),
- '$title' => t('Social Networks'),
+ '$title' => L10n::t('Social Networks'),
'$diasp_enabled' => $diasp_enabled,
'$ostat_enabled' => $ostat_enabled,
- '$h_imap' => t('Email/Mailbox Setup'),
- '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
- '$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk, ''),
+ '$general_settings' => L10n::t('General Social Media Settings'),
+ '$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.")],
+
+ '$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus',
+ '$repair_ostatus_text' => 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, ''],
'$mail_disabled' => $mail_disabled_message,
- '$mail_server' => array('mail_server', t('IMAP server name:'), $mail_server, ''),
- '$mail_port' => array('mail_port', t('IMAP port:'), $mail_port, ''),
- '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array('notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
- '$mail_user' => array('mail_user', t('Email login name:'), $mail_user, ''),
- '$mail_pass' => array('mail_pass', t('Email password:'), '', ''),
- '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), $mail_replyto, 'Optional'),
- '$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
- '$mail_action' => array('mail_action', t('Action after import:'), $mail_action, '', array(0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder'))),
- '$mail_movetofolder' => array('mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''),
- '$submit' => t('Save Settings'),
-
- '$settings_connectors' => $settings_connectors
- ));
-
- call_hooks('display_settings', $o);
+ '$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'),
+ ]);
+
+ Addon::callHooks('display_settings', $o);
return $o;
}
@@ -930,13 +883,13 @@ function settings_content(App $a) {
$default_theme = 'default';
}
$default_mobile_theme = Config::get('system', 'mobile-theme');
- if (!$mobile_default_theme) {
- $mobile_default_theme = 'none';
+ if (!$default_mobile_theme) {
+ $default_mobile_theme = 'none';
}
$allowed_themes_str = Config::get('system', 'allowed_themes');
$allowed_themes_raw = explode(',', $allowed_themes_str);
- $allowed_themes = array();
+ $allowed_themes = [];
if (count($allowed_themes_raw)) {
foreach ($allowed_themes_raw as $x) {
if (strlen(trim($x)) && is_dir("view/theme/$x")) {
@@ -946,27 +899,30 @@ function settings_content(App $a) {
}
- $themes = array();
- $mobile_themes = array("---" => t('No special theme for mobile devices'));
- $files = glob('view/theme/*'); /* */
+ $themes = [];
+ $mobile_themes = ["---" => L10n::t('No special theme for mobile devices')];
if ($allowed_themes) {
- foreach ($allowed_themes as $th) {
- $f = $th;
- $is_experimental = file_exists('view/theme/' . $th . '/experimental');
- $unsupported = file_exists('view/theme/' . $th . '/unsupported');
- $is_mobile = file_exists('view/theme/' . $th . '/mobile');
+ 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'))))) {
- $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
+ $theme_name = ucfirst($theme);
+ if ($is_unsupported) {
+ $theme_name = L10n::t("%s - \x28Unsupported\x29", $theme_name);
+ } elseif ($is_experimental) {
+ $theme_name = L10n::t("%s - \x28Experimental\x29", $theme_name);
+ }
if ($is_mobile) {
- $mobile_themes[$f]=$theme_name;
+ $mobile_themes[$theme] = $theme_name;
} else {
- $themes[$f]=$theme_name;
+ $themes[$theme] = $theme_name;
}
}
}
}
- $theme_selected = (!x($_SESSION, 'theme')? $default_theme : $_SESSION['theme']);
- $mobile_theme_selected = (!x($_SESSION, 'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']);
+ $theme_selected = defaults($_SESSION, 'theme' , $default_theme);
+ $mobile_theme_selected = defaults($_SESSION, 'mobile-theme', $default_mobile_theme);
$nowarn_insecure = intval(PConfig::get(local_user(), 'system', 'nowarn_insecure'));
@@ -982,7 +938,7 @@ function settings_content(App $a) {
$nosmile = PConfig::get(local_user(), 'system', 'no_smilies', 0);
$first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
- $weekdays = array(0 => t("Sunday"), 1 => t("Monday"));
+ $weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")];
$noinfo = PConfig::get(local_user(), 'system', 'ignore_info', 0);
$infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0);
@@ -991,45 +947,45 @@ function settings_content(App $a) {
$smart_threading = PConfig::get(local_user(), 'system', 'smart_threading', 0);
$theme_config = "";
- if (($themeconfigfile = get_theme_config_file($theme_selected)) != null) {
- require_once($themeconfigfile);
+ if (($themeconfigfile = get_theme_config_file($theme_selected)) !== null) {
+ require_once $themeconfigfile;
$theme_config = theme_content($a);
}
- $tpl = get_markup_template("settings_display.tpl");
- $o = replace_macros($tpl, array(
- '$ptitle' => t('Display Settings'),
+ $tpl = get_markup_template('settings/display.tpl');
+ $o = replace_macros($tpl, [
+ '$ptitle' => L10n::t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"),
- '$submit' => t('Save Settings'),
+ '$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
- '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
- '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false),
- '$nowarn_insecure' => array('nowarn_insecure', t('Suppress warning of insecure networks'), $nowarn_insecure, t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")),
- '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')),
- '$itemspage_network' => array('itemspage_network', t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
- '$itemspage_mobile_network' => array('itemspage_mobile_network', t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
- '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
- '$calendar_title' => t('Calendar'),
- '$first_day_of_week' => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false),
- '$noinfo' => array('noinfo', t("Don't show notices"), $noinfo, ''),
- '$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
- '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, t('When disabled, the network page is updated all the time, which could be confusing while reading.')),
- '$bandwidth_saver' => array('bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')),
- '$smart_threading' => array('smart_threading', t('Smart Threading'), $smart_threading, t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')),
-
- '$d_tset' => t('General Theme Settings'),
- '$d_ctset' => t('Custom Theme Settings'),
- '$d_cset' => t('Content Settings'),
- 'stitle' => t('Theme settings'),
+ '$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_config' => $theme_config,
- ));
+ ]);
- $tpl = get_markup_template("settings_display_end.tpl");
- $a->page['end'] .= replace_macros($tpl, array(
- '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes)
- ));
+ $tpl = get_markup_template('settings/display_end.tpl');
+ $a->page['end'] .= replace_macros($tpl, [
+ '$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
+ ]);
return $o;
}
@@ -1039,13 +995,10 @@ function settings_content(App $a) {
* ACCOUNT SETTINGS
*/
- require_once('include/acl_selectors.php');
-
- $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
- intval(local_user())
- );
- if (count($p)) {
- $profile = $p[0];
+ $profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
+ if (!DBA::isResult($profile)) {
+ notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
+ return;
}
$username = $a->user['username'];
@@ -1058,8 +1011,6 @@ function settings_content(App $a) {
$openid = $a->user['openid'];
$maxreq = $a->user['maxreq'];
$expire = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
- $blockwall = $a->user['blockwall'];
- $blocktags = $a->user['blocktags'];
$unkmail = $a->user['unkmail'];
$cntunkmail = $a->user['cntunkmail'];
@@ -1069,9 +1020,6 @@ function settings_content(App $a) {
$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);
- $post_newfriend = PConfig::get(local_user(), 'system', 'post_newfriend', false);
- $post_joingroup = PConfig::get(local_user(), 'system', 'post_joingroup', false);
- $post_profilechange = PConfig::get(local_user(), 'system', 'post_profilechange', false);
// nowarn_insecure
@@ -1081,156 +1029,145 @@ function settings_content(App $a) {
// Set the account type to "Community" when the page is a community page but the account type doesn't fit
// This is only happening on the first visit after the update
- if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) &&
- ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY))
- $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
+ if (in_array($a->user['page-flags'], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]) &&
+ ($a->user['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY))
+ $a->user['account-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
- $pageset_tpl = get_markup_template('settings_pagetypes.tpl');
+ $pageset_tpl = get_markup_template('settings/pagetypes.tpl');
- $pagetype = replace_macros($pageset_tpl, array(
- '$account_types' => t("Account Types"),
- '$user' => t("Personal Page Subtypes"),
- '$community' => t("Community Forum Subtypes"),
+ $pagetype = replace_macros($pageset_tpl, [
+ '$account_types' => L10n::t("Account Types"),
+ '$user' => L10n::t("Personal Page Subtypes"),
+ '$community' => L10n::t("Community Forum Subtypes"),
'$account_type' => $a->user['account-type'],
- '$type_person' => ACCOUNT_TYPE_PERSON,
- '$type_organisation' => ACCOUNT_TYPE_ORGANISATION,
- '$type_news' => ACCOUNT_TYPE_NEWS,
- '$type_community' => ACCOUNT_TYPE_COMMUNITY,
+ '$type_person' => Contact::ACCOUNT_TYPE_PERSON,
+ '$type_organisation' => Contact::ACCOUNT_TYPE_ORGANISATION,
+ '$type_news' => Contact::ACCOUNT_TYPE_NEWS,
+ '$type_community' => Contact::ACCOUNT_TYPE_COMMUNITY,
- '$account_person' => array('account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON,
- t('Account for a personal profile.'),
- ($a->user['account-type'] == ACCOUNT_TYPE_PERSON)),
+ '$account_person' => ['account-type', L10n::t('Personal Page'), Contact::ACCOUNT_TYPE_PERSON,
+ L10n::t('Account for a personal profile.'),
+ ($a->user['account-type'] == Contact::ACCOUNT_TYPE_PERSON)],
- '$account_organisation' => array('account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
- t('Account for an organisation that automatically approves contact requests as "Followers".'),
- ($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)),
+ '$account_organisation' => ['account-type', L10n::t('Organisation Page'), Contact::ACCOUNT_TYPE_ORGANISATION,
+ L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
+ ($a->user['account-type'] == Contact::ACCOUNT_TYPE_ORGANISATION)],
- '$account_news' => array('account-type', t('News Page'), ACCOUNT_TYPE_NEWS,
- t('Account for a news reflector that automatically approves contact requests as "Followers".'),
- ($a->user['account-type'] == ACCOUNT_TYPE_NEWS)),
+ '$account_news' => ['account-type', L10n::t('News Page'), Contact::ACCOUNT_TYPE_NEWS,
+ L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
+ ($a->user['account-type'] == Contact::ACCOUNT_TYPE_NEWS)],
- '$account_community' => array('account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
- t('Account for community discussions.'),
- ($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)),
+ '$account_community' => ['account-type', L10n::t('Community Forum'), Contact::ACCOUNT_TYPE_COMMUNITY,
+ L10n::t('Account for community discussions.'),
+ ($a->user['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)],
- '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
- t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
- ($a->user['page-flags'] == PAGE_NORMAL)),
+ '$page_normal' => ['page-flags', L10n::t('Normal Account Page'), Contact::PAGE_NORMAL,
+ L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
+ ($a->user['page-flags'] == Contact::PAGE_NORMAL)],
- '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
- t('Account for a public profile that automatically approves contact requests as "Followers".'),
- ($a->user['page-flags'] == PAGE_SOAPBOX)),
+ '$page_soapbox' => ['page-flags', L10n::t('Soapbox Page'), Contact::PAGE_SOAPBOX,
+ L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
+ ($a->user['page-flags'] == Contact::PAGE_SOAPBOX)],
- '$page_community' => array('page-flags', t('Public Forum'), PAGE_COMMUNITY,
- t('Automatically approves all contact requests.'),
- ($a->user['page-flags'] == PAGE_COMMUNITY)),
+ '$page_community' => ['page-flags', L10n::t('Public Forum'), Contact::PAGE_COMMUNITY,
+ L10n::t('Automatically approves all contact requests.'),
+ ($a->user['page-flags'] == Contact::PAGE_COMMUNITY)],
- '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
- t('Account for a popular profile that automatically approves contact requests as "Friends".'),
- ($a->user['page-flags'] == PAGE_FREELOVE)),
+ '$page_freelove' => ['page-flags', L10n::t('Automatic Friend Page'), Contact::PAGE_FREELOVE,
+ L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
+ ($a->user['page-flags'] == Contact::PAGE_FREELOVE)],
- '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
- t('Requires manual approval of contact requests.'),
- ($a->user['page-flags'] == PAGE_PRVGROUP)),
+ '$page_prvgroup' => ['page-flags', L10n::t('Private Forum [Experimental]'), Contact::PAGE_PRVGROUP,
+ L10n::t('Requires manual approval of contact requests.'),
+ ($a->user['page-flags'] == Contact::PAGE_PRVGROUP)],
- ));
+ ]);
$noid = Config::get('system', 'no_openid');
if ($noid) {
$openid_field = false;
} else {
- $openid_field = array('openid_url', t('OpenID:'), $openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url");
+ $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
}
$opt_tpl = get_markup_template("field_yesno.tpl");
if (Config::get('system', 'publish_all')) {
$profile_in_dir = ' ';
} else {
- $profile_in_dir = replace_macros($opt_tpl, array(
- '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes')))
- ));
+ $profile_in_dir = replace_macros($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 local directory . Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
+ ]);
}
if (strlen(Config::get('system', 'directory'))) {
- $profile_in_net_dir = replace_macros($opt_tpl, array(
- '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes')))
- ));
+ $profile_in_net_dir = replace_macros($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. %s ). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]]
+ ]);
} else {
$profile_in_net_dir = '';
}
- $hide_friends = replace_macros($opt_tpl,array(
- '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))),
- ));
-
- $hide_wall = replace_macros($opt_tpl,array(
- '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))),
-
- ));
-
- $blockwall = replace_macros($opt_tpl,array(
- '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
+ $hide_friends = replace_macros($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')]],
+ ]);
- ));
+ $hide_wall = replace_macros($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')]],
+ ]);
- $blocktags = replace_macros($opt_tpl,array(
- '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
+ $blockwall = replace_macros($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')]],
+ ]);
- ));
+ $blocktags = replace_macros($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')]],
+ ]);
- $suggestme = replace_macros($opt_tpl,array(
- '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))),
+ $suggestme = replace_macros($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')]],
+ ]);
- ));
+ $unkmail = replace_macros($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')]],
+ ]);
- $unkmail = replace_macros($opt_tpl,array(
- '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))),
-
- ));
-
- $invisible = (((!$profile['publish']) && (!$profile['net-publish']))
- ? true : false);
-
- if ($invisible) {
- info(t('Profile is not published .') . EOL);
+ if (!$profile['publish'] && !$profile['net-publish']) {
+ info(L10n::t('Profile is not published .') . EOL);
}
- //$subdir = ((strlen($a->get_path())) ? ' ' . t('or') . ' ' . 'profile/' . $nickname : '');
+ $tpl_addr = get_markup_template('settings/nick_set.tpl');
- $tpl_addr = get_markup_template("settings_nick_set.tpl");
-
- $prof_addr = replace_macros($tpl_addr,array(
- '$desc' => sprintf(t("Your Identity Address is '%s' or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), System::baseUrl().'/profile/'.$nickname),
+ $prof_addr = replace_macros($tpl_addr,[
+ '$desc' => L10n::t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
'$basepath' => $a->get_hostname()
- ));
-
- $stpl = get_markup_template('settings.tpl');
-
- $expire_arr = array(
- 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
- 'advanced' => t('Advanced expiration settings'),
- 'label' => t('Advanced Expiration'),
- 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))),
- 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))),
- 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))),
- 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))),
- 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))),
- );
+ ]);
+
+ $stpl = get_markup_template('settings/settings.tpl');
- require_once('include/group.php');
- $group_select = mini_group_select(local_user(), $a->user['def_gid']);
+ $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')]],
+ ];
+
+ $group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']);
// Private/public post links for the non-JS ACL form
$private_post = 1;
- if ($_REQUEST['public']) {
+ if (!empty($_REQUEST['public']) && !$_REQUEST['public']) {
$private_post = 0;
}
$query_str = $a->query_string;
if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+ $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
@@ -1243,56 +1180,55 @@ function settings_content(App $a) {
}
/* Installed langs */
- $lang_choices = get_available_languages();
+ $lang_choices = L10n::getAvailableLanguages();
/// @TODO Fix indending (or so)
- $o .= replace_macros($stpl, array(
- '$ptitle' => t('Account Settings'),
+ $o .= replace_macros($stpl, [
+ '$ptitle' => L10n::t('Account Settings'),
- '$submit' => t('Save Settings'),
+ '$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
'$form_security_token' => get_form_security_token("settings"),
'$nickname_block' => $prof_addr,
- '$h_pass' => t('Password Settings'),
- '$password1'=> array('password', t('New Password:'), '', ''),
- '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
- '$password3'=> array('opassword', t('Current Password:'), '', t('Your current password to confirm the changes')),
- '$password4'=> array('mpassword', t('Password:'), '', t('Your current password to confirm the changes')),
+ '$h_pass' => L10n::t('Password Settings'),
+ '$password1'=> ['password', L10n::t('New Password:'), '', ''],
+ '$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')),
'$openid' => $openid_field,
- '$h_basic' => t('Basic Settings'),
- '$username' => array('username', t('Full Name:'), $username, ''),
- '$email' => array('email', t('Email Address:'), $email, '', '', '', 'email'),
- '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
- '$language' => array('language', t('Your Language:'), $language, t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices),
- '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
- '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
+ '$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_prv' => t('Security and Privacy Settings'),
+ '$h_prv' => L10n::t('Security and Privacy Settings'),
- '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")),
- '$permissions' => t('Default Post Permissions'),
- '$permdesc' => t("\x28click to open/close\x29"),
+ '$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"),
'$visibility' => $profile['net-publish'],
- '$aclselect' => populate_acl($a->user),
+ '$aclselect' => ACL::getFullSelectorHTML($a->user),
'$suggestme' => $suggestme,
- '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
- '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$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, ''),
// ACL permissions box
- '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
- '$private' => t('Default Private Post'),
- '$public' => t('Default Public Post'),
+ '$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'),
'$is_private' => $private_post,
'$return_path' => $query_str,
'$public_link' => $public_post_link,
- '$settings_perms' => t('Default Permissions for New Posts'),
+ '$settings_perms' => L10n::t('Default Permissions for New Posts'),
'$group_select' => $group_select,
@@ -1304,45 +1240,41 @@ function settings_content(App $a) {
'$hide_friends' => $hide_friends,
'$hide_wall' => $hide_wall,
'$unkmail' => $unkmail,
- '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")),
-
-
- '$h_not' => t('Notification Settings'),
- '$activity_options' => t('By default post a status message when:'),
- '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''),
- '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, ''),
- '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, ''),
- '$lbl_not' => t('Send a notification email when:'),
- '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
- '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
- '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
- '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
- '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
- '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),
- '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
- '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
-
- '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
-
- '$email_textonly' => array('email_textonly', t('Text-only notification emails'),
+ '$cntunkmail' => ['cntunkmail', L10n::t('Maximum private messages per day from unknown people:'), $cntunkmail , 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, ''],
+
+ '$desktop_notifications' => ['desktop_notifications', L10n::t('Activate desktop notifications') , false, 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'),
- t('Send text only notification emails, without the html part')),
+ L10n::t('Send text only notification emails, without the html part')],
- '$detailed_notif' => array('detailed_notif', t('Show detailled notifications'),
+ '$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
PConfig::get(local_user(), 'system', 'detailed_notif'),
- t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')),
+ L10n::t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
- '$h_advn' => t('Advanced Account/Page Type Settings'),
- '$h_descadvn' => t('Change the behaviour of this account for special situations'),
+ '$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
+ '$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
- '$relocate' => t('Relocate'),
- '$relocate_text' => 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' => t("Resend relocate message to contacts"),
+ '$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"),
- ));
+ ]);
- call_hooks('settings_form', $o);
+ Addon::callHooks('settings_form', $o);
$o .= '' . "\r\n";