*/
use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Core\ACL;
-use Friendica\Core\Addon;
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\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\User;
+use Friendica\Module\Login;
use Friendica\Protocol\Email;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-use Friendica\Util\Security;
-use Friendica\Module\Login;
function get_theme_config_file($theme)
{
- $a = get_app();
+ $a = \get_app();
$base_theme = defaults($a->theme_info, 'extends');
if (file_exists("view/theme/$theme/config.php")) {
// These lines provide the javascript needed by the acl selector
- $tpl = get_markup_template('settings/head.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$ispublic' => L10n::t('everybody')
]);
];
- $tabtpl = get_markup_template("generic_links_widget.tpl");
- $a->page['aside'] = replace_macros($tabtpl, [
+ $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
+ $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
'$title' => L10n::t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
return;
}
- if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+ if (!empty($_SESSION['submanage'])) {
return;
}
- if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+ if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
$old_page_flags = $a->user['page-flags'];
- if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
- Security::check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+ if (($a->argc > 1) && ($a->argv[1] === 'oauth') && !empty($_POST['remove'])) {
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
$key = $_POST['remove'];
DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
- goaway(System::baseUrl(true)."/settings/oauth/");
+ $a->internalRedirect('settings/oauth/', true);
return;
}
- if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
- Security::check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+ if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) {
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
$name = defaults($_POST, 'name' , '');
$key = defaults($_POST, 'key' , '');
);
}
}
- goaway(System::baseUrl(true)."/settings/oauth/");
+ $a->internalRedirect('settings/oauth/', true);
return;
}
if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
- Security::check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings/addon', 'settings_addon');
- Addon::callHooks('addon_settings_post', $_POST);
+ Hook::callAll('addon_settings_post', $_POST);
return;
}
if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
- Security::check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
- if (x($_POST, 'general-submit')) {
+ if (!empty($_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']);
PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
- } elseif (x($_POST, 'imap-submit')) {
+ } elseif (!empty($_POST['imap-submit'])) {
- $mail_server = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : '');
- $mail_port = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
- $mail_ssl = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
- $mail_user = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
- $mail_pass = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
- $mail_action = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
- $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
- $mail_replyto = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
- $mail_pubmail = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+ $mail_server = defaults($_POST, 'mail_server', '');
+ $mail_port = defaults($_POST, 'mail_port', '');
+ $mail_ssl = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : '');
+ $mail_user = defaults($_POST, 'mail_user', '');
+ $mail_pass = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : '');
+ $mail_action = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : '');
+ $mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : '');
+ $mail_replyto = defaults($_POST, 'mail_replyto', '');
+ $mail_pubmail = defaults($_POST, 'mail_pubmail', '');
$mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
intval($mail_pubmail),
intval(local_user())
);
- logger("mail: updating mailaccount. Response: ".print_r($r, true));
+ Logger::log("mail: updating mailaccount. Response: ".print_r($r, true));
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
}
}
- Addon::callHooks('connector_settings_post', $_POST);
+ Hook::callAll('connector_settings_post', $_POST);
return;
}
if (($a->argc > 1) && ($a->argv[1] === 'features')) {
- Security::check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
+ 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));
}
if (($a->argc > 1) && ($a->argv[1] === 'display')) {
- Security::check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
-
- $theme = x($_POST, 'theme') ? notags(trim($_POST['theme'])) : $a->user['theme'];
- $mobile_theme = x($_POST, 'mobile_theme') ? notags(trim($_POST['mobile_theme'])) : '';
- $nosmile = x($_POST, 'nosmile') ? intval($_POST['nosmile']) : 0;
- $first_day_of_week = x($_POST, 'first_day_of_week') ? intval($_POST['first_day_of_week']) : 0;
- $noinfo = x($_POST, 'noinfo') ? intval($_POST['noinfo']) : 0;
- $infinite_scroll = x($_POST, 'infinite_scroll') ? intval($_POST['infinite_scroll']) : 0;
- $no_auto_update = x($_POST, 'no_auto_update') ? intval($_POST['no_auto_update']) : 0;
- $bandwidth_saver = x($_POST, 'bandwidth_saver') ? intval($_POST['bandwidth_saver']) : 0;
- $smart_threading = x($_POST, 'smart_threading') ? intval($_POST['smart_threading']) : 0;
- $nowarn_insecure = x($_POST, 'nowarn_insecure') ? intval($_POST['nowarn_insecure']) : 0;
- $browser_update = x($_POST, 'browser_update') ? intval($_POST['browser_update']) : 0;
+ 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;
if ($browser_update != -1) {
$browser_update = $browser_update * 1000;
if ($browser_update < 10000) {
}
}
- $itemspage_network = x($_POST, 'itemspage_network') ? intval($_POST['itemspage_network']) : 40;
+ $itemspage_network = !empty($_POST['itemspage_network']) ? intval($_POST['itemspage_network']) : 40;
if ($itemspage_network > 100) {
$itemspage_network = 100;
}
- $itemspage_mobile_network = x($_POST, 'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20;
+ $itemspage_mobile_network = !empty($_POST['itemspage_mobile_network']) ? intval($_POST['itemspage_mobile_network']) : 20;
if ($itemspage_mobile_network > 100) {
$itemspage_mobile_network = 100;
}
intval(local_user())
);
- Addon::callHooks('display_settings_post', $_POST);
- goaway('settings/display');
+ Hook::callAll('display_settings_post', $_POST);
+ $a->internalRedirect('settings/display');
return; // NOTREACHED
}
- Security::check_form_security_token_redirectOnErr('/settings', 'settings');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
- if (x($_POST,'resend_relocate')) {
+ if (!empty($_POST['resend_relocate'])) {
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
info(L10n::t("Relocate message has been send to your contacts"));
- goaway('settings');
+ $a->internalRedirect('settings');
}
- Addon::callHooks('settings_post', $_POST);
+ Hook::callAll('settings_post', $_POST);
- if (x($_POST, 'password') || x($_POST, 'confirm')) {
+ if (!empty($_POST['password']) || !empty($_POST['confirm'])) {
$newpass = $_POST['password'];
$confirm = $_POST['confirm'];
- $err = false;
- if ($newpass != $confirm) {
- notice(L10n::t('Passwords do not match. Password unchanged.') . EOL);
- $err = true;
- }
-
- if (!x($newpass) || !x($confirm)) {
- notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . 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;
- }
+ try {
+ if ($newpass != $confirm) {
+ throw new Exception(L10n::t('Passwords do not match.'));
+ }
- // 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;
- }
+ // check if the old password was supplied correctly before changing it to the new value
+ User::getIdFromPasswordAuthentication(local_user(), $_POST['opassword']);
- if (!$err) {
$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);
+ if (!DBA::isResult($result)) {
+ throw new Exception(L10n::t('Password update failed. Please try again.'));
}
+
+ info(L10n::t('Password changed.'));
+ } catch (Exception $e) {
+ notice($e->getMessage());
+ notice(L10n::t('Password unchanged.'));
}
}
- $username = ((x($_POST, 'username')) ? notags(trim($_POST['username'])) : '');
- $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : '');
- $timezone = ((x($_POST, 'timezone')) ? notags(trim($_POST['timezone'])) : '');
- $language = ((x($_POST, 'language')) ? notags(trim($_POST['language'])) : '');
-
- $defloc = ((x($_POST, 'defloc')) ? notags(trim($_POST['defloc'])) : '');
- $openid = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
- $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0);
- $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0);
- $def_gid = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0);
-
-
- $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0);
- $expire_notes = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes']) : 0);
- $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
- $expire_photos = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos']) : 0);
- $expire_network_only = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
-
- $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
- $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
- $net_publish = (((x($_POST, 'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
- $old_visibility = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
- $account_type = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
- $page_flags = (((x($_POST, 'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
- $blockwall = (((x($_POST, 'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
- $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
- $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
- $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
- $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
+ $username = (!empty($_POST['username']) ? Strings::escapeTags(trim($_POST['username'])) : '');
+ $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
+ $timezone = (!empty($_POST['timezone']) ? Strings::escapeTags(trim($_POST['timezone'])) : '');
+ $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : '');
+
+ $defloc = (!empty($_POST['defloc']) ? Strings::escapeTags(trim($_POST['defloc'])) : '');
+ $openid = (!empty($_POST['openid_url']) ? Strings::escapeTags(trim($_POST['openid_url'])) : '');
+ $maxreq = (!empty($_POST['maxreq']) ? intval($_POST['maxreq']) : 0);
+ $expire = (!empty($_POST['expire']) ? intval($_POST['expire']) : 0);
+ $def_gid = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0);
+
+
+ $expire_items = (!empty($_POST['expire_items']) ? intval($_POST['expire_items']) : 0);
+ $expire_notes = (!empty($_POST['expire_notes']) ? intval($_POST['expire_notes']) : 0);
+ $expire_starred = (!empty($_POST['expire_starred']) ? intval($_POST['expire_starred']) : 0);
+ $expire_photos = (!empty($_POST['expire_photos'])? intval($_POST['expire_photos']) : 0);
+ $expire_network_only = (!empty($_POST['expire_network_only'])? intval($_POST['expire_network_only']) : 0);
+
+ $allow_location = ((!empty($_POST['allow_location']) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+ $publish = ((!empty($_POST['profile_in_directory']) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+ $net_publish = ((!empty($_POST['profile_in_netdirectory']) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
+ $old_visibility = ((!empty($_POST['visibility']) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
+ $account_type = ((!empty($_POST['account-type']) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
+ $page_flags = ((!empty($_POST['page-flags']) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
+ $blockwall = ((!empty($_POST['blockwall']) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+ $blocktags = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+ $unkmail = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+ $cntunkmail = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
+ $suggestme = (!empty($_POST['suggestme']) ? intval($_POST['suggestme']) : 0);
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
$notify = 0;
- if (x($_POST, 'notify1')) {
+ if (!empty($_POST['notify1'])) {
$notify += intval($_POST['notify1']);
}
- if (x($_POST, 'notify2')) {
+ if (!empty($_POST['notify2'])) {
$notify += intval($_POST['notify2']);
}
- if (x($_POST, 'notify3')) {
+ if (!empty($_POST['notify3'])) {
$notify += intval($_POST['notify3']);
}
- if (x($_POST, 'notify4')) {
+ if (!empty($_POST['notify4'])) {
$notify += intval($_POST['notify4']);
}
- if (x($_POST, 'notify5')) {
+ if (!empty($_POST['notify5'])) {
$notify += intval($_POST['notify5']);
}
- if (x($_POST, 'notify6')) {
+ if (!empty($_POST['notify6'])) {
$notify += intval($_POST['notify6']);
}
- if (x($_POST, 'notify7')) {
+ if (!empty($_POST['notify7'])) {
$notify += intval($_POST['notify7']);
}
- if (x($_POST, 'notify8')) {
+ if (!empty($_POST['notify8'])) {
$notify += intval($_POST['notify8']);
}
$email = $a->user['email'];
}
// check the email is valid
- if (!valid_email($email)) {
+ if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$err .= L10n::t('Invalid email.');
}
// ensure new email is not the admin mail
$str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
$openidserver = $a->user['openidserver'];
- //$openid = normalise_openid($openid);
+ //$openid = Strings::normaliseOpenID($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)))) {
if (Network::isUrlValid($openid)) {
- logger('updating openidserver');
+ Logger::log('updating openidserver');
$open_id_obj = new LightOpenID($a->getHostName());
$open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity);
// Update the global contact for the user
GContact::updateForUser(local_user());
- goaway('settings');
+ $a->internalRedirect('settings');
return; // NOTREACHED
}
return Login::form();
}
- if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+ if (!empty($_SESSION['submanage'])) {
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, [
- '$form_security_token' => Security::get_form_security_token("settings_oauth"),
+ $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'),
}
$app = $r[0];
- $tpl = get_markup_template('settings/oauth_edit.tpl');
- $o .= replace_macros($tpl, [
- '$form_security_token' => Security::get_form_security_token("settings_oauth"),
+ $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'),
}
if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
- Security::check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
- goaway(System::baseUrl(true)."/settings/oauth/");
+ $a->internalRedirect('settings/oauth/', true);
return;
}
local_user());
- $tpl = get_markup_template('settings/oauth.tpl');
- $o .= replace_macros($tpl, [
- '$form_security_token' => Security::get_form_security_token("settings_oauth"),
- '$baseurl' => System::baseUrl(true),
+ $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'),
$settings_addons = L10n::t('No Addon settings configured');
}
- Addon::callHooks('addon_settings', $settings_addons);
+ Hook::callAll('addon_settings', $settings_addons);
- $tpl = get_markup_template('settings/addons.tpl');
- $o .= replace_macros($tpl, [
- '$form_security_token' => Security::get_form_security_token("settings_addon"),
+ $tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
'$title' => L10n::t('Addon Settings'),
'$settings_addons' => $settings_addons
]);
}
}
- $tpl = get_markup_template('settings/features.tpl');
- $o .= replace_macros($tpl, [
- '$form_security_token' => Security::get_form_security_token("settings_features"),
+ $tpl = Renderer::getMarkupTemplate('settings/features.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$form_security_token' => BaseModule::getFormSecurityToken("settings_features"),
'$title' => L10n::t('Additional Features'),
'$features' => $arr,
'$submit' => L10n::t('Save Settings'),
$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?
+ 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) . '">';
}
$settings_connectors = '';
- Addon::callHooks('connector_settings', $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')));
$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);
+ $mail_chk = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
- $tpl = get_markup_template('settings/connectors.tpl');
+ $tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
$mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
- $o .= replace_macros($tpl, [
- '$form_security_token' => Security::get_form_security_token("settings_connectors"),
+ $o .= Renderer::replaceMacros($tpl, [
+ '$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
'$title' => L10n::t('Social Networks'),
'$submit' => L10n::t('Save Settings'),
]);
- Addon::callHooks('display_settings', $o);
+ Hook::callAll('display_settings', $o);
return $o;
}
$theme_config = theme_content($a);
}
- $tpl = get_markup_template('settings/display.tpl');
- $o = replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('settings/display.tpl');
+ $o = Renderer::replaceMacros($tpl, [
'$ptitle' => L10n::t('Display Settings'),
- '$form_security_token' => Security::get_form_security_token("settings_display"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
'$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
($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 = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
- $pagetype = replace_macros($pageset_tpl, [
+ $pagetype = Renderer::replaceMacros($pageset_tpl, [
'$account_types' => L10n::t("Account Types"),
'$user' => L10n::t("Personal Page Subtypes"),
'$community' => L10n::t("Community Forum Subtypes"),
$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");
+ $opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl");
if (Config::get('system', 'publish_all')) {
$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
} else {
- $profile_in_dir = replace_macros($opt_tpl, [
+ $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')]]
]);
}
if (strlen(Config::get('system', 'directory'))) {
- $profile_in_net_dir = replace_macros($opt_tpl, [
+ $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('No'), L10n::t('Yes')]]
]);
} else {
$profile_in_net_dir = '';
}
- $hide_friends = replace_macros($opt_tpl, [
+ $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')]],
]);
- $hide_wall = replace_macros($opt_tpl, [
+ $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')]],
]);
- $blockwall = replace_macros($opt_tpl, [
+ $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')]],
]);
- $blocktags = replace_macros($opt_tpl, [
+ $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')]],
]);
- $suggestme = replace_macros($opt_tpl, [
+ $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')]],
]);
- $unkmail = replace_macros($opt_tpl, [
+ $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')]],
]);
info(L10n::t('Profile is <strong>not published</strong>.') . EOL);
}
- $tpl_addr = get_markup_template('settings/nick_set.tpl');
+ $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl');
- $prof_addr = replace_macros($tpl_addr,[
+ $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()
]);
- $stpl = get_markup_template('settings/settings.tpl');
+ $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')],
$lang_choices = L10n::getAvailableLanguages();
/// @TODO Fix indending (or so)
- $o .= replace_macros($stpl, [
+ $o .= Renderer::replaceMacros($stpl, [
'$ptitle' => L10n::t('Account Settings'),
'$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
- '$form_security_token' => Security::get_form_security_token("settings"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("settings"),
'$nickname_block' => $prof_addr,
'$h_pass' => L10n::t('Password Settings'),
- '$password1'=> ['password', L10n::t('New Password:'), '', ''],
+ '$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')],
]);
- Addon::callHooks('settings_form', $o);
+ Hook::callAll('settings_form', $o);
$o .= '</form>' . "\r\n";
projects / friendica.git / blobdiff