From 64330f9895b75fbaac43731fca61521aadb2ce0f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 23 Apr 2022 07:19:58 -0400 Subject: [PATCH 1/4] Move /settings to src/ --- mod/settings.php | 495 --------------------------- src/Module/Settings/Account.php | 583 ++++++++++++++++++++++++++++++++ static/routes.config.php | 1 + 3 files changed, 584 insertions(+), 495 deletions(-) create mode 100644 src/Module/Settings/Account.php diff --git a/mod/settings.php b/mod/settings.php index b23bf654f4..04a9e3fd3b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -149,273 +149,8 @@ function settings_post(App $a) } return; } - - BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings'); - - // Import Contacts from CSV file - if (!empty($_POST['importcontact-submit'])) { - if (isset($_FILES['importcontact-filename'])) { - // was there an error - if ($_FILES['importcontact-filename']['error'] > 0) { - Logger::notice('Contact CSV file upload error', ['error' => $_FILES['importcontact-filename']['error']]); - notice(DI::l10n()->t('Contact CSV file upload error')); - } else { - $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name'])); - Logger::notice('Import started', ['lines' => count($csvArray)]); - // import contacts - foreach ($csvArray as $csvRow) { - // The 1st row may, or may not contain the headers of the table - // We expect the 1st field of the row to contain either the URL - // or the handle of the account, therefore we check for either - // "http" or "@" to be present in the string. - // All other fields from the row will be ignored - if ((strpos($csvRow[0],'@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { - Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); - } else { - Logger::notice('Invalid account', ['url' => $csvRow[0]]); - } - } - Logger::notice('Import done'); - - info(DI::l10n()->t('Importing Contacts done')); - // delete temp file - unlink($_FILES['importcontact-filename']['tmp_name']); - } - } else { - Logger::notice('Import triggered, but no import file was found.'); - } - - return; - } - - if (!empty($_POST['resend_relocate'])) { - Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user()); - info(DI::l10n()->t("Relocate message has been send to your contacts")); - DI::baseUrl()->redirect('settings'); - } - - Hook::callAll('settings_post', $_POST); - - if (!empty($_POST['password']) || !empty($_POST['confirm'])) { - $newpass = $_POST['password']; - $confirm = $_POST['confirm']; - - try { - if ($newpass != $confirm) { - throw new Exception(DI::l10n()->t('Passwords do not match.')); - } - - // check if the old password was supplied correctly before changing it to the new value - User::getIdFromPasswordAuthentication(local_user(), $_POST['opassword']); - - $result = User::updatePassword(local_user(), $newpass); - if (!DBA::isResult($result)) { - throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); - } - - info(DI::l10n()->t('Password changed.')); - } catch (Exception $e) { - notice($e->getMessage()); - notice(DI::l10n()->t('Password unchanged.')); - } - } - - $username = (!empty($_POST['username']) ? trim($_POST['username']) : ''); - $email = (!empty($_POST['email']) ? trim($_POST['email']) : ''); - $timezone = (!empty($_POST['timezone']) ? trim($_POST['timezone']) : ''); - $language = (!empty($_POST['language']) ? trim($_POST['language']) : ''); - - $defloc = (!empty($_POST['defloc']) ? trim($_POST['defloc']) : ''); - $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); - - $delete_openid = ((!empty($_POST['delete_openid']) && (intval($_POST['delete_openid']) == 1)) ? 1: 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); - $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); - $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); - $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); - $unlisted = (($_POST['unlisted'] == 1) ? 1: 0); - $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0); - - $notify_like = (($_POST['notify_like'] == 1) ? 1 : 0); - $notify_announce = (($_POST['notify_announce'] == 1) ? 1 : 0); - - $email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0); - $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0); - - $notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0); - - $notify = 0; - - if (!empty($_POST['notify1'])) { - $notify += intval($_POST['notify1']); - } - if (!empty($_POST['notify2'])) { - $notify += intval($_POST['notify2']); - } - if (!empty($_POST['notify3'])) { - $notify += intval($_POST['notify3']); - } - if (!empty($_POST['notify4'])) { - $notify += intval($_POST['notify4']); - } - if (!empty($_POST['notify5'])) { - $notify += intval($_POST['notify5']); - } - if (!empty($_POST['notify6'])) { - $notify += intval($_POST['notify6']); - } - if (!empty($_POST['notify7'])) { - $notify += intval($_POST['notify7']); - } - if (!empty($_POST['notify8'])) { - $notify += intval($_POST['notify8']); - } - - // Adjust the page flag if the account type doesn't fit to the page flag. - if (($account_type == User::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) { - $page_flags = User::PAGE_FLAGS_NORMAL; - } elseif (($account_type == User::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) { - $page_flags = User::PAGE_FLAGS_SOAPBOX; - } elseif (($account_type == User::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [User::PAGE_FLAGS_SOAPBOX])) { - $page_flags = User::PAGE_FLAGS_SOAPBOX; - } elseif (($account_type == User::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { - $page_flags = User::PAGE_FLAGS_COMMUNITY; - } - - $err = ''; - - if ($username != $user['username']) { - if (strlen($username) > 40) { - $err .= DI::l10n()->t('Please use a shorter name.'); - } - if (strlen($username) < 3) { - $err .= DI::l10n()->t('Name too short.'); - } - } - - if ($email != $user['email']) { - // check for the correct password - try { - User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']); - } catch (Exception $ex) { - $err .= DI::l10n()->t('Wrong Password.'); - $email = $user['email']; - } - // check the email is valid - if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { - $err .= DI::l10n()->t('Invalid email.'); - } - // ensure new email is not the admin mail - if (DI::config()->get('config', 'admin_email')) { - $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email')))); - if (in_array(strtolower($email), $adminlist)) { - $err .= DI::l10n()->t('Cannot change to that email.'); - $email = $user['email']; - } - } - } - - if (strlen($err)) { - notice($err); - return; - } - - if (($timezone != $user['timezone']) && strlen($timezone)) { - $a->setTimeZone($timezone); - } - - $aclFormatter = DI::aclFormatter(); - - $str_group_allow = !empty($_POST['group_allow']) ? $aclFormatter->toString($_POST['group_allow']) : ''; - $str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : ''; - $str_group_deny = !empty($_POST['group_deny']) ? $aclFormatter->toString($_POST['group_deny']) : ''; - $str_contact_deny = !empty($_POST['contact_deny']) ? $aclFormatter->toString($_POST['contact_deny']) : ''; - - DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items); - DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes); - DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred); - DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos); - DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); - - // Reset like notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_like') && $notify_like) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::LIKE)]); - } - - DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); - - // Reset share notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_announce') && $notify_announce) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); - } - - DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); - - DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly); - DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif); - DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored); - DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted); - DI::pConfig()->set(local_user(), 'system', 'accessible-photos', $accessiblephotos); - - if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) { - $str_group_allow = ''; - $str_contact_allow = ''; - $str_group_deny = ''; - $str_contact_deny = ''; - - DI::pConfig()->set(local_user(), 'system', 'unlisted', true); - - $blockwall = true; - $blocktags = true; - $hide_friends = true; - } - - if ($page_flags == User::PAGE_FLAGS_PRVGROUP) { - $str_group_allow = '<' . Group::FOLLOWERS . '>'; - } - - $fields = ['username' => $username, 'email' => $email, 'timezone' => $timezone, - 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny, - 'notify-flags' => $notify, 'page-flags' => $page_flags, 'account-type' => $account_type, 'default-location' => $defloc, - 'allow_location' => $allow_location, 'maxreq' => $maxreq, 'expire' => $expire, 'def_gid' => $def_gid, 'blockwall' => $blockwall, - 'hidewall' => $hidewall, 'blocktags' => $blocktags, 'unkmail' => $unkmail, 'cntunkmail' => $cntunkmail, 'language' => $language]; - - if ($delete_openid) { - $fields['openid'] = ''; - $fields['openidserver'] = ''; - } - - $profile_fields = ['publish' => $publish, 'net-publish' => $net_publish, 'hide-friends' => $hide_friends]; - - if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) { - notice(DI::l10n()->t('Settings were not updated.')); - } - - // clear session language - unset($_SESSION['language']); - - DI::baseUrl()->redirect('settings'); - return; // NOTREACHED } - function settings_content(App $a) { $o = ''; @@ -629,234 +364,4 @@ function settings_content(App $a) Hook::callAll('display_settings', $o); return $o; } - - /* - * ACCOUNT SETTINGS - */ - - $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]); - if (!DBA::isResult($profile)) { - notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.')); - return ''; - } - - $user = User::getById($a->getLoggedInUserId()); - - $username = $user['username']; - $email = $user['email']; - $nickname = $a->getLoggedInUserNickname(); - $timezone = $user['timezone']; - $language = $user['language']; - $notify = $user['notify-flags']; - $defloc = $user['default-location']; - $openid = $user['openid']; - $maxreq = $user['maxreq']; - $expire = ((intval($user['expire'])) ? $user['expire'] : ''); - $unkmail = $user['unkmail']; - $cntunkmail = $user['cntunkmail']; - - $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true); - $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true); - $expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true); - $expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false); - $expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false); - - if (!strlen($user['timezone'])) { - $timezone = $a->getTimeZone(); - } - - // 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($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]) && - ($user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY)) - $user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY; - - $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl'); - - $pagetype = Renderer::replaceMacros($pageset_tpl, [ - '$account_types' => DI::l10n()->t("Account Types"), - '$user' => DI::l10n()->t("Personal Page Subtypes"), - '$community' => DI::l10n()->t("Community Forum Subtypes"), - '$account_type' => $user['account-type'], - '$type_person' => User::ACCOUNT_TYPE_PERSON, - '$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION, - '$type_news' => User::ACCOUNT_TYPE_NEWS, - '$type_community' => User::ACCOUNT_TYPE_COMMUNITY, - - '$account_person' => ['account-type', DI::l10n()->t('Personal Page'), User::ACCOUNT_TYPE_PERSON, - DI::l10n()->t('Account for a personal profile.'), - ($user['account-type'] == User::ACCOUNT_TYPE_PERSON)], - - '$account_organisation' => ['account-type', DI::l10n()->t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION, - DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'), - ($user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)], - - '$account_news' => ['account-type', DI::l10n()->t('News Page'), User::ACCOUNT_TYPE_NEWS, - DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'), - ($user['account-type'] == User::ACCOUNT_TYPE_NEWS)], - - '$account_community' => ['account-type', DI::l10n()->t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY, - DI::l10n()->t('Account for community discussions.'), - ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)], - - '$page_normal' => ['page-flags', DI::l10n()->t('Normal Account Page'), User::PAGE_FLAGS_NORMAL, - DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), - ($user['page-flags'] == User::PAGE_FLAGS_NORMAL)], - - '$page_soapbox' => ['page-flags', DI::l10n()->t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX, - DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'), - ($user['page-flags'] == User::PAGE_FLAGS_SOAPBOX)], - - '$page_community' => ['page-flags', DI::l10n()->t('Public Forum'), User::PAGE_FLAGS_COMMUNITY, - DI::l10n()->t('Automatically approves all contact requests.'), - ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY)], - - '$page_freelove' => ['page-flags', DI::l10n()->t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE, - DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'), - ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE)], - - '$page_prvgroup' => ['page-flags', DI::l10n()->t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP, - DI::l10n()->t('Requires manual approval of contact requests.'), - ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP)], - - - ]); - - $noid = DI::config()->get('system', 'no_openid'); - - if ($noid) { - $openid_field = false; - } else { - $openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"]; - } - - $opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl"); - if (DI::config()->get('system', 'publish_all')) { - $profile_in_dir = ''; - } else { - $profile_in_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_directory', DI::l10n()->t('Publish your profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory')] - ]); - } - - $net_pub_desc = ''; - if (strlen(DI::config()->get('system', 'directory'))) { - $net_pub_desc = ' ' . DI::l10n()->t('Your profile will also be published in the global friendica directories (e.g. %s).', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory')); - } - - $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); - - $prof_addr = Renderer::replaceMacros($tpl_addr,[ - '$desc' => DI::l10n()->t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), - '$basepath' => DI::baseUrl()->getHostname() - ]); - - $stpl = Renderer::getMarkupTemplate('settings/settings.tpl'); - - /* Installed langs */ - $lang_choices = DI::l10n()->getAvailableLanguages(); - - /// @TODO Fix indending (or so) - $o .= Renderer::replaceMacros($stpl, [ - '$ptitle' => DI::l10n()->t('Account Settings'), - - '$submit' => DI::l10n()->t('Save Settings'), - '$baseurl' => DI::baseUrl()->get(true), - '$uid' => local_user(), - '$form_security_token' => BaseModule::getFormSecurityToken("settings"), - '$nickname_block' => $prof_addr, - - '$h_pass' => DI::l10n()->t('Password Settings'), - '$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'), false, 'autocomplete="off"'], - '$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing'), false, 'autocomplete="off"'], - '$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes'), false, 'autocomplete="off"'], - '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address'), false, 'autocomplete="off"'], - '$oid_enable' => (!DI::config()->get('system', 'no_openid')), - '$openid' => $openid_field, - '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''], - - '$h_basic' => DI::l10n()->t('Basic Settings'), - '$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'], - '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'], - '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], - '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], - '$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''], - '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($user['allow_location'] == 1), ''], - - '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), - '$is_community' => ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), - '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")], - '$profile_in_dir' => $profile_in_dir, - '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc], - '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], - '$hide_wall' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')], - '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], - '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], - '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), - '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''), - '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], - '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")], - '$group_select' => Group::displayGroupSelection(local_user(), $user['def_gid']), - '$permissions' => DI::l10n()->t('Default Post Permissions'), - '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), - - '$expire' => [ - 'label' => DI::l10n()->t('Expiration settings'), - 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], - 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')], - 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')], - 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')], - 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')], - 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')], - ], - - '$h_not' => DI::l10n()->t('Notification Settings'), - '$lbl_not' => DI::l10n()->t('Send a notification email when:'), - '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''], - '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''], - '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''], - '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''], - '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''], - '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''], - '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''], - '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''], - - '$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'), - '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''], - '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''], - - '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], - - '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'), - DI::pConfig()->get(local_user(), 'system', 'email_textonly'), - DI::l10n()->t('Send text only notification emails, without the html part')], - - '$detailed_notif' => ['detailed_notif', DI::l10n()->t('Show detailled notifications'), - DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), - DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')], - - '$notify_ignored' => ['notify_ignored', DI::l10n()->t('Show notifications of ignored contacts') , - DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true), - DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.")], - - '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'), - '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'), - '$pagetype' => $pagetype, - - '$importcontact' => DI::l10n()->t('Import Contacts'), - '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), - '$importcontact_button' => DI::l10n()->t('Upload File'), - '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720), - '$relocate' => DI::l10n()->t('Relocate'), - '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."), - '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"), - - ]); - - Hook::callAll('settings_form', $o); - - $o .= '' . "\r\n"; - - return $o; - } diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php new file mode 100644 index 0000000000..62a497217d --- /dev/null +++ b/src/Module/Settings/Account.php @@ -0,0 +1,583 @@ +. + * + */ + +namespace Friendica\Module\Settings; + +use Exception; +use Friendica\BaseModule; +use Friendica\Core\ACL; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\Core\Worker; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Group; +use Friendica\Model\Notification; +use Friendica\Model\Profile; +use Friendica\Model\User; +use Friendica\Model\Verb; +use Friendica\Module\BaseSettings; +use Friendica\Network\HTTPException; +use Friendica\Protocol\Activity; +use Friendica\Util\Temporal; +use Friendica\Worker\Delivery; + +class Account extends BaseSettings +{ + protected function post(array $request = []) + { + if (!DI::app()->isLoggedIn()) { + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); + } + + self::checkFormSecurityTokenRedirectOnError('/settings', 'settings'); + + $a = DI::app(); + + $user = User::getById($a->getLoggedInUserId()); + + // Import Contacts from CSV file + if (!empty($_POST['importcontact-submit'])) { + if (isset($_FILES['importcontact-filename'])) { + // was there an error + if ($_FILES['importcontact-filename']['error'] > 0) { + Logger::notice('Contact CSV file upload error', ['error' => $_FILES['importcontact-filename']['error']]); + notice(DI::l10n()->t('Contact CSV file upload error')); + } else { + $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name'])); + Logger::notice('Import started', ['lines' => count($csvArray)]); + // import contacts + foreach ($csvArray as $csvRow) { + // The 1st row may, or may not contain the headers of the table + // We expect the 1st field of the row to contain either the URL + // or the handle of the account, therefore we check for either + // "http" or "@" to be present in the string. + // All other fields from the row will be ignored + if ((strpos($csvRow[0],'@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { + Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); + } else { + Logger::notice('Invalid account', ['url' => $csvRow[0]]); + } + } + Logger::notice('Import done'); + + info(DI::l10n()->t('Importing Contacts done')); + // delete temp file + unlink($_FILES['importcontact-filename']['tmp_name']); + } + } else { + Logger::notice('Import triggered, but no import file was found.'); + } + + return; + } + + if (!empty($_POST['resend_relocate'])) { + Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user()); + info(DI::l10n()->t("Relocate message has been send to your contacts")); + DI::baseUrl()->redirect('settings'); + } + + Hook::callAll('settings_post', $_POST); + + if (!empty($_POST['password']) || !empty($_POST['confirm'])) { + $newpass = $_POST['password']; + $confirm = $_POST['confirm']; + + try { + if ($newpass != $confirm) { + throw new Exception(DI::l10n()->t('Passwords do not match.')); + } + + // check if the old password was supplied correctly before changing it to the new value + User::getIdFromPasswordAuthentication(local_user(), $_POST['opassword']); + + $result = User::updatePassword(local_user(), $newpass); + if (!DBA::isResult($result)) { + throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); + } + + info(DI::l10n()->t('Password changed.')); + } catch (Exception $e) { + notice($e->getMessage()); + notice(DI::l10n()->t('Password unchanged.')); + } + } + + $username = (!empty($_POST['username']) ? trim($_POST['username']) : ''); + $email = (!empty($_POST['email']) ? trim($_POST['email']) : ''); + $timezone = (!empty($_POST['timezone']) ? trim($_POST['timezone']) : ''); + $language = (!empty($_POST['language']) ? trim($_POST['language']) : ''); + + $defloc = (!empty($_POST['defloc']) ? trim($_POST['defloc']) : ''); + $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); + + $delete_openid = ((!empty($_POST['delete_openid']) && (intval($_POST['delete_openid']) == 1)) ? 1: 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); + $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); + $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); + $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); + $unlisted = (($_POST['unlisted'] == 1) ? 1: 0); + $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0); + + $notify_like = (($_POST['notify_like'] == 1) ? 1 : 0); + $notify_announce = (($_POST['notify_announce'] == 1) ? 1 : 0); + + $email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0); + $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0); + + $notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0); + + $notify = 0; + + if (!empty($_POST['notify1'])) { + $notify += intval($_POST['notify1']); + } + if (!empty($_POST['notify2'])) { + $notify += intval($_POST['notify2']); + } + if (!empty($_POST['notify3'])) { + $notify += intval($_POST['notify3']); + } + if (!empty($_POST['notify4'])) { + $notify += intval($_POST['notify4']); + } + if (!empty($_POST['notify5'])) { + $notify += intval($_POST['notify5']); + } + if (!empty($_POST['notify6'])) { + $notify += intval($_POST['notify6']); + } + if (!empty($_POST['notify7'])) { + $notify += intval($_POST['notify7']); + } + if (!empty($_POST['notify8'])) { + $notify += intval($_POST['notify8']); + } + + // Adjust the page flag if the account type doesn't fit to the page flag. + if ($account_type == User::ACCOUNT_TYPE_PERSON && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) { + $page_flags = User::PAGE_FLAGS_NORMAL; + } elseif ($account_type == User::ACCOUNT_TYPE_ORGANISATION && $page_flags != User::PAGE_FLAGS_SOAPBOX) { + $page_flags = User::PAGE_FLAGS_SOAPBOX; + } elseif ($account_type == User::ACCOUNT_TYPE_NEWS && $page_flags != User::PAGE_FLAGS_SOAPBOX) { + $page_flags = User::PAGE_FLAGS_SOAPBOX; + } elseif ($account_type == User::ACCOUNT_TYPE_COMMUNITY && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { + $page_flags = User::PAGE_FLAGS_COMMUNITY; + } + + $err = ''; + + if ($username != $user['username']) { + if (strlen($username) > 40) { + $err .= DI::l10n()->t('Please use a shorter name.'); + } + if (strlen($username) < 3) { + $err .= DI::l10n()->t('Name too short.'); + } + } + + if ($email != $user['email']) { + // check for the correct password + try { + User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']); + } catch (Exception $ex) { + $err .= DI::l10n()->t('Wrong Password.'); + $email = $user['email']; + } + // check the email is valid + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $err .= DI::l10n()->t('Invalid email.'); + } + // ensure new email is not the admin mail + if (DI::config()->get('config', 'admin_email')) { + $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email')))); + if (in_array(strtolower($email), $adminlist)) { + $err .= DI::l10n()->t('Cannot change to that email.'); + $email = $user['email']; + } + } + } + + if (strlen($err)) { + notice($err); + return; + } + + if (($timezone != $user['timezone']) && strlen($timezone)) { + $a->setTimeZone($timezone); + } + + $aclFormatter = DI::aclFormatter(); + + $str_group_allow = !empty($_POST['group_allow']) ? $aclFormatter->toString($_POST['group_allow']) : ''; + $str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : ''; + $str_group_deny = !empty($_POST['group_deny']) ? $aclFormatter->toString($_POST['group_deny']) : ''; + $str_contact_deny = !empty($_POST['contact_deny']) ? $aclFormatter->toString($_POST['contact_deny']) : ''; + + DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items); + DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes); + DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred); + DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos); + DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); + + // Reset like notifications when they are going to be shown again + if (!DI::pConfig()->get(local_user(), 'system', 'notify_like') && $notify_like) { + DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::LIKE)]); + } + + DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); + + // Reset share notifications when they are going to be shown again + if (!DI::pConfig()->get(local_user(), 'system', 'notify_announce') && $notify_announce) { + DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); + } + + DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); + + DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly); + DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif); + DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored); + DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted); + DI::pConfig()->set(local_user(), 'system', 'accessible-photos', $accessiblephotos); + + if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) { + $str_group_allow = ''; + $str_contact_allow = ''; + $str_group_deny = ''; + $str_contact_deny = ''; + + DI::pConfig()->set(local_user(), 'system', 'unlisted', true); + + $blockwall = true; + $blocktags = true; + $hide_friends = true; + } + + if ($page_flags == User::PAGE_FLAGS_PRVGROUP) { + $str_group_allow = '<' . Group::FOLLOWERS . '>'; + } + + $fields = ['username' => $username, 'email' => $email, 'timezone' => $timezone, + 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny, + 'notify-flags' => $notify, 'page-flags' => $page_flags, 'account-type' => $account_type, 'default-location' => $defloc, + 'allow_location' => $allow_location, 'maxreq' => $maxreq, 'expire' => $expire, 'def_gid' => $def_gid, 'blockwall' => $blockwall, + 'hidewall' => $hidewall, 'blocktags' => $blocktags, 'unkmail' => $unkmail, 'cntunkmail' => $cntunkmail, 'language' => $language]; + + if ($delete_openid) { + $fields['openid'] = ''; + $fields['openidserver'] = ''; + } + + $profile_fields = ['publish' => $publish, 'net-publish' => $net_publish, 'hide-friends' => $hide_friends]; + + if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + // clear session language + unset($_SESSION['language']); + + DI::baseUrl()->redirect('settings'); + } + + protected function content(array $request = []): string + { + parent::content(); + + if (!local_user()) { + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); + } + + $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]); + if (!DBA::isResult($profile)) { + notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.')); + return ''; + } + + $a = DI::app(); + + $user = User::getById($a->getLoggedInUserId()); + + $username = $user['username']; + $email = $user['email']; + $nickname = $a->getLoggedInUserNickname(); + $timezone = $user['timezone']; + $language = $user['language']; + $notify = $user['notify-flags']; + $defloc = $user['default-location']; + $openid = $user['openid']; + $maxreq = $user['maxreq']; + $expire = (intval($user['expire'])) ? $user['expire'] : ''; + $unkmail = $user['unkmail']; + $cntunkmail = $user['cntunkmail']; + + $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true); + $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true); + $expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true); + $expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false); + $expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false); + + if (!strlen($user['timezone'])) { + $timezone = $a->getTimeZone(); + } + + // 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($user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]) + && $user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY + ) { + $user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY; + } + + + $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl'); + + $pagetype = Renderer::replaceMacros($pageset_tpl, [ + '$account_types' => DI::l10n()->t("Account Types"), + '$user' => DI::l10n()->t("Personal Page Subtypes"), + '$community' => DI::l10n()->t("Community Forum Subtypes"), + '$account_type' => $user['account-type'], + '$type_person' => User::ACCOUNT_TYPE_PERSON, + '$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION, + '$type_news' => User::ACCOUNT_TYPE_NEWS, + '$type_community' => User::ACCOUNT_TYPE_COMMUNITY, + '$account_person' => [ + 'account-type', + DI::l10n()->t('Personal Page'), + User::ACCOUNT_TYPE_PERSON, + DI::l10n()->t('Account for a personal profile.'), + $user['account-type'] == User::ACCOUNT_TYPE_PERSON + ], + '$account_organisation' => [ + 'account-type', + DI::l10n()->t('Organisation Page'), + User::ACCOUNT_TYPE_ORGANISATION, + DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'), + $user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION + ], + '$account_news' => [ + 'account-type', + DI::l10n()->t('News Page'), + User::ACCOUNT_TYPE_NEWS, + DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'), + $user['account-type'] == User::ACCOUNT_TYPE_NEWS + ], + '$account_community' => [ + 'account-type', + DI::l10n()->t('Community Forum'), + User::ACCOUNT_TYPE_COMMUNITY, + DI::l10n()->t('Account for community discussions.'), + $user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY + ], + '$page_normal' => [ + 'page-flags', + DI::l10n()->t('Normal Account Page'), + User::PAGE_FLAGS_NORMAL, + DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), + $user['page-flags'] == User::PAGE_FLAGS_NORMAL + ], + '$page_soapbox' => [ + 'page-flags', + DI::l10n()->t('Soapbox Page'), + User::PAGE_FLAGS_SOAPBOX, + DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'), + $user['page-flags'] == User::PAGE_FLAGS_SOAPBOX + ], + '$page_community' => [ + 'page-flags', + DI::l10n()->t('Public Forum'), + User::PAGE_FLAGS_COMMUNITY, + DI::l10n()->t('Automatically approves all contact requests.'), + $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY + ], + '$page_freelove' => [ + 'page-flags', + DI::l10n()->t('Automatic Friend Page'), + User::PAGE_FLAGS_FREELOVE, + DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'), + $user['page-flags'] == User::PAGE_FLAGS_FREELOVE + ], + '$page_prvgroup' => [ + 'page-flags', + DI::l10n()->t('Private Forum [Experimental]'), + User::PAGE_FLAGS_PRVGROUP, + DI::l10n()->t('Requires manual approval of contact requests.'), + $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP + ], + ]); + + $noid = DI::config()->get('system', 'no_openid'); + + if ($noid) { + $openid_field = false; + } else { + $openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("(Optional) Allow this OpenID to login to this account."), "", "readonly", "url"]; + } + + $opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl"); + if (DI::config()->get('system', 'publish_all')) { + $profile_in_dir = ''; + } else { + $profile_in_dir = Renderer::replaceMacros($opt_tpl, [ + '$field' => ['profile_in_directory', DI::l10n()->t('Publish your profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory')] + ]); + } + + $net_pub_desc = ''; + if (strlen(DI::config()->get('system', 'directory'))) { + $net_pub_desc = ' ' . DI::l10n()->t('Your profile will also be published in the global friendica directories (e.g. %s).', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory')); + } + + $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); + + $prof_addr = Renderer::replaceMacros($tpl_addr,[ + '$desc' => DI::l10n()->t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), + '$basepath' => DI::baseUrl()->getHostname() + ]); + + $stpl = Renderer::getMarkupTemplate('settings/settings.tpl'); + + /* Installed langs */ + $lang_choices = DI::l10n()->getAvailableLanguages(); + + /// @TODO Fix indending (or so) + $o = Renderer::replaceMacros($stpl, [ + '$ptitle' => DI::l10n()->t('Account Settings'), + + '$submit' => DI::l10n()->t('Save Settings'), + '$baseurl' => DI::baseUrl()->get(true), + '$uid' => local_user(), + '$form_security_token' => BaseModule::getFormSecurityToken("settings"), + '$nickname_block' => $prof_addr, + + '$h_pass' => DI::l10n()->t('Password Settings'), + '$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'), false, 'autocomplete="off"'], + '$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing'), false, 'autocomplete="off"'], + '$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes'), false, 'autocomplete="off"'], + '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address'), false, 'autocomplete="off"'], + '$oid_enable' => (!DI::config()->get('system', 'no_openid')), + '$openid' => $openid_field, + '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''], + + '$h_basic' => DI::l10n()->t('Basic Settings'), + '$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'], + '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'], + '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], + '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], + '$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''], + '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($user['allow_location'] == 1), ''], + + '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), + '$is_community' => ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), + '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("(to prevent spam abuse)")], + '$profile_in_dir' => $profile_in_dir, + '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc], + '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], + '$hide_wall' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')], + '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], + '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], + '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], + '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], + '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], + '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("(to prevent spam abuse)")], + '$group_select' => Group::displayGroupSelection(local_user(), $user['def_gid']), + '$permissions' => DI::l10n()->t('Default Post Permissions'), + '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), + + '$expire' => [ + 'label' => DI::l10n()->t('Expiration settings'), + 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], + 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')], + 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')], + 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')], + 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')], + 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')], + ], + + '$h_not' => DI::l10n()->t('Notification Settings'), + '$lbl_not' => DI::l10n()->t('Send a notification email when:'), + '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''], + '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''], + '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''], + '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''], + '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''], + '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''], + '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''], + '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''], + + '$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'), + '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''], + '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''], + + '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], + + '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'), + DI::pConfig()->get(local_user(), 'system', 'email_textonly'), + DI::l10n()->t('Send text only notification emails, without the html part')], + + '$detailed_notif' => ['detailed_notif', DI::l10n()->t('Show detailled notifications'), + DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), + DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')], + + '$notify_ignored' => ['notify_ignored', DI::l10n()->t('Show notifications of ignored contacts') , + DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true), + DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.")], + + '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'), + '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'), + '$pagetype' => $pagetype, + + '$importcontact' => DI::l10n()->t('Import Contacts'), + '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), + '$importcontact_button' => DI::l10n()->t('Upload File'), + '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720), + '$relocate' => DI::l10n()->t('Relocate'), + '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."), + '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"), + ]); + + Hook::callAll('settings_form', $o); + + $o .= '' . "\r\n"; + + return $o; + } +} diff --git a/static/routes.config.php b/static/routes.config.php index 385fcef9bb..0a37637786 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -544,6 +544,7 @@ return [ ], '/settings' => [ + '[/]' => [Module\Settings\Account::class, [R::GET, R::POST]], '/2fa' => [ '[/]' => [Module\Settings\TwoFactor\Index::class, [R::GET, R::POST]], '/recovery' => [Module\Settings\TwoFactor\Recovery::class, [R::GET, R::POST]], From 90368d7484470f2b4c04e11f550f1cf92afa7808 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 23 Apr 2022 10:56:26 -0400 Subject: [PATCH 2/4] Remove unused settings_post and settings_form hooks - Addons should use the addon_form hook instead --- doc/Addons.md | 10 ---------- doc/de/Addons.md | 8 -------- src/Module/Settings/Account.php | 10 +--------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/doc/Addons.md b/doc/Addons.md index ce8412547a..3dca703132 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -232,14 +232,6 @@ Please note: body contents are bbcode - not HTML Called when receiving a post from another source. This may also be used to post local activity or system generated messages. `$b` is the item array of information to be stored in the database and the item body is bbcode. -### settings_form -Called when generating the HTML for the user Settings page. -`$b` is the HTML string of the settings page before the final `` tag. - -### settings_post -Called when the Settings pages are submitted. -`$b` is the $_POST array. - ### addon_settings Called when generating the HTML for the addon settings page. `$data` is an array containing: @@ -750,11 +742,9 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep- Hook::callAll('addon_settings_post', $_POST); Hook::callAll('connector_settings_post', $_POST); Hook::callAll('display_settings_post', $_POST); - Hook::callAll('settings_post', $_POST); Hook::callAll('addon_settings', $settings_addons); Hook::callAll('connector_settings', $settings_connectors); Hook::callAll('display_settings', $o); - Hook::callAll('settings_form', $o); ### mod/photos.php diff --git a/doc/de/Addons.md b/doc/de/Addons.md index 32e69a2fd7..163426604a 100644 --- a/doc/de/Addons.md +++ b/doc/de/Addons.md @@ -106,12 +106,6 @@ Derzeitige Hooks $b ist das Item-Array einer Information, die in der Datenbank und im Item gespeichert ist. {Bitte beachte: der Seiteninhalt ist bbcode - nicht HTML) -**'settings_form'** - wird aufgerufen, wenn die HTML-Ausgabe für die Einstellungsseite generiert wird. - $b ist die HTML-Ausgabe (String) der Einstellungsseite vor dem finalen ""-Tag. - -**'settings_post'** - wird aufgerufen, wenn die Einstellungsseiten geladen werden. - $b ist der $_POST-Array - **'addon_settings'** - wird aufgerufen, wenn die HTML-Ausgabe der Addon-Einstellungsseite generiert wird. $b ist die HTML-Ausgabe (String) der Addon-Einstellungsseite vor dem finalen ""-Tag. @@ -267,11 +261,9 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap Hook::callAll('addon_settings_post', $_POST); Hook::callAll('connector_settings_post', $_POST); Hook::callAll('display_settings_post', $_POST); - Hook::callAll('settings_post', $_POST); Hook::callAll('addon_settings', $settings_addons); Hook::callAll('connector_settings', $settings_connectors); Hook::callAll('display_settings', $o); - Hook::callAll('settings_form', $o); ### mod/photos.php diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index 62a497217d..f5bc5fa62b 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -22,9 +22,7 @@ namespace Friendica\Module\Settings; use Exception; -use Friendica\BaseModule; use Friendica\Core\ACL; -use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Worker; @@ -97,8 +95,6 @@ class Account extends BaseSettings DI::baseUrl()->redirect('settings'); } - Hook::callAll('settings_post', $_POST); - if (!empty($_POST['password']) || !empty($_POST['confirm'])) { $newpass = $_POST['password']; $confirm = $_POST['confirm']; @@ -485,7 +481,7 @@ class Account extends BaseSettings '$submit' => DI::l10n()->t('Save Settings'), '$baseurl' => DI::baseUrl()->get(true), '$uid' => local_user(), - '$form_security_token' => BaseModule::getFormSecurityToken("settings"), + '$form_security_token' => self::getFormSecurityToken('settings'), '$nickname_block' => $prof_addr, '$h_pass' => DI::l10n()->t('Password Settings'), @@ -574,10 +570,6 @@ class Account extends BaseSettings '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"), ]); - Hook::callAll('settings_form', $o); - - $o .= '' . "\r\n"; - return $o; } } From 967c438312d2540eeb9e812d15b3e3fde3b1e4c1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 24 Apr 2022 01:21:15 -0400 Subject: [PATCH 3/4] Enclose account settings panels in separate forms - This prevents auto-filled password fields to abort settings save - Move single-use settings/nick_set template HTML to settings/account --- CHANGELOG | 2 + src/Module/Settings/Account.php | 699 ++++++++++-------- static/routes.config.php | 6 +- .../settings/{settings.tpl => account.tpl} | 88 ++- view/templates/settings/nick_set.tpl | 5 - .../settings/{settings.tpl => account.tpl} | 114 +-- 6 files changed, 496 insertions(+), 418 deletions(-) rename view/templates/settings/{settings.tpl => account.tpl} (64%) delete mode 100644 view/templates/settings/nick_set.tpl rename view/theme/frio/templates/settings/{settings.tpl => account.tpl} (59%) diff --git a/CHANGELOG b/CHANGELOG index 85a2198ff5..6e8b6725ae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Version 2022.05 (unreleased) Friendica Core Friendica Addons + Breaking: The obsolete hooks settings_form and settings_post have been removed, + custom addons developers should use the addon_settings hook instead. Closed Issues diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index f5bc5fa62b..d991fd89ec 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -47,14 +47,291 @@ class Account extends BaseSettings throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } - self::checkFormSecurityTokenRedirectOnError('/settings', 'settings'); + $redirectUrl = '/settings' . (isset($this->parameters['open']) ? '/account/' . $this->parameters['open'] : ''); + + self::checkFormSecurityTokenRedirectOnError($redirectUrl, 'settings'); $a = DI::app(); $user = User::getById($a->getLoggedInUserId()); + if (!empty($request['password-submit'])) { + $newpass = $request['password']; + $confirm = $request['confirm']; + + try { + if ($newpass != $confirm) { + throw new Exception(DI::l10n()->t('Passwords do not match.')); + } + + // check if the old password was supplied correctly before changing it to the new value + User::getIdFromPasswordAuthentication(local_user(), $request['opassword']); + + $result = User::updatePassword(local_user(), $newpass); + if (!DBA::isResult($result)) { + throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); + } + + info(DI::l10n()->t('Password changed.')); + } catch (Exception $e) { + notice($e->getMessage()); + notice(DI::l10n()->t('Password unchanged.')); + } + + DI::baseUrl()->redirect($redirectUrl); + } + + if (!empty($request['basic-submit'])) { + $username = trim($request['username'] ?? ''); + $email = trim($request['email'] ?? ''); + $timezone = trim($request['timezone'] ?? ''); + + + $err = ''; + if ($username != $user['username']) { + if (strlen($username) > 40) { + $err .= DI::l10n()->t('Please use a shorter name.'); + } + if (strlen($username) < 3) { + $err .= DI::l10n()->t('Name too short.'); + } + } + + if ($email != $user['email']) { + // check for the correct password + try { + User::getIdFromPasswordAuthentication(local_user(), $request['mpassword']); + } catch (Exception $ex) { + $err .= DI::l10n()->t('Wrong Password.'); + $email = $user['email']; + } + // check the email is valid + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $err .= DI::l10n()->t('Invalid email.'); + } + // ensure new email is not the admin mail + if (DI::config()->get('config', 'admin_email')) { + $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email')))); + if (in_array(strtolower($email), $adminlist)) { + $err .= DI::l10n()->t('Cannot change to that email.'); + $email = $user['email']; + } + } + } + + if (strlen($err)) { + notice($err); + return; + } + + if (strlen($timezone) && $timezone != $user['timezone']) { + $a->setTimeZone($timezone); + } + + $fields = [ + 'username' => $username, + 'email' => $email, + 'timezone' => $timezone, + 'default-location' => trim($request['default_location'] ?? ''), + 'allow_location' => !empty($request['allow_location']), + 'language' => trim($request['language'] ?? ''), + ]; + + if (!empty($request['delete_openid'])) { + $fields['openid'] = ''; + $fields['openidserver'] = ''; + } + + if (!User::update($fields, local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + // clear session language + unset($_SESSION['language']); + + DI::baseUrl()->redirect($redirectUrl); + } + + if (!empty($request['privacy-submit'])) { + $maxreq = intval($request['maxreq'] ?? 0); + $publish = !empty($request['profile_in_directory']); + $net_publish = !empty($request['profile_in_netdirectory']); + $hide_friends = !empty($request['hide-friends']); + $hidewall = !empty($request['hidewall']); + $blockwall = empty($request['blockwall']); // this setting is inverted! + $blocktags = empty($request['blocktags']); // this setting is inverted! + $unkmail = !empty($request['unkmail']); + $cntunkmail = intval($request['cntunkmail'] ?? 0); + $def_gid = intval($request['group-selection'] ?? 0); + + $aclFormatter = DI::aclFormatter(); + + $str_group_allow = !empty($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : ''; + $str_contact_allow = !empty($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : ''; + $str_group_deny = !empty($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : ''; + $str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : ''; + + DI::pConfig()->set(local_user(), 'system', 'unlisted', !empty($request['unlisted'])); + DI::pConfig()->set(local_user(), 'system', 'accessible-photos', !empty($request['accessible-photos'])); + + $fields = [ + 'allow_cid' => $str_contact_allow, + 'allow_gid' => $str_group_allow, + 'deny_cid' => $str_contact_deny, + 'deny_gid' => $str_group_deny, + 'maxreq' => $maxreq, + 'def_gid' => $def_gid, + 'blockwall' => $blockwall, + 'hidewall' => $hidewall, + 'blocktags' => $blocktags, + 'unkmail' => $unkmail, + 'cntunkmail' => $cntunkmail, + ]; + + $profile_fields = [ + 'publish' => $publish, + 'net-publish' => $net_publish, + 'hide-friends' => $hide_friends + ]; + + if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + DI::baseUrl()->redirect($redirectUrl); + } + + if (!empty($request['expire-submit'])) { + $expire = intval($request['expire'] ?? 0); + + $expire_items = !empty($request['expire_items']); + $expire_notes = !empty($request['expire_notes']); + $expire_starred = !empty($request['expire_starred']); + $expire_network_only = !empty($request['expire_network_only']); + + DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items); + DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes); + DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred); + DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); + + if (!User::update(['expire' => $expire], local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + DI::baseUrl()->redirect($redirectUrl); + } + + if (!empty($request['notification-submit'])) { + $notify = 0; + + if (!empty($request['notify1'])) { + $notify += intval($request['notify1']); + } + if (!empty($request['notify2'])) { + $notify += intval($request['notify2']); + } + if (!empty($request['notify3'])) { + $notify += intval($request['notify3']); + } + if (!empty($request['notify4'])) { + $notify += intval($request['notify4']); + } + if (!empty($request['notify5'])) { + $notify += intval($request['notify5']); + } + if (!empty($request['notify6'])) { + $notify += intval($request['notify6']); + } + if (!empty($request['notify7'])) { + $notify += intval($request['notify7']); + } + if (!empty($request['notify8'])) { + $notify += intval($request['notify8']); + } + + $notify_like = !empty($request['notify_like']); + $notify_announce = !empty($request['notify_announce']); + + // Reset like notifications when they are going to be shown again + if (!DI::pConfig()->get(local_user(), 'system', 'notify_like') && $notify_like) { + DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::LIKE)]); + } + + DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); + + // Reset share notifications when they are going to be shown again + if (!DI::pConfig()->get(local_user(), 'system', 'notify_announce') && $notify_announce) { + DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); + } + + DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); + + DI::pConfig()->set(local_user(), 'system', 'email_textonly', !empty($request['email_textonly'])); + DI::pConfig()->set(local_user(), 'system', 'detailed_notif', !empty($request['detailed_notif'])); + DI::pConfig()->set(local_user(), 'system', 'notify_ignored', !empty($request['notify_ignored'])); + + $fields = [ + 'notify-flags' => $notify, + ]; + + if (!User::update($fields, local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + DI::baseUrl()->redirect($redirectUrl); + } + + if (!empty($request['advanced-submit'])) { + $account_type = intval($request['account-type'] ?? 0); + $page_flags = intval($request['page-flags'] ?? 0); + + // Adjust the page flag if the account type doesn't fit to the page flag. + if ($account_type == User::ACCOUNT_TYPE_PERSON && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) { + $page_flags = User::PAGE_FLAGS_NORMAL; + } elseif ($account_type == User::ACCOUNT_TYPE_ORGANISATION && $page_flags != User::PAGE_FLAGS_SOAPBOX) { + $page_flags = User::PAGE_FLAGS_SOAPBOX; + } elseif ($account_type == User::ACCOUNT_TYPE_NEWS && $page_flags != User::PAGE_FLAGS_SOAPBOX) { + $page_flags = User::PAGE_FLAGS_SOAPBOX; + } elseif ($account_type == User::ACCOUNT_TYPE_COMMUNITY && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { + $page_flags = User::PAGE_FLAGS_COMMUNITY; + } + + $fields = []; + $profile_fields = []; + + if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) { + DI::pConfig()->set(local_user(), 'system', 'unlisted', true); + + $fields = [ + 'allow_cid' => '', + 'allow_gid' => $page_flags == User::PAGE_FLAGS_PRVGROUP ? + '<' . Group::FOLLOWERS . '>' + : '', + 'deny_cid' => '', + 'deny_gid' => '', + 'blockwall' => true, + 'blocktags' => true, + ]; + + $profile_fields = [ + 'hide-friends' => true, + ]; + } + + $fields = array_merge($fields, [ + 'page-flags' => $page_flags, + 'account-type' => $account_type, + ]); + + if (!User::update($fields, local_user()) || !empty($profile_fields) && !Profile::update($profile_fields, local_user())) { + notice(DI::l10n()->t('Settings were not updated.')); + } + + DI::baseUrl()->redirect($redirectUrl); + } + // Import Contacts from CSV file - if (!empty($_POST['importcontact-submit'])) { + if (!empty($request['importcontact-submit'])) { if (isset($_FILES['importcontact-filename'])) { // was there an error if ($_FILES['importcontact-filename']['error'] > 0) { @@ -70,7 +347,7 @@ class Account extends BaseSettings // or the handle of the account, therefore we check for either // "http" or "@" to be present in the string. // All other fields from the row will be ignored - if ((strpos($csvRow[0],'@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { + if ((strpos($csvRow[0], '@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); } else { Logger::notice('Invalid account', ['url' => $csvRow[0]]); @@ -86,231 +363,16 @@ class Account extends BaseSettings Logger::notice('Import triggered, but no import file was found.'); } - return; + DI::baseUrl()->redirect($redirectUrl); } - if (!empty($_POST['resend_relocate'])) { + if (!empty($request['relocate-submit'])) { Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user()); info(DI::l10n()->t("Relocate message has been send to your contacts")); - DI::baseUrl()->redirect('settings'); + DI::baseUrl()->redirect($redirectUrl); } - if (!empty($_POST['password']) || !empty($_POST['confirm'])) { - $newpass = $_POST['password']; - $confirm = $_POST['confirm']; - - try { - if ($newpass != $confirm) { - throw new Exception(DI::l10n()->t('Passwords do not match.')); - } - - // check if the old password was supplied correctly before changing it to the new value - User::getIdFromPasswordAuthentication(local_user(), $_POST['opassword']); - - $result = User::updatePassword(local_user(), $newpass); - if (!DBA::isResult($result)) { - throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); - } - - info(DI::l10n()->t('Password changed.')); - } catch (Exception $e) { - notice($e->getMessage()); - notice(DI::l10n()->t('Password unchanged.')); - } - } - - $username = (!empty($_POST['username']) ? trim($_POST['username']) : ''); - $email = (!empty($_POST['email']) ? trim($_POST['email']) : ''); - $timezone = (!empty($_POST['timezone']) ? trim($_POST['timezone']) : ''); - $language = (!empty($_POST['language']) ? trim($_POST['language']) : ''); - - $defloc = (!empty($_POST['defloc']) ? trim($_POST['defloc']) : ''); - $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); - - $delete_openid = ((!empty($_POST['delete_openid']) && (intval($_POST['delete_openid']) == 1)) ? 1: 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); - $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); - $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); - $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); - $unlisted = (($_POST['unlisted'] == 1) ? 1: 0); - $accessiblephotos = (($_POST['accessible-photos'] == 1) ? 1: 0); - - $notify_like = (($_POST['notify_like'] == 1) ? 1 : 0); - $notify_announce = (($_POST['notify_announce'] == 1) ? 1 : 0); - - $email_textonly = (($_POST['email_textonly'] == 1) ? 1 : 0); - $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0); - - $notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0); - - $notify = 0; - - if (!empty($_POST['notify1'])) { - $notify += intval($_POST['notify1']); - } - if (!empty($_POST['notify2'])) { - $notify += intval($_POST['notify2']); - } - if (!empty($_POST['notify3'])) { - $notify += intval($_POST['notify3']); - } - if (!empty($_POST['notify4'])) { - $notify += intval($_POST['notify4']); - } - if (!empty($_POST['notify5'])) { - $notify += intval($_POST['notify5']); - } - if (!empty($_POST['notify6'])) { - $notify += intval($_POST['notify6']); - } - if (!empty($_POST['notify7'])) { - $notify += intval($_POST['notify7']); - } - if (!empty($_POST['notify8'])) { - $notify += intval($_POST['notify8']); - } - - // Adjust the page flag if the account type doesn't fit to the page flag. - if ($account_type == User::ACCOUNT_TYPE_PERSON && !in_array($page_flags, [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE])) { - $page_flags = User::PAGE_FLAGS_NORMAL; - } elseif ($account_type == User::ACCOUNT_TYPE_ORGANISATION && $page_flags != User::PAGE_FLAGS_SOAPBOX) { - $page_flags = User::PAGE_FLAGS_SOAPBOX; - } elseif ($account_type == User::ACCOUNT_TYPE_NEWS && $page_flags != User::PAGE_FLAGS_SOAPBOX) { - $page_flags = User::PAGE_FLAGS_SOAPBOX; - } elseif ($account_type == User::ACCOUNT_TYPE_COMMUNITY && !in_array($page_flags, [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { - $page_flags = User::PAGE_FLAGS_COMMUNITY; - } - - $err = ''; - - if ($username != $user['username']) { - if (strlen($username) > 40) { - $err .= DI::l10n()->t('Please use a shorter name.'); - } - if (strlen($username) < 3) { - $err .= DI::l10n()->t('Name too short.'); - } - } - - if ($email != $user['email']) { - // check for the correct password - try { - User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']); - } catch (Exception $ex) { - $err .= DI::l10n()->t('Wrong Password.'); - $email = $user['email']; - } - // check the email is valid - if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { - $err .= DI::l10n()->t('Invalid email.'); - } - // ensure new email is not the admin mail - if (DI::config()->get('config', 'admin_email')) { - $adminlist = explode(",", str_replace(" ", "", strtolower(DI::config()->get('config', 'admin_email')))); - if (in_array(strtolower($email), $adminlist)) { - $err .= DI::l10n()->t('Cannot change to that email.'); - $email = $user['email']; - } - } - } - - if (strlen($err)) { - notice($err); - return; - } - - if (($timezone != $user['timezone']) && strlen($timezone)) { - $a->setTimeZone($timezone); - } - - $aclFormatter = DI::aclFormatter(); - - $str_group_allow = !empty($_POST['group_allow']) ? $aclFormatter->toString($_POST['group_allow']) : ''; - $str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : ''; - $str_group_deny = !empty($_POST['group_deny']) ? $aclFormatter->toString($_POST['group_deny']) : ''; - $str_contact_deny = !empty($_POST['contact_deny']) ? $aclFormatter->toString($_POST['contact_deny']) : ''; - - DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items); - DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes); - DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred); - DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos); - DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only); - - // Reset like notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_like') && $notify_like) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::LIKE)]); - } - - DI::pConfig()->set(local_user(), 'system', 'notify_like', $notify_like); - - // Reset share notifications when they are going to be shown again - if (!DI::pConfig()->get(local_user(), 'system', 'notify_announce') && $notify_announce) { - DI::notification()->setAllSeenForUser(local_user(), ['vid' => Verb::getID(Activity::ANNOUNCE)]); - } - - DI::pConfig()->set(local_user(), 'system', 'notify_announce', $notify_announce); - - DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly); - DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif); - DI::pConfig()->set(local_user(), 'system', 'notify_ignored', $notify_ignored); - DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted); - DI::pConfig()->set(local_user(), 'system', 'accessible-photos', $accessiblephotos); - - if ($account_type == User::ACCOUNT_TYPE_COMMUNITY) { - $str_group_allow = ''; - $str_contact_allow = ''; - $str_group_deny = ''; - $str_contact_deny = ''; - - DI::pConfig()->set(local_user(), 'system', 'unlisted', true); - - $blockwall = true; - $blocktags = true; - $hide_friends = true; - } - - if ($page_flags == User::PAGE_FLAGS_PRVGROUP) { - $str_group_allow = '<' . Group::FOLLOWERS . '>'; - } - - $fields = ['username' => $username, 'email' => $email, 'timezone' => $timezone, - 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny, - 'notify-flags' => $notify, 'page-flags' => $page_flags, 'account-type' => $account_type, 'default-location' => $defloc, - 'allow_location' => $allow_location, 'maxreq' => $maxreq, 'expire' => $expire, 'def_gid' => $def_gid, 'blockwall' => $blockwall, - 'hidewall' => $hidewall, 'blocktags' => $blocktags, 'unkmail' => $unkmail, 'cntunkmail' => $cntunkmail, 'language' => $language]; - - if ($delete_openid) { - $fields['openid'] = ''; - $fields['openidserver'] = ''; - } - - $profile_fields = ['publish' => $publish, 'net-publish' => $net_publish, 'hide-friends' => $hide_friends]; - - if (!User::update($fields, local_user()) || !Profile::update($profile_fields, local_user())) { - notice(DI::l10n()->t('Settings were not updated.')); - } - - // clear session language - unset($_SESSION['language']); - - DI::baseUrl()->redirect('settings'); + DI::baseUrl()->redirect($redirectUrl); } protected function content(array $request = []): string @@ -331,23 +393,22 @@ class Account extends BaseSettings $user = User::getById($a->getLoggedInUserId()); - $username = $user['username']; - $email = $user['email']; - $nickname = $a->getLoggedInUserNickname(); - $timezone = $user['timezone']; - $language = $user['language']; - $notify = $user['notify-flags']; - $defloc = $user['default-location']; - $openid = $user['openid']; - $maxreq = $user['maxreq']; - $expire = (intval($user['expire'])) ? $user['expire'] : ''; - $unkmail = $user['unkmail']; - $cntunkmail = $user['cntunkmail']; + $username = $user['username']; + $email = $user['email']; + $nickname = $a->getLoggedInUserNickname(); + $timezone = $user['timezone']; + $language = $user['language']; + $notify = $user['notify-flags']; + $default_location = $user['default-location']; + $openid = $user['openid']; + $maxreq = $user['maxreq']; + $expire = $user['expire'] ?: ''; + $unkmail = $user['unkmail']; + $cntunkmail = $user['cntunkmail']; $expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true); $expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true); $expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true); - $expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false); $expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false); if (!strlen($user['timezone'])) { @@ -363,19 +424,17 @@ class Account extends BaseSettings $user['account-type'] = User::ACCOUNT_TYPE_COMMUNITY; } - $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl'); - - $pagetype = Renderer::replaceMacros($pageset_tpl, [ - '$account_types' => DI::l10n()->t("Account Types"), - '$user' => DI::l10n()->t("Personal Page Subtypes"), - '$community' => DI::l10n()->t("Community Forum Subtypes"), - '$account_type' => $user['account-type'], - '$type_person' => User::ACCOUNT_TYPE_PERSON, - '$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION, - '$type_news' => User::ACCOUNT_TYPE_NEWS, - '$type_community' => User::ACCOUNT_TYPE_COMMUNITY, - '$account_person' => [ + $pagetype = Renderer::replaceMacros($pageset_tpl, [ + '$account_types' => DI::l10n()->t("Account Types"), + '$user' => DI::l10n()->t("Personal Page Subtypes"), + '$community' => DI::l10n()->t("Community Forum Subtypes"), + '$account_type' => $user['account-type'], + '$type_person' => User::ACCOUNT_TYPE_PERSON, + '$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION, + '$type_news' => User::ACCOUNT_TYPE_NEWS, + '$type_community' => User::ACCOUNT_TYPE_COMMUNITY, + '$account_person' => [ 'account-type', DI::l10n()->t('Personal Page'), User::ACCOUNT_TYPE_PERSON, @@ -389,49 +448,49 @@ class Account extends BaseSettings DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'), $user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION ], - '$account_news' => [ + '$account_news' => [ 'account-type', DI::l10n()->t('News Page'), User::ACCOUNT_TYPE_NEWS, DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'), $user['account-type'] == User::ACCOUNT_TYPE_NEWS ], - '$account_community' => [ + '$account_community' => [ 'account-type', DI::l10n()->t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY, DI::l10n()->t('Account for community discussions.'), $user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY ], - '$page_normal' => [ + '$page_normal' => [ 'page-flags', DI::l10n()->t('Normal Account Page'), User::PAGE_FLAGS_NORMAL, DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), $user['page-flags'] == User::PAGE_FLAGS_NORMAL ], - '$page_soapbox' => [ + '$page_soapbox' => [ 'page-flags', DI::l10n()->t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX, DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'), $user['page-flags'] == User::PAGE_FLAGS_SOAPBOX ], - '$page_community' => [ + '$page_community' => [ 'page-flags', DI::l10n()->t('Public Forum'), User::PAGE_FLAGS_COMMUNITY, DI::l10n()->t('Automatically approves all contact requests.'), $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY ], - '$page_freelove' => [ + '$page_freelove' => [ 'page-flags', DI::l10n()->t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE, DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'), $user['page-flags'] == User::PAGE_FLAGS_FREELOVE ], - '$page_prvgroup' => [ + '$page_prvgroup' => [ 'page-flags', DI::l10n()->t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP, @@ -441,19 +500,18 @@ class Account extends BaseSettings ]); $noid = DI::config()->get('system', 'no_openid'); - if ($noid) { $openid_field = false; } else { $openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("(Optional) Allow this OpenID to login to this account."), "", "readonly", "url"]; } - $opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl"); if (DI::config()->get('system', 'publish_all')) { $profile_in_dir = ''; } else { + $opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl"); $profile_in_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_directory', DI::l10n()->t('Publish your profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory')] + '$field' => ['profile_in_directory', DI::l10n()->t('Publish your profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl() . '/directory')] ]); } @@ -462,48 +520,40 @@ class Account extends BaseSettings $net_pub_desc = ' ' . DI::l10n()->t('Your profile will also be published in the global friendica directories (e.g. %s).', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory')); } - $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); - - $prof_addr = Renderer::replaceMacros($tpl_addr,[ - '$desc' => DI::l10n()->t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), - '$basepath' => DI::baseUrl()->getHostname() - ]); - - $stpl = Renderer::getMarkupTemplate('settings/settings.tpl'); - /* Installed langs */ $lang_choices = DI::l10n()->getAvailableLanguages(); - /// @TODO Fix indending (or so) - $o = Renderer::replaceMacros($stpl, [ - '$ptitle' => DI::l10n()->t('Account Settings'), + $tpl = Renderer::getMarkupTemplate('settings/account.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$ptitle' => DI::l10n()->t('Account Settings'), + '$desc' => DI::l10n()->t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), - '$submit' => DI::l10n()->t('Save Settings'), - '$baseurl' => DI::baseUrl()->get(true), - '$uid' => local_user(), + '$submit' => DI::l10n()->t('Save Settings'), + '$baseurl' => DI::baseUrl()->get(true), + '$uid' => local_user(), '$form_security_token' => self::getFormSecurityToken('settings'), - '$nickname_block' => $prof_addr, + '$open' => $this->parameters['open'] ?? 'password', - '$h_pass' => DI::l10n()->t('Password Settings'), - '$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'), false, 'autocomplete="off"'], - '$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing'), false, 'autocomplete="off"'], - '$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes'), false, 'autocomplete="off"'], - '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address'), false, 'autocomplete="off"'], - '$oid_enable' => (!DI::config()->get('system', 'no_openid')), - '$openid' => $openid_field, + '$h_pass' => DI::l10n()->t('Password Settings'), + '$password1' => ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'), false, 'autocomplete="off"'], + '$password2' => ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing'), false, 'autocomplete="off"'], + '$password3' => ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes'), false, 'autocomplete="off"'], + '$password4' => ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address'), false, 'autocomplete="off"'], + '$oid_enable' => (!DI::config()->get('system', 'no_openid')), + '$openid' => $openid_field, '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''], - '$h_basic' => DI::l10n()->t('Basic Settings'), - '$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'], - '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'], - '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], - '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], - '$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''], - '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($user['allow_location'] == 1), ''], + '$h_basic' => DI::l10n()->t('Basic Settings'), + '$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'], + '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'], + '$timezone' => ['timezone_select', DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], + '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], + '$default_location' => ['default_location', DI::l10n()->t('Default Post Location:'), $default_location, ''], + '$allow_location' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($user['allow_location'] == 1), ''], - '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), + '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), '$is_community' => ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), - '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("(to prevent spam abuse)")], + '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq, DI::l10n()->t("(to prevent spam abuse)")], '$profile_in_dir' => $profile_in_dir, '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc], '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], @@ -513,60 +563,67 @@ class Account extends BaseSettings '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], - '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("(to prevent spam abuse)")], + '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")], '$group_select' => Group::displayGroupSelection(local_user(), $user['def_gid']), '$permissions' => DI::l10n()->t('Default Post Permissions'), '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), '$expire' => [ 'label' => DI::l10n()->t('Expiration settings'), - 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], + 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')], 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')], 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')], - 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')], 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')], ], - '$h_not' => DI::l10n()->t('Notification Settings'), - '$lbl_not' => DI::l10n()->t('Send a notification email when:'), - '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''], - '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''], - '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''], - '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''], - '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''], - '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''], - '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''], - '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''], + '$h_not' => DI::l10n()->t('Notification Settings'), + '$lbl_not' => DI::l10n()->t('Send a notification email when:'), + '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Notification\Type::INTRO), Notification\Type::INTRO, ''], + '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Notification\Type::CONFIRM), Notification\Type::CONFIRM, ''], + '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Notification\Type::WALL), Notification\Type::WALL, ''], + '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Notification\Type::COMMENT), Notification\Type::COMMENT, ''], + '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Notification\Type::MAIL), Notification\Type::MAIL, ''], + '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Notification\Type::SUGGEST), Notification\Type::SUGGEST, ''], + '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Notification\Type::TAG_SELF), Notification\Type::TAG_SELF, ''], + '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Notification\Type::POKE), Notification\Type::POKE, ''], '$lbl_notify' => DI::l10n()->t('Create a desktop notification when:'), '$notify_like' => ['notify_like', DI::l10n()->t('Someone liked your content'), DI::pConfig()->get(local_user(), 'system', 'notify_like'), ''], '$notify_announce' => ['notify_announce', DI::l10n()->t('Someone shared your content'), DI::pConfig()->get(local_user(), 'system', 'notify_announce'), ''], - '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], + '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications'), false, DI::l10n()->t('Show desktop popup on new notifications')], - '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'), - DI::pConfig()->get(local_user(), 'system', 'email_textonly'), - DI::l10n()->t('Send text only notification emails, without the html part')], + '$email_textonly' => [ + 'email_textonly', + DI::l10n()->t('Text-only notification emails'), + DI::pConfig()->get(local_user(), 'system', 'email_textonly'), + DI::l10n()->t('Send text only notification emails, without the html part') + ], + '$detailed_notif' => [ + 'detailed_notif', + DI::l10n()->t('Show detailled notifications'), + DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), + DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.') + ], + '$notify_ignored' => [ + 'notify_ignored', + DI::l10n()->t('Show notifications of ignored contacts'), + DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true), + DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.") + ], - '$detailed_notif' => ['detailed_notif', DI::l10n()->t('Show detailled notifications'), - DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), - DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')], - - '$notify_ignored' => ['notify_ignored', DI::l10n()->t('Show notifications of ignored contacts') , - DI::pConfig()->get(local_user(), 'system', 'notify_ignored', true), - DI::l10n()->t("You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.")], - - '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'), + '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'), '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'), - '$pagetype' => $pagetype, + '$pagetype' => $pagetype, - '$importcontact' => DI::l10n()->t('Import Contacts'), - '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), - '$importcontact_button' => DI::l10n()->t('Upload File'), + '$importcontact' => DI::l10n()->t('Import Contacts'), + '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), + '$importcontact_button' => DI::l10n()->t('Upload File'), '$importcontact_maxsize' => DI::config()->get('system', 'max_csv_file_size', 30720), - '$relocate' => DI::l10n()->t('Relocate'), - '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."), + + '$relocate' => DI::l10n()->t('Relocate'), + '$relocate_text' => DI::l10n()->t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."), '$relocate_button' => DI::l10n()->t("Resend relocate message to contacts"), ]); diff --git a/static/routes.config.php b/static/routes.config.php index 0a37637786..f2a6415482 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -544,7 +544,11 @@ return [ ], '/settings' => [ - '[/]' => [Module\Settings\Account::class, [R::GET, R::POST]], + '[/]' => [Module\Settings\Account::class, [R::GET, R::POST]], + '/account' => [ + '[/]' => [Module\Settings\Account::class, [R::GET, R::POST]], + '/{open}' => [Module\Settings\Account::class, [R::GET, R::POST]], + ], '/2fa' => [ '[/]' => [Module\Settings\TwoFactor\Index::class, [R::GET, R::POST]], '/recovery' => [Module\Settings\TwoFactor\Recovery::class, [R::GET, R::POST]], diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/account.tpl similarity index 64% rename from view/templates/settings/settings.tpl rename to view/templates/settings/account.tpl index c0e821ac7c..f8bf70cca0 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/account.tpl @@ -1,44 +1,48 @@

{{$ptitle}}

-{{$nickname_block nofilter}} - -
- +
+
{{$desc nofilter}}
+
+
+

{{$h_pass}}

-
+ + {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} {{include file="field_password.tpl" field=$password3}} - {{if $oid_enable}} - {{include file="field_input.tpl" field=$openid}} - {{/if}} -
- +
-
+

{{$h_basic}}

-
- +
+ {{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$password4}} + + {{if $oid_enable}} + {{include file="field_input.tpl" field=$openid}} + {{include file="field_checkbox.tpl" field=$delete_openid}} + {{/if}} + {{include file="field_custom.tpl" field=$timezone}} {{include file="field_select.tpl" field=$language}} - {{include file="field_input.tpl" field=$defloc}} - {{include file="field_checkbox.tpl" field=$allowloc}} - + {{include file="field_input.tpl" field=$default_location}} + {{include file="field_checkbox.tpl" field=$allow_location}}
- +
-
+

{{$h_prv}}

-
+
+ {{include file="field_input.tpl" field=$maxreq}} {{$profile_in_dir nofilter}} @@ -62,12 +66,13 @@ {{$aclselect nofilter}} {{/if}}
- +
-
+

{{$expire.label}}

-
+
+
{{include file="field_input.tpl" field=$expire.days}} {{include file="field_checkbox.tpl" field=$expire.items}} @@ -76,13 +81,14 @@ {{include file="field_checkbox.tpl" field=$expire.network_only}}
- +
-
+

{{$h_not}}

-
+
+
{{$lbl_not}}
@@ -147,37 +153,41 @@
- +
-
+

{{$h_advn}}

-
-
{{$h_descadvn}}
+
+ +

{{$h_descadvn}}

{{$pagetype nofilter}}
- +
-
+

{{$importcontact}}

-
+
+ -
{{$importcontact_text}}
- +

{{$importcontact_text}}

+

-
+

{{$relocate}}

-
-
{{$relocate_text}}
+
+ +

{{$relocate_text}}

- +
-
+ +
\ No newline at end of file diff --git a/view/templates/settings/nick_set.tpl b/view/templates/settings/nick_set.tpl deleted file mode 100644 index 432c20d6ca..0000000000 --- a/view/templates/settings/nick_set.tpl +++ /dev/null @@ -1,5 +0,0 @@ - -
-
{{$desc nofilter}}
-
-
diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/account.tpl similarity index 59% rename from view/theme/frio/templates/settings/settings.tpl rename to view/theme/frio/templates/settings/account.tpl index b9e105e886..c3ec33043c 100644 --- a/view/theme/frio/templates/settings/settings.tpl +++ b/view/theme/frio/templates/settings/account.tpl @@ -1,74 +1,79 @@

{{$ptitle}}

- {{$nickname_block nofilter}} - -
- +
+
{{$desc nofilter}}
+
+
+
{{* We organize the settings in collapsable panel-groups *}}
{{* The password setting section *}} -
+ + -
+
{{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} {{include file="field_password.tpl" field=$password3}} - - {{if $oid_enable}} - {{include file="field_input.tpl" field=$openid}} - {{include file="field_checkbox.tpl" field=$delete_openid}} - {{/if}}
- +
-
+ {{* The basic setting section *}} -
+
+ -
+
{{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$password4}} + + {{if $oid_enable}} + {{include file="field_input.tpl" field=$openid}} + {{include file="field_checkbox.tpl" field=$delete_openid}} + {{/if}} + {{include file="field_custom.tpl" field=$timezone}} {{include file="field_select.tpl" field=$language}} - {{include file="field_input.tpl" field=$defloc}} - {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_input.tpl" field=$default_location}} + {{include file="field_checkbox.tpl" field=$allow_location}}
- +
-
+
{{* The privacity setting section *}} -
+
+ -
+
{{include file="field_input.tpl" field=$maxreq}} @@ -95,20 +100,21 @@ {{/if}}
- +
-
+
-
+
+ -
+
{{include file="field_input.tpl" field=$expire.days}} @@ -118,21 +124,22 @@ {{include file="field_checkbox.tpl" field=$expire.network_only}}
- +
-
+
{{* The notification setting section *}} -
+
+ -
+
{{$lbl_not}}
@@ -202,42 +209,44 @@
- +
-
+
{{* The additional account setting section *}} -
- From 7bc449215f2b0bbd6bc3238ada5dc0ed3b464232 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 24 Apr 2022 08:26:14 -0400 Subject: [PATCH 4/4] Updated main translation file after moving module --- view/lang/C/messages.po | 1203 +++++++++++++++++++-------------------- 1 file changed, 599 insertions(+), 604 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index f14e06dc2c..595091f2ce 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.05-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-23 12:37+0000\n" +"POT-Creation-Date: 2022-04-24 08:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -121,7 +121,7 @@ msgstr "" #: mod/item.php:181 mod/item.php:186 mod/item.php:874 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 #: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 -#: mod/settings.php:49 mod/settings.php:59 mod/settings.php:430 +#: mod/settings.php:49 mod/settings.php:59 mod/settings.php:165 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 #: mod/wall_attach.php:69 mod/wall_upload.php:89 mod/wall_upload.php:91 @@ -137,7 +137,8 @@ msgstr "" #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 #: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Delegation.php:42 +#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:47 +#: src/Module/Settings/Account.php:383 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 @@ -1079,7 +1080,7 @@ msgstr "" msgid "Select" msgstr "" -#: mod/photos.php:1431 mod/settings.php:624 src/Content/Conversation.php:629 +#: mod/photos.php:1431 mod/settings.php:359 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 msgid "Delete" @@ -1174,63 +1175,11 @@ msgstr[1] "" msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:161 -msgid "Contact CSV file upload error" -msgstr "" - -#: mod/settings.php:180 -msgid "Importing Contacts done" -msgstr "" - -#: mod/settings.php:193 -msgid "Relocate message has been send to your contacts" -msgstr "" - -#: mod/settings.php:205 -msgid "Passwords do not match." -msgstr "" - -#: mod/settings.php:213 src/Console/User.php:210 -msgid "Password update failed. Please try again." -msgstr "" - -#: mod/settings.php:216 src/Console/User.php:213 -msgid "Password changed." -msgstr "" - -#: mod/settings.php:219 -msgid "Password unchanged." -msgstr "" - -#: mod/settings.php:306 -msgid "Please use a shorter name." -msgstr "" - -#: mod/settings.php:309 -msgid "Name too short." -msgstr "" - -#: mod/settings.php:318 -msgid "Wrong Password." -msgstr "" - -#: mod/settings.php:323 -msgid "Invalid email." -msgstr "" - -#: mod/settings.php:329 -msgid "Cannot change to that email." -msgstr "" - -#: mod/settings.php:408 -msgid "Settings were not updated." -msgstr "" - -#: mod/settings.php:449 +#: mod/settings.php:184 msgid "Connected Apps" msgstr "" -#: mod/settings.php:450 src/Module/Admin/Blocklist/Contact.php:106 +#: mod/settings.php:185 src/Module/Admin/Blocklist/Contact.php:106 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 #: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 @@ -1238,104 +1187,104 @@ msgstr "" msgid "Name" msgstr "" -#: mod/settings.php:451 src/Content/Nav.php:212 +#: mod/settings.php:186 src/Content/Nav.php:212 msgid "Home Page" msgstr "" -#: mod/settings.php:452 src/Module/Admin/Queue.php:78 +#: mod/settings.php:187 src/Module/Admin/Queue.php:78 msgid "Created" msgstr "" -#: mod/settings.php:453 +#: mod/settings.php:188 msgid "Remove authorization" msgstr "" -#: mod/settings.php:479 mod/settings.php:511 mod/settings.php:542 -#: mod/settings.php:626 mod/settings.php:763 -#: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87 -#: src/Module/Admin/Logs/Settings.php:81 src/Module/Admin/Site.php:501 -#: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:83 +#: mod/settings.php:214 mod/settings.php:246 mod/settings.php:277 +#: mod/settings.php:361 src/Module/Admin/Addons/Index.php:69 +#: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 +#: src/Module/Admin/Site.php:501 src/Module/Admin/Themes/Index.php:113 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:531 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "" -#: mod/settings.php:487 +#: mod/settings.php:222 msgid "Addon Settings" msgstr "" -#: mod/settings.php:488 +#: mod/settings.php:223 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:509 +#: mod/settings.php:244 msgid "Additional Features" msgstr "" -#: mod/settings.php:547 +#: mod/settings.php:282 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:547 mod/settings.php:548 +#: mod/settings.php:282 mod/settings.php:283 msgid "enabled" msgstr "" -#: mod/settings.php:547 mod/settings.php:548 +#: mod/settings.php:282 mod/settings.php:283 msgid "disabled" msgstr "" -#: mod/settings.php:547 mod/settings.php:548 +#: mod/settings.php:282 mod/settings.php:283 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:548 +#: mod/settings.php:283 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:574 +#: mod/settings.php:309 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:579 mod/settings.php:624 +#: mod/settings.php:314 mod/settings.php:359 msgid "None" msgstr "" -#: mod/settings.php:585 src/Module/BaseSettings.php:78 +#: mod/settings.php:320 src/Module/BaseSettings.php:78 msgid "Social Networks" msgstr "" -#: mod/settings.php:590 +#: mod/settings.php:325 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:593 +#: mod/settings.php:328 msgid "Followed content scope" msgstr "" -#: mod/settings.php:595 +#: mod/settings.php:330 msgid "" "By default, conversations in which your follows participated but didn't " "start will be shown in your timeline. You can turn this behavior off, or " "expand it to the conversations in which your follows liked a post." msgstr "" -#: mod/settings.php:597 +#: mod/settings.php:332 msgid "Only conversations my follows started" msgstr "" -#: mod/settings.php:598 +#: mod/settings.php:333 msgid "Conversations my follows started or commented on (default)" msgstr "" -#: mod/settings.php:599 +#: mod/settings.php:334 msgid "Any conversation my follows interacted with, including likes" msgstr "" -#: mod/settings.php:602 +#: mod/settings.php:337 msgid "Enable Content Warning" msgstr "" -#: mod/settings.php:602 +#: mod/settings.php:337 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This enables the automatic " @@ -1343,607 +1292,111 @@ msgid "" "affect any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:603 +#: mod/settings.php:338 msgid "Enable intelligent shortening" msgstr "" -#: mod/settings.php:603 +#: mod/settings.php:338 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If disabled, every shortened post will always point to the original " "friendica post." msgstr "" -#: mod/settings.php:604 +#: mod/settings.php:339 msgid "Enable simple text shortening" msgstr "" -#: mod/settings.php:604 +#: mod/settings.php:339 msgid "" "Normally the system shortens posts at the next line feed. If this option is " "enabled then the system will shorten the text at the maximum character limit." msgstr "" -#: mod/settings.php:605 +#: mod/settings.php:340 msgid "Attach the link title" msgstr "" -#: mod/settings.php:605 +#: mod/settings.php:340 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:606 +#: mod/settings.php:341 msgid "Your legacy ActivityPub/GNU Social account" msgstr "" -#: mod/settings.php:606 +#: mod/settings.php:341 msgid "" "If you enter your old account name from an ActivityPub based system or your " "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." msgstr "" -#: mod/settings.php:609 +#: mod/settings.php:344 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:613 +#: mod/settings.php:348 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:614 +#: mod/settings.php:349 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:615 +#: mod/settings.php:350 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:617 +#: mod/settings.php:352 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:618 +#: mod/settings.php:353 msgid "IMAP port:" msgstr "" -#: mod/settings.php:619 +#: mod/settings.php:354 msgid "Security:" msgstr "" -#: mod/settings.php:620 +#: mod/settings.php:355 msgid "Email login name:" msgstr "" -#: mod/settings.php:621 +#: mod/settings.php:356 msgid "Email password:" msgstr "" -#: mod/settings.php:622 +#: mod/settings.php:357 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:623 +#: mod/settings.php:358 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:624 +#: mod/settings.php:359 msgid "Action after import:" msgstr "" -#: mod/settings.php:624 src/Content/Nav.php:280 +#: mod/settings.php:359 src/Content/Nav.php:280 msgid "Mark as seen" msgstr "" -#: mod/settings.php:624 +#: mod/settings.php:359 msgid "Move to folder" msgstr "" -#: mod/settings.php:625 +#: mod/settings.php:360 msgid "Move to folder:" msgstr "" -#: mod/settings.php:639 -msgid "Unable to find your profile. Please contact your admin." -msgstr "" - -#: mod/settings.php:677 src/Content/Widget.php:523 -msgid "Account Types" -msgstr "" - -#: mod/settings.php:678 -msgid "Personal Page Subtypes" -msgstr "" - -#: mod/settings.php:679 -msgid "Community Forum Subtypes" -msgstr "" - -#: mod/settings.php:686 src/Module/Admin/BaseUsers.php:107 -msgid "Personal Page" -msgstr "" - -#: mod/settings.php:687 -msgid "Account for a personal profile." -msgstr "" - -#: mod/settings.php:690 src/Module/Admin/BaseUsers.php:108 -msgid "Organisation Page" -msgstr "" - -#: mod/settings.php:691 -msgid "" -"Account for an organisation that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:694 src/Module/Admin/BaseUsers.php:109 -msgid "News Page" -msgstr "" - -#: mod/settings.php:695 -msgid "" -"Account for a news reflector that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:698 src/Module/Admin/BaseUsers.php:110 -msgid "Community Forum" -msgstr "" - -#: mod/settings.php:699 -msgid "Account for community discussions." -msgstr "" - -#: mod/settings.php:702 src/Module/Admin/BaseUsers.php:100 -msgid "Normal Account Page" -msgstr "" - -#: mod/settings.php:703 -msgid "" -"Account for a regular personal profile that requires manual approval of " -"\"Friends\" and \"Followers\"." -msgstr "" - -#: mod/settings.php:706 src/Module/Admin/BaseUsers.php:101 -msgid "Soapbox Page" -msgstr "" - -#: mod/settings.php:707 -msgid "" -"Account for a public profile that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:710 src/Module/Admin/BaseUsers.php:102 -msgid "Public Forum" -msgstr "" - -#: mod/settings.php:711 -msgid "Automatically approves all contact requests." -msgstr "" - -#: mod/settings.php:714 src/Module/Admin/BaseUsers.php:103 -msgid "Automatic Friend Page" -msgstr "" - -#: mod/settings.php:715 -msgid "" -"Account for a popular profile that automatically approves contact requests " -"as \"Friends\"." -msgstr "" - -#: mod/settings.php:718 -msgid "Private Forum [Experimental]" -msgstr "" - -#: mod/settings.php:719 -msgid "Requires manual approval of contact requests." -msgstr "" - -#: mod/settings.php:730 -msgid "OpenID:" -msgstr "" - -#: mod/settings.php:730 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" - -#: mod/settings.php:738 -msgid "Publish your profile in your local site directory?" -msgstr "" - -#: mod/settings.php:738 -#, php-format -msgid "" -"Your profile will be published in this node's local " -"directory. Your profile details may be publicly visible depending on the " -"system settings." -msgstr "" - -#: mod/settings.php:744 -#, php-format -msgid "" -"Your profile will also be published in the global friendica directories (e." -"g. %s)." -msgstr "" - -#: mod/settings.php:750 -#, php-format -msgid "Your Identity Address is '%s' or '%s'." -msgstr "" - -#: mod/settings.php:761 -msgid "Account Settings" -msgstr "" - -#: mod/settings.php:769 -msgid "Password Settings" -msgstr "" - -#: mod/settings.php:770 src/Module/Register.php:162 -msgid "New Password:" -msgstr "" - -#: mod/settings.php:770 -msgid "" -"Allowed characters are a-z, A-Z, 0-9 and special characters except white " -"spaces, accentuated letters and colon (:)." -msgstr "" - -#: mod/settings.php:771 src/Module/Register.php:163 -msgid "Confirm:" -msgstr "" - -#: mod/settings.php:771 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: mod/settings.php:772 -msgid "Current Password:" -msgstr "" - -#: mod/settings.php:772 -msgid "Your current password to confirm the changes" -msgstr "" - -#: mod/settings.php:773 -msgid "Password:" -msgstr "" - -#: mod/settings.php:773 -msgid "Your current password to confirm the changes of the email address" -msgstr "" - -#: mod/settings.php:776 -msgid "Delete OpenID URL" -msgstr "" - -#: mod/settings.php:778 -msgid "Basic Settings" -msgstr "" - -#: mod/settings.php:779 src/Module/Profile/Profile.php:144 -msgid "Full Name:" -msgstr "" - -#: mod/settings.php:780 -msgid "Email Address:" -msgstr "" - -#: mod/settings.php:781 -msgid "Your Timezone:" -msgstr "" - -#: mod/settings.php:782 -msgid "Your Language:" -msgstr "" - -#: mod/settings.php:782 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "" - -#: mod/settings.php:783 -msgid "Default Post Location:" -msgstr "" - -#: mod/settings.php:784 -msgid "Use Browser Location:" -msgstr "" - -#: mod/settings.php:786 -msgid "Security and Privacy Settings" -msgstr "" - -#: mod/settings.php:788 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: mod/settings.php:788 mod/settings.php:798 -msgid "(to prevent spam abuse)" -msgstr "" - -#: mod/settings.php:790 -msgid "Allow your profile to be searchable globally?" -msgstr "" - -#: mod/settings.php:790 -msgid "" -"Activate this setting if you want others to easily find and follow you. Your " -"profile will be searchable on remote systems. This setting also determines " -"whether Friendica will inform search engines that your profile should be " -"indexed or not." -msgstr "" - -#: mod/settings.php:791 -msgid "Hide your contact/friend list from viewers of your profile?" -msgstr "" - -#: mod/settings.php:791 -msgid "" -"A list of your contacts is displayed on your profile page. Activate this " -"option to disable the display of your contact list." -msgstr "" - -#: mod/settings.php:792 -msgid "Hide your profile details from anonymous viewers?" -msgstr "" - -#: mod/settings.php:792 -msgid "" -"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." -msgstr "" - -#: mod/settings.php:793 -msgid "Make public posts unlisted" -msgstr "" - -#: mod/settings.php:793 -msgid "" -"Your public posts will not appear on the community pages or in search " -"results, nor be sent to relay servers. However they can still appear on " -"public feeds on remote servers." -msgstr "" - -#: mod/settings.php:794 -msgid "Make all posted pictures accessible" -msgstr "" - -#: mod/settings.php:794 -msgid "" -"This option makes every posted picture accessible via the direct link. This " -"is a workaround for the problem that most other networks can't handle " -"permissions on pictures. Non public pictures still won't be visible for the " -"public on your photo albums though." -msgstr "" - -#: mod/settings.php:795 -msgid "Allow friends to post to your profile page?" -msgstr "" - -#: mod/settings.php:795 -msgid "" -"Your contacts may write posts on your profile wall. These posts will be " -"distributed to your contacts" -msgstr "" - -#: mod/settings.php:796 -msgid "Allow friends to tag your posts?" -msgstr "" - -#: mod/settings.php:796 -msgid "Your contacts can add additional tags to your posts." -msgstr "" - -#: mod/settings.php:797 -msgid "Permit unknown people to send you private mail?" -msgstr "" - -#: mod/settings.php:797 -msgid "" -"Friendica network users may send you private messages even if they are not " -"in your contact list." -msgstr "" - -#: mod/settings.php:798 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: mod/settings.php:800 -msgid "Default Post Permissions" -msgstr "" - -#: mod/settings.php:804 -msgid "Expiration settings" -msgstr "" - -#: mod/settings.php:805 -msgid "Automatically expire posts after this many days:" -msgstr "" - -#: mod/settings.php:805 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" - -#: mod/settings.php:806 -msgid "Expire posts" -msgstr "" - -#: mod/settings.php:806 -msgid "When activated, posts and comments will be expired." -msgstr "" - -#: mod/settings.php:807 -msgid "Expire personal notes" -msgstr "" - -#: mod/settings.php:807 -msgid "" -"When activated, the personal notes on your profile page will be expired." -msgstr "" - -#: mod/settings.php:808 -msgid "Expire starred posts" -msgstr "" - -#: mod/settings.php:808 -msgid "" -"Starring posts keeps them from being expired. That behaviour is overwritten " -"by this setting." -msgstr "" - -#: mod/settings.php:809 -msgid "Expire photos" -msgstr "" - -#: mod/settings.php:809 -msgid "When activated, photos will be expired." -msgstr "" - -#: mod/settings.php:810 -msgid "Only expire posts by others" -msgstr "" - -#: mod/settings.php:810 -msgid "" -"When activated, your own posts never expire. Then the settings above are " -"only valid for posts you received." -msgstr "" - -#: mod/settings.php:813 -msgid "Notification Settings" -msgstr "" - -#: mod/settings.php:814 -msgid "Send a notification email when:" -msgstr "" - -#: mod/settings.php:815 -msgid "You receive an introduction" -msgstr "" - -#: mod/settings.php:816 -msgid "Your introductions are confirmed" -msgstr "" - -#: mod/settings.php:817 -msgid "Someone writes on your profile wall" -msgstr "" - -#: mod/settings.php:818 -msgid "Someone writes a followup comment" -msgstr "" - -#: mod/settings.php:819 -msgid "You receive a private message" -msgstr "" - -#: mod/settings.php:820 -msgid "You receive a friend suggestion" -msgstr "" - -#: mod/settings.php:821 -msgid "You are tagged in a post" -msgstr "" - -#: mod/settings.php:822 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: mod/settings.php:824 -msgid "Create a desktop notification when:" -msgstr "" - -#: mod/settings.php:825 -msgid "Someone liked your content" -msgstr "" - -#: mod/settings.php:826 -msgid "Someone shared your content" -msgstr "" - -#: mod/settings.php:828 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:828 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:830 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:832 -msgid "Send text only notification emails, without the html part" -msgstr "" - -#: mod/settings.php:834 -msgid "Show detailled notifications" -msgstr "" - -#: mod/settings.php:836 -msgid "" -"Per default, notifications are condensed to a single notification per item. " -"When enabled every notification is displayed." -msgstr "" - -#: mod/settings.php:838 -msgid "Show notifications of ignored contacts" -msgstr "" - -#: mod/settings.php:840 -msgid "" -"You don't see posts from ignored contacts. But you still see their comments. " -"This setting controls if you want to still receive regular notifications " -"that are caused by ignored contacts or not." -msgstr "" - -#: mod/settings.php:842 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:843 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:846 -msgid "Import Contacts" -msgstr "" - -#: mod/settings.php:847 -msgid "" -"Upload a CSV file that contains the handle of your followed accounts in the " -"first column you exported from the old account." -msgstr "" - -#: mod/settings.php:848 -msgid "Upload File" -msgstr "" - -#: mod/settings.php:850 -msgid "Relocate" -msgstr "" - -#: mod/settings.php:851 -msgid "" -"If you have moved this profile from another server, and some of your " -"contacts don't receive your updates, try pushing this button." -msgstr "" - -#: mod/settings.php:852 -msgid "Resend relocate message to contacts" -msgstr "" - #: mod/suggest.php:44 msgid "" "No suggestions available. If this is a new site, please try again in 24 " @@ -2216,6 +1669,14 @@ msgstr "" msgid "Enter new password: " msgstr "" +#: src/Console/User.php:210 src/Module/Settings/Account.php:72 +msgid "Password update failed. Please try again." +msgstr "" + +#: src/Console/User.php:213 src/Module/Settings/Account.php:75 +msgid "Password changed." +msgstr "" + #: src/Console/User.php:237 msgid "Enter user name: " msgstr "" @@ -3232,6 +2693,10 @@ msgstr "" msgid "News" msgstr "" +#: src/Content/Widget.php:523 src/Module/Settings/Account.php:429 +msgid "Account Types" +msgstr "" + #: src/Content/Widget.php:524 src/Module/Admin/BaseUsers.php:51 msgid "All" msgstr "" @@ -4793,10 +4258,42 @@ msgstr "" msgid "List of pending user deletions" msgstr "" +#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:467 +msgid "Normal Account Page" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:474 +msgid "Soapbox Page" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:481 +msgid "Public Forum" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:488 +msgid "Automatic Friend Page" +msgstr "" + #: src/Module/Admin/BaseUsers.php:104 msgid "Private Forum" msgstr "" +#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:439 +msgid "Personal Page" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:446 +msgid "Organisation Page" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:453 +msgid "News Page" +msgstr "" + +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:460 +msgid "Community Forum" +msgstr "" + #: src/Module/Admin/BaseUsers.php:111 msgid "Relay" msgstr "" @@ -8647,6 +8144,10 @@ msgid "" "\"btn btn-sm pull-right\">Cancel" msgstr "" +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:547 +msgid "Full Name:" +msgstr "" + #: src/Module/Profile/Profile.php:149 msgid "Member since:" msgstr "" @@ -8773,10 +8274,18 @@ msgstr "" msgid "Please repeat your e-mail address:" msgstr "" +#: src/Module/Register.php:162 src/Module/Settings/Account.php:538 +msgid "New Password:" +msgstr "" + #: src/Module/Register.php:162 msgid "Leave empty for an auto generated password." msgstr "" +#: src/Module/Register.php:163 src/Module/Settings/Account.php:539 +msgid "Confirm:" +msgstr "" + #: src/Module/Register.php:164 #, php-format msgid "" @@ -9040,6 +8549,492 @@ msgstr "" msgid "Verify code and complete login" msgstr "" +#: src/Module/Settings/Account.php:64 +msgid "Passwords do not match." +msgstr "" + +#: src/Module/Settings/Account.php:78 +msgid "Password unchanged." +msgstr "" + +#: src/Module/Settings/Account.php:93 +msgid "Please use a shorter name." +msgstr "" + +#: src/Module/Settings/Account.php:96 +msgid "Name too short." +msgstr "" + +#: src/Module/Settings/Account.php:105 +msgid "Wrong Password." +msgstr "" + +#: src/Module/Settings/Account.php:110 +msgid "Invalid email." +msgstr "" + +#: src/Module/Settings/Account.php:116 +msgid "Cannot change to that email." +msgstr "" + +#: src/Module/Settings/Account.php:146 src/Module/Settings/Account.php:198 +#: src/Module/Settings/Account.php:218 src/Module/Settings/Account.php:278 +#: src/Module/Settings/Account.php:327 +msgid "Settings were not updated." +msgstr "" + +#: src/Module/Settings/Account.php:339 +msgid "Contact CSV file upload error" +msgstr "" + +#: src/Module/Settings/Account.php:358 +msgid "Importing Contacts done" +msgstr "" + +#: src/Module/Settings/Account.php:371 +msgid "Relocate message has been send to your contacts" +msgstr "" + +#: src/Module/Settings/Account.php:388 +msgid "Unable to find your profile. Please contact your admin." +msgstr "" + +#: src/Module/Settings/Account.php:430 +msgid "Personal Page Subtypes" +msgstr "" + +#: src/Module/Settings/Account.php:431 +msgid "Community Forum Subtypes" +msgstr "" + +#: src/Module/Settings/Account.php:441 +msgid "Account for a personal profile." +msgstr "" + +#: src/Module/Settings/Account.php:448 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: src/Module/Settings/Account.php:455 +msgid "" +"Account for a news reflector that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: src/Module/Settings/Account.php:462 +msgid "Account for community discussions." +msgstr "" + +#: src/Module/Settings/Account.php:469 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "" + +#: src/Module/Settings/Account.php:476 +msgid "" +"Account for a public profile that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: src/Module/Settings/Account.php:483 +msgid "Automatically approves all contact requests." +msgstr "" + +#: src/Module/Settings/Account.php:490 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "" + +#: src/Module/Settings/Account.php:495 +msgid "Private Forum [Experimental]" +msgstr "" + +#: src/Module/Settings/Account.php:497 +msgid "Requires manual approval of contact requests." +msgstr "" + +#: src/Module/Settings/Account.php:506 +msgid "OpenID:" +msgstr "" + +#: src/Module/Settings/Account.php:506 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "" + +#: src/Module/Settings/Account.php:514 +msgid "Publish your profile in your local site directory?" +msgstr "" + +#: src/Module/Settings/Account.php:514 +#, php-format +msgid "" +"Your profile will be published in this node's local " +"directory. Your profile details may be publicly visible depending on the " +"system settings." +msgstr "" + +#: src/Module/Settings/Account.php:520 +#, php-format +msgid "" +"Your profile will also be published in the global friendica directories (e." +"g. %s)." +msgstr "" + +#: src/Module/Settings/Account.php:528 +msgid "Account Settings" +msgstr "" + +#: src/Module/Settings/Account.php:529 +#, php-format +msgid "Your Identity Address is '%s' or '%s'." +msgstr "" + +#: src/Module/Settings/Account.php:537 +msgid "Password Settings" +msgstr "" + +#: src/Module/Settings/Account.php:538 +msgid "" +"Allowed characters are a-z, A-Z, 0-9 and special characters except white " +"spaces, accentuated letters and colon (:)." +msgstr "" + +#: src/Module/Settings/Account.php:539 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: src/Module/Settings/Account.php:540 +msgid "Current Password:" +msgstr "" + +#: src/Module/Settings/Account.php:540 +msgid "Your current password to confirm the changes" +msgstr "" + +#: src/Module/Settings/Account.php:541 +msgid "Password:" +msgstr "" + +#: src/Module/Settings/Account.php:541 +msgid "Your current password to confirm the changes of the email address" +msgstr "" + +#: src/Module/Settings/Account.php:544 +msgid "Delete OpenID URL" +msgstr "" + +#: src/Module/Settings/Account.php:546 +msgid "Basic Settings" +msgstr "" + +#: src/Module/Settings/Account.php:548 +msgid "Email Address:" +msgstr "" + +#: src/Module/Settings/Account.php:549 +msgid "Your Timezone:" +msgstr "" + +#: src/Module/Settings/Account.php:550 +msgid "Your Language:" +msgstr "" + +#: src/Module/Settings/Account.php:550 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "" + +#: src/Module/Settings/Account.php:551 +msgid "Default Post Location:" +msgstr "" + +#: src/Module/Settings/Account.php:552 +msgid "Use Browser Location:" +msgstr "" + +#: src/Module/Settings/Account.php:554 +msgid "Security and Privacy Settings" +msgstr "" + +#: src/Module/Settings/Account.php:556 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: src/Module/Settings/Account.php:556 src/Module/Settings/Account.php:566 +msgid "(to prevent spam abuse)" +msgstr "" + +#: src/Module/Settings/Account.php:558 +msgid "Allow your profile to be searchable globally?" +msgstr "" + +#: src/Module/Settings/Account.php:558 +msgid "" +"Activate this setting if you want others to easily find and follow you. Your " +"profile will be searchable on remote systems. This setting also determines " +"whether Friendica will inform search engines that your profile should be " +"indexed or not." +msgstr "" + +#: src/Module/Settings/Account.php:559 +msgid "Hide your contact/friend list from viewers of your profile?" +msgstr "" + +#: src/Module/Settings/Account.php:559 +msgid "" +"A list of your contacts is displayed on your profile page. Activate this " +"option to disable the display of your contact list." +msgstr "" + +#: src/Module/Settings/Account.php:560 +msgid "Hide your profile details from anonymous viewers?" +msgstr "" + +#: src/Module/Settings/Account.php:560 +msgid "" +"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." +msgstr "" + +#: src/Module/Settings/Account.php:561 +msgid "Make public posts unlisted" +msgstr "" + +#: src/Module/Settings/Account.php:561 +msgid "" +"Your public posts will not appear on the community pages or in search " +"results, nor be sent to relay servers. However they can still appear on " +"public feeds on remote servers." +msgstr "" + +#: src/Module/Settings/Account.php:562 +msgid "Make all posted pictures accessible" +msgstr "" + +#: src/Module/Settings/Account.php:562 +msgid "" +"This option makes every posted picture accessible via the direct link. This " +"is a workaround for the problem that most other networks can't handle " +"permissions on pictures. Non public pictures still won't be visible for the " +"public on your photo albums though." +msgstr "" + +#: src/Module/Settings/Account.php:563 +msgid "Allow friends to post to your profile page?" +msgstr "" + +#: src/Module/Settings/Account.php:563 +msgid "" +"Your contacts may write posts on your profile wall. These posts will be " +"distributed to your contacts" +msgstr "" + +#: src/Module/Settings/Account.php:564 +msgid "Allow friends to tag your posts?" +msgstr "" + +#: src/Module/Settings/Account.php:564 +msgid "Your contacts can add additional tags to your posts." +msgstr "" + +#: src/Module/Settings/Account.php:565 +msgid "Permit unknown people to send you private mail?" +msgstr "" + +#: src/Module/Settings/Account.php:565 +msgid "" +"Friendica network users may send you private messages even if they are not " +"in your contact list." +msgstr "" + +#: src/Module/Settings/Account.php:566 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: src/Module/Settings/Account.php:568 +msgid "Default Post Permissions" +msgstr "" + +#: src/Module/Settings/Account.php:572 +msgid "Expiration settings" +msgstr "" + +#: src/Module/Settings/Account.php:573 +msgid "Automatically expire posts after this many days:" +msgstr "" + +#: src/Module/Settings/Account.php:573 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "" + +#: src/Module/Settings/Account.php:574 +msgid "Expire posts" +msgstr "" + +#: src/Module/Settings/Account.php:574 +msgid "When activated, posts and comments will be expired." +msgstr "" + +#: src/Module/Settings/Account.php:575 +msgid "Expire personal notes" +msgstr "" + +#: src/Module/Settings/Account.php:575 +msgid "" +"When activated, the personal notes on your profile page will be expired." +msgstr "" + +#: src/Module/Settings/Account.php:576 +msgid "Expire starred posts" +msgstr "" + +#: src/Module/Settings/Account.php:576 +msgid "" +"Starring posts keeps them from being expired. That behaviour is overwritten " +"by this setting." +msgstr "" + +#: src/Module/Settings/Account.php:577 +msgid "Only expire posts by others" +msgstr "" + +#: src/Module/Settings/Account.php:577 +msgid "" +"When activated, your own posts never expire. Then the settings above are " +"only valid for posts you received." +msgstr "" + +#: src/Module/Settings/Account.php:580 +msgid "Notification Settings" +msgstr "" + +#: src/Module/Settings/Account.php:581 +msgid "Send a notification email when:" +msgstr "" + +#: src/Module/Settings/Account.php:582 +msgid "You receive an introduction" +msgstr "" + +#: src/Module/Settings/Account.php:583 +msgid "Your introductions are confirmed" +msgstr "" + +#: src/Module/Settings/Account.php:584 +msgid "Someone writes on your profile wall" +msgstr "" + +#: src/Module/Settings/Account.php:585 +msgid "Someone writes a followup comment" +msgstr "" + +#: src/Module/Settings/Account.php:586 +msgid "You receive a private message" +msgstr "" + +#: src/Module/Settings/Account.php:587 +msgid "You receive a friend suggestion" +msgstr "" + +#: src/Module/Settings/Account.php:588 +msgid "You are tagged in a post" +msgstr "" + +#: src/Module/Settings/Account.php:589 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: src/Module/Settings/Account.php:591 +msgid "Create a desktop notification when:" +msgstr "" + +#: src/Module/Settings/Account.php:592 +msgid "Someone liked your content" +msgstr "" + +#: src/Module/Settings/Account.php:593 +msgid "Someone shared your content" +msgstr "" + +#: src/Module/Settings/Account.php:595 +msgid "Activate desktop notifications" +msgstr "" + +#: src/Module/Settings/Account.php:595 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: src/Module/Settings/Account.php:599 +msgid "Text-only notification emails" +msgstr "" + +#: src/Module/Settings/Account.php:601 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: src/Module/Settings/Account.php:605 +msgid "Show detailled notifications" +msgstr "" + +#: src/Module/Settings/Account.php:607 +msgid "" +"Per default, notifications are condensed to a single notification per item. " +"When enabled every notification is displayed." +msgstr "" + +#: src/Module/Settings/Account.php:611 +msgid "Show notifications of ignored contacts" +msgstr "" + +#: src/Module/Settings/Account.php:613 +msgid "" +"You don't see posts from ignored contacts. But you still see their comments. " +"This setting controls if you want to still receive regular notifications " +"that are caused by ignored contacts or not." +msgstr "" + +#: src/Module/Settings/Account.php:616 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: src/Module/Settings/Account.php:617 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: src/Module/Settings/Account.php:620 +msgid "Import Contacts" +msgstr "" + +#: src/Module/Settings/Account.php:621 +msgid "" +"Upload a CSV file that contains the handle of your followed accounts in the " +"first column you exported from the old account." +msgstr "" + +#: src/Module/Settings/Account.php:622 +msgid "Upload File" +msgstr "" + +#: src/Module/Settings/Account.php:625 +msgid "Relocate" +msgstr "" + +#: src/Module/Settings/Account.php:626 +msgid "" +"If you have moved this profile from another server, and some of your " +"contacts don't receive your updates, try pushing this button." +msgstr "" + +#: src/Module/Settings/Account.php:627 +msgid "Resend relocate message to contacts" +msgstr "" + #: src/Module/Settings/Delegation.php:53 msgid "Delegation successfully granted." msgstr ""