X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=e8d24f43de51941fd4312acdea1a04a209ea6c13;hb=0695fa699c3aeae086d419326868098716e99ce5;hp=5c9c439e0ae0c2c47ea3338d465bac5a7d4bc91e;hpb=0afb0c2ea407a9dbde217d2d88edb75f7402a810;p=friendica.git diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0a..e8d24f43de 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1,5 +1,8 @@ local_user())); } if(strlen($mail_pass)) { $pass = ''; openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']); - q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d", - dbesc(bin2hex($pass)), - intval(local_user()) - ); + dba::update('mailacct', array('pass' => bin2hex($pass)), array('uid' => local_user())); } $r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s', `action` = %d, `movetofolder` = '%s', @@ -460,13 +458,13 @@ function settings_post(App $a) { $notify += intval($_POST['notify8']); // Adjust the page flag if the account type doesn't fit to the page flag. - if (($account_type == ACCOUNT_TYPE_PERSON) AND !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) + if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) $page_flags = PAGE_NORMAL; - elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) AND !in_array($page_flags, array(PAGE_SOAPBOX))) + elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX))) $page_flags = PAGE_SOAPBOX; - elseif (($account_type == ACCOUNT_TYPE_NEWS) AND !in_array($page_flags, array(PAGE_SOAPBOX))) + elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX))) $page_flags = PAGE_SOAPBOX; - elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) AND !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) + elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) $page_flags = PAGE_COMMUNITY; $email_changed = false; @@ -635,8 +633,7 @@ function settings_post(App $a) { } } - require_once('include/profile_update.php'); - profile_change(); + proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user()); // Update the global contact for the user update_gcontact_for_user(local_user()); @@ -721,7 +718,7 @@ function settings_content(App $a) { $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d", dbesc($a->argv[3]), local_user()); - goaway(App::get_baseurl(true)."/settings/oauth/"); + goaway(System::baseUrl(true)."/settings/oauth/"); return; } @@ -737,7 +734,7 @@ function settings_content(App $a) { $tpl = get_markup_template("settings_oauth.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), - '$baseurl' => App::get_baseurl(true), + '$baseurl' => System::baseUrl(true), '$title' => t('Connected Apps'), '$add' => t('Add application'), '$edit' => t('Edit'), @@ -779,7 +776,7 @@ function settings_content(App $a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On'))); } } @@ -827,7 +824,7 @@ function settings_content(App $a) { /// @TODO Found to much different usage to test empty/non-empty strings (e.g. empty(), trim() == '' ) which is wanted? if ($legacy_contact != "") { - $a->page['htmlhead'] = ''; + $a->page['htmlhead'] = ''; } $settings_connectors .= '
'; @@ -836,7 +833,7 @@ function settings_content(App $a) { $settings_connectors .= ''.t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.').''; $settings_connectors .= '
'; - $settings_connectors .= '

'.t("Repair OStatus subscriptions").'

'; + $settings_connectors .= '

'.t("Repair OStatus subscriptions").'

'; $settings_connectors .= '
'; @@ -877,12 +874,7 @@ function settings_content(App $a) { $tpl = get_markup_template("settings_connectors.tpl"); - if (! service_class_allows(local_user(),'email_connect')) { - $mail_disabled_message = upgrade_bool_message(); - } else { - $mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : ''); - } - + $mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : ''); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_connectors"), @@ -948,7 +940,7 @@ function settings_content(App $a) { $is_experimental = file_exists('view/theme/' . $th . '/experimental'); $unsupported = file_exists('view/theme/' . $th . '/unsupported'); $is_mobile = file_exists('view/theme/' . $th . '/mobile'); - if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ + if (!$is_experimental || ($is_experimental && (get_config('experimentals','exp_themes')==1 || get_config('experimentals','exp_themes')===false))){ $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); if ($is_mobile) { $mobile_themes[$f]=$theme_name; @@ -1003,7 +995,7 @@ function settings_content(App $a) { '$ptitle' => t('Display Settings'), '$form_security_token' => get_form_security_token("settings_display"), '$submit' => t('Save Settings'), - '$baseurl' => App::get_baseurl(true), + '$baseurl' => System::baseUrl(true), '$uid' => local_user(), '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true), @@ -1017,7 +1009,7 @@ function settings_content(App $a) { '$first_day_of_week' => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false), '$noinfo' => array('noinfo', t("Don't show notices"), $noinfo, ''), '$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''), - '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'), + '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, t('When disabled, the network page is updated all the time, which could be confusing while reading.')), '$bandwidth_saver' => array('bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')), '$d_tset' => t('General Theme Settings'), @@ -1100,7 +1092,7 @@ function settings_content(App $a) { // Set the account type to "Community" when the page is a community page but the account type doesn't fit // This is only happening on the first visit after the update - if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) AND + if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) && ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY)) $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY; @@ -1117,39 +1109,39 @@ function settings_content(App $a) { '$type_community' => ACCOUNT_TYPE_COMMUNITY, '$account_person' => array('account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON, - t('This account is a regular personal profile'), + t('Account for a personal profile.'), ($a->user['account-type'] == ACCOUNT_TYPE_PERSON)), '$account_organisation' => array('account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION, - t('This account is a profile for an organisation'), + t('Account for an organisation that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)), '$account_news' => array('account-type', t('News Page'), ACCOUNT_TYPE_NEWS, - t('This account is a news account/reflector'), + t('Account for a news reflector that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == ACCOUNT_TYPE_NEWS)), '$account_community' => array('account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY, - t('This account is a community forum where people can discuss with each other'), + t('Account for community discussions.'), ($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)), '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, - t('This account is a normal personal profile'), + t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), ($a->user['page-flags'] == PAGE_NORMAL)), '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX, - t('Automatically approve all connection/friend requests as read-only fans'), + t('Account for a public profile that automatically approves contact requests as "Followers".'), ($a->user['page-flags'] == PAGE_SOAPBOX)), '$page_community' => array('page-flags', t('Public Forum'), PAGE_COMMUNITY, - t('Automatically approve all contact requests'), + t('Automatically approves all contact requests.'), ($a->user['page-flags'] == PAGE_COMMUNITY)), '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE, - t('Automatically approve all connection/friend requests as friends'), + t('Account for a popular profile that automatically approves contact requests as "Friends".'), ($a->user['page-flags'] == PAGE_FREELOVE)), '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP, - t('Private forum - approved members only'), + t('Requires manual approval of contact requests.'), ($a->user['page-flags'] == PAGE_PRVGROUP)), @@ -1164,48 +1156,48 @@ function settings_content(App $a) { } $opt_tpl = get_markup_template("field_yesno.tpl"); - if(get_config('system','publish_all')) { + if (get_config('system','publish_all')) { $profile_in_dir = ''; } else { - $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + $profile_in_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'), t('Yes'))) )); } if (strlen(get_config('system','directory'))) { - $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + $profile_in_net_dir = replace_macros($opt_tpl, array( + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))) )); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))), + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))), + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))), + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); @@ -1221,7 +1213,7 @@ function settings_content(App $a) { $tpl_addr = get_markup_template("settings_nick_set.tpl"); $prof_addr = replace_macros($tpl_addr,array( - '$desc' => sprintf(t("Your Identity Address is '%s' or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), App::get_baseurl().'/profile/'.$nickname), + '$desc' => sprintf(t("Your Identity Address is '%s' or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), System::baseUrl().'/profile/'.$nickname), '$basepath' => $a->get_hostname() )); @@ -1231,11 +1223,11 @@ function settings_content(App $a) { 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), 'label' => t('Advanced Expiration'), - 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), - 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), - 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), - 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), - 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))), + 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))), + 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))), + 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))), + 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))), ); require_once('include/group.php'); @@ -1269,7 +1261,7 @@ function settings_content(App $a) { '$ptitle' => t('Account Settings'), '$submit' => t('Save Settings'), - '$baseurl' => App::get_baseurl(true), + '$baseurl' => System::baseUrl(true), '$uid' => local_user(), '$form_security_token' => get_form_security_token("settings"), '$nickname_block' => $prof_addr, @@ -1293,7 +1285,7 @@ function settings_content(App $a) { '$h_prv' => t('Security and Privacy Settings'), - '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], @@ -1323,7 +1315,7 @@ function settings_content(App $a) { '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'),