X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=6531f31cf08decc38ccade375b4bb4fa10be0821;hb=789e1f4275bb216183f93cc392bd6faebfe87fb9;hp=77a5755855bc3e2e6b24b33dc7a1f3c76f0021f4;hpb=edb303d44a9109c98bde75ef91b0e40dbe4eeb3b;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 77a5755855..6531f31cf0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,23 +1,28 @@
theme_info['extends'];
- if (file_exists("view/theme/$theme/config.php")){
+ if (file_exists("view/theme/$theme/config.php")) {
return "view/theme/$theme/config.php";
}
- if (file_exists("view/theme/$base_theme/config.php")){
+ if (file_exists("view/theme/$base_theme/config.php")) {
return "view/theme/$base_theme/config.php";
}
+
return null;
}
-function settings_init(&$a) {
+function settings_init(&$a)
+{
+ if (!local_user()) {
+ notice(t('Permission denied.').EOL);
- if(! local_user()) {
- notice( t('Permission denied.') . EOL );
return;
}
@@ -29,121 +34,128 @@ function settings_init(&$a) {
// These lines provide the javascript needed by the acl selector
- $tpl = get_markup_template("settings-head.tpl");
- $a->page['htmlhead'] .= replace_macros($tpl,array(
- '$ispublic' => t('everybody')
+ $tpl = get_markup_template('settings-head.tpl');
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$ispublic' => t('everybody'),
));
-
-
$tabs = array(
array(
- 'label' => t('Account'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
+ 'label' => t('Account'),
+ 'url' => 'settings',
+ 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings') ? 'active' : ''),
'accesskey' => 'o',
),
- array(
- 'label' => t('Additional features'),
- 'url' => $a->get_baseurl(true).'/settings/features',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
+ );
+
+ if (get_features()) {
+ $tabs[] = array(
+ 'label' => t('Additional features'),
+ 'url' => 'settings/features',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
- ),
- array(
- 'label' => t('Display'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- 'accesskey' => 'i',
- ),
+ );
+ }
- array(
- 'label' => t('Social Networks'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- 'accesskey' => 'w',
- ),
- array(
- 'label' => t('Plugins'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- 'accesskey' => 'l',
- ),
- array(
- 'label' => t('Delegations'),
- 'url' => $a->get_baseurl(true).'/delegate',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
- 'accesskey' => 'd',
- ),
- array(
- 'label' => t('Connected apps'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- 'accesskey' => 'b',
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
- 'accesskey' => 'e',
- ),
- array(
- 'label' => t('Remove account'),
- 'url' => $a->get_baseurl(true) . '/removeme',
- 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
- 'accesskey' => 'r',
- )
+ $tabs[] = array(
+ 'label' => t('Display'),
+ 'url' => 'settings/display',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display') ? 'active' : ''),
+ 'accesskey' => 'i',
);
- $tabtpl = get_markup_template("generic_links_widget.tpl");
+ $tabs[] = array(
+ 'label' => t('Social Networks'),
+ 'url' => 'settings/connectors',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors') ? 'active' : ''),
+ 'accesskey' => 'w',
+ );
+
+ $tabs[] = array(
+ 'label' => t('Plugins'),
+ 'url' => 'settings/addon',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon') ? 'active' : ''),
+ 'accesskey' => 'l',
+ );
+
+ $tabs[] = array(
+ 'label' => t('Delegations'),
+ 'url' => 'delegate',
+ 'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate') ? 'active' : ''),
+ 'accesskey' => 'd',
+ );
+
+ $tabs[] = array(
+ 'label' => t('Connected apps'),
+ 'url' => 'settings/oauth',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth') ? 'active' : ''),
+ 'accesskey' => 'b',
+ );
+
+ $tabs[] = array(
+ 'label' => t('Export personal data'),
+ 'url' => 'uexport',
+ 'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport') ? 'active' : ''),
+ 'accesskey' => 'e',
+ );
+
+ $tabs[] = array(
+ 'label' => t('Remove account'),
+ 'url' => 'removeme',
+ 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme') ? 'active' : ''),
+ 'accesskey' => 'r',
+ );
+
+ $tabtpl = get_markup_template('generic_links_widget.tpl');
$a->page['aside'] = replace_macros($tabtpl, array(
'$title' => t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
));
-
}
-
-function settings_post(&$a) {
-
- if(! local_user())
+function settings_post(&$a)
+{
+ if (!local_user()) {
return;
+ }
- if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
return;
+ }
+
+ if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+ notice(t('Permission denied.').EOL);
- if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
- notice( t('Permission denied.') . EOL);
return;
}
$old_page_flags = $a->user['page-flags'];
- if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
+ if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove'];
q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
dbesc($key),
local_user());
- goaway($a->get_baseurl(true)."/settings/oauth/");
+ goaway($a->get_baseurl(true).'/settings/oauth/');
+
return;
}
- if(($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
-
+ if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit' || ($a->argv[2] === 'add')) && x($_POST, 'submit')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
- $name = ((x($_POST,'name')) ? $_POST['name'] : '');
- $key = ((x($_POST,'key')) ? $_POST['key'] : '');
- $secret = ((x($_POST,'secret')) ? $_POST['secret'] : '');
- $redirect = ((x($_POST,'redirect')) ? $_POST['redirect'] : '');
- $icon = ((x($_POST,'icon')) ? $_POST['icon'] : '');
- if ($name=="" || $key=="" || $secret==""){
- notice(t("Missing some important data!"));
-
+ $name = ((x($_POST, 'name')) ? $_POST['name'] : '');
+ $key = ((x($_POST, 'key')) ? $_POST['key'] : '');
+ $secret = ((x($_POST, 'secret')) ? $_POST['secret'] : '');
+ $redirect = ((x($_POST, 'redirect')) ? $_POST['redirect'] : '');
+ $icon = ((x($_POST, 'icon')) ? $_POST['icon'] : '');
+ if ($name == '' || $key == '' || $secret == '') {
+ notice(t('Missing some important data!'));
} else {
- if ($_POST['submit']==t("Update")){
+ if ($_POST['submit'] == t('Update')) {
$r = q("UPDATE clients SET
client_id='%s',
pw='%s',
@@ -171,55 +183,56 @@ function settings_post(&$a) {
local_user());
}
}
- goaway($a->get_baseurl(true)."/settings/oauth/");
+ goaway($a->get_baseurl(true).'/settings/oauth/');
+
return;
}
- if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+ if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
call_hooks('plugin_settings_post', $_POST);
+
return;
}
- if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
+ if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
- if(x($_POST, 'general-submit')) {
+ if (x($_POST, 'general-submit')) {
set_pconfig(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
set_pconfig(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+ set_pconfig(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
set_pconfig(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
- } elseif(x($_POST, 'imap-submit')) {
-
- $mail_server = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
- $mail_port = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
- $mail_ssl = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
- $mail_user = ((x($_POST,'mail_user')) ? $_POST['mail_user'] : '');
- $mail_pass = ((x($_POST,'mail_pass')) ? trim($_POST['mail_pass']) : '');
- $mail_action = ((x($_POST,'mail_action')) ? trim($_POST['mail_action']) : '');
- $mail_movetofolder = ((x($_POST,'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
- $mail_replyto = ((x($_POST,'mail_replyto')) ? $_POST['mail_replyto'] : '');
- $mail_pubmail = ((x($_POST,'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
-
-
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
- if(get_config('system','dfrn_only'))
+ } elseif (x($_POST, 'imap-submit')) {
+ $mail_server = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : '');
+ $mail_port = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
+ $mail_ssl = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
+ $mail_user = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
+ $mail_pass = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
+ $mail_action = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
+ $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
+ $mail_replyto = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
+ $mail_pubmail = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+
+ $mail_disabled = ((function_exists('imap_open') && (!get_config('system', 'imap_disabled'))) ? 0 : 1);
+ if (get_config('system', 'dfrn_only')) {
$mail_disabled = 1;
+ }
- if(! $mail_disabled) {
+ if (!$mail_disabled) {
$failed = false;
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ $r = q('SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1',
intval(local_user())
);
- if(! count($r)) {
- q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
+ if (!count($r)) {
+ q('INSERT INTO `mailacct` (`uid`) VALUES (%d)',
intval(local_user())
);
}
- if(strlen($mail_pass)) {
+ if (strlen($mail_pass)) {
$pass = '';
- openssl_public_encrypt($mail_pass,$pass,$a->user['pubkey']);
+ openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
q("UPDATE `mailacct` SET `pass` = '%s' WHERE `uid` = %d",
dbesc(bin2hex($pass)),
intval(local_user())
@@ -238,181 +251,189 @@ function settings_post(&$a) {
intval($mail_pubmail),
intval(local_user())
);
- logger("mail: updating mailaccount. Response: ".print_r($r, true));
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ logger('mail: updating mailaccount. Response: '.print_r($r, true));
+ $r = q('SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1',
intval(local_user())
);
- if(count($r)) {
+ if (count($r)) {
$eacct = $r[0];
- require_once('include/email.php');
+ require_once 'include/email.php';
$mb = construct_mailbox_name($eacct);
- if(strlen($eacct['server'])) {
+ if (strlen($eacct['server'])) {
$dcrpass = '';
- openssl_private_decrypt(hex2bin($eacct['pass']),$dcrpass,$a->user['prvkey']);
- $mbox = email_connect($mb,$mail_user,$dcrpass);
+ openssl_private_decrypt(hex2bin($eacct['pass']), $dcrpass, $a->user['prvkey']);
+ $mbox = email_connect($mb, $mail_user, $dcrpass);
unset($dcrpass);
- if(! $mbox) {
+ if (!$mbox) {
$failed = true;
- notice( t('Failed to connect with email account using the settings provided.') . EOL);
+ notice(t('Failed to connect with email account using the settings provided.').EOL);
}
}
}
- if(! $failed)
- info( t('Email settings updated.') . EOL);
+ if (!$failed) {
+ info(t('Email settings updated.').EOL);
+ }
}
}
call_hooks('connector_settings_post', $_POST);
+
return;
}
- if(($a->argc > 1) && ($a->argv[1] === 'features')) {
+ if (($a->argc > 1) && ($a->argv[1] === 'features')) {
check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
- foreach($_POST as $k => $v) {
- if(strpos($k,'feature_') === 0) {
- set_pconfig(local_user(),'feature',substr($k,8),((intval($v)) ? 1 : 0));
+ foreach ($_POST as $k => $v) {
+ if (strpos($k, 'feature_') === 0) {
+ set_pconfig(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info( t('Features updated') . EOL);
+ info(t('Features updated').EOL);
+
return;
}
- if(($a->argc > 1) && ($a->argv[1] === 'display')) {
-
+ if (($a->argc > 1) && ($a->argv[1] === 'display')) {
check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
- $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']);
- $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : '');
- $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0);
- $first_day_of_week = ((x($_POST,'first_day_of_week')) ? intval($_POST['first_day_of_week']) : 0);
- $noinfo = ((x($_POST,'noinfo')) ? intval($_POST['noinfo']) : 0);
- $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll']) : 0);
- $no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update']) : 0);
- $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
- $browser_update = $browser_update * 1000;
- if($browser_update < 10000)
- $browser_update = 10000;
-
- $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
- if($itemspage_network > 100)
+ $theme = ((x($_POST, 'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']);
+ $mobile_theme = ((x($_POST, 'mobile_theme')) ? notags(trim($_POST['mobile_theme'])) : '');
+ $nosmile = ((x($_POST, 'nosmile')) ? intval($_POST['nosmile']) : 0);
+ $first_day_of_week = ((x($_POST, 'first_day_of_week')) ? intval($_POST['first_day_of_week']) : 0);
+ $noinfo = ((x($_POST, 'noinfo')) ? intval($_POST['noinfo']) : 0);
+ $infinite_scroll = ((x($_POST, 'infinite_scroll')) ? intval($_POST['infinite_scroll']) : 0);
+ $no_auto_update = ((x($_POST, 'no_auto_update')) ? intval($_POST['no_auto_update']) : 0);
+ $browser_update = ((x($_POST, 'browser_update')) ? intval($_POST['browser_update']) : 0);
+ $bandwidth_saver = ((x($_POST, 'bandwidth_saver')) ? intval($_POST['bandwidth_saver']) : 0);
+ if ($browser_update != -1) {
+ $browser_update = $browser_update * 1000;
+ if ($browser_update < 10000) {
+ $browser_update = 10000;
+ }
+ }
+
+ $itemspage_network = ((x($_POST, 'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
+ if ($itemspage_network > 100) {
$itemspage_network = 100;
- $itemspage_mobile_network = ((x($_POST,'itemspage_mobile_network')) ? intval($_POST['itemspage_mobile_network']) : 20);
- if($itemspage_mobile_network > 100)
+ }
+ $itemspage_mobile_network = ((x($_POST, 'itemspage_mobile_network')) ? intval($_POST['itemspage_mobile_network']) : 20);
+ if ($itemspage_mobile_network > 100) {
$itemspage_mobile_network = 100;
-
-
- if($mobile_theme !== '') {
- set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
}
- set_pconfig(local_user(),'system','update_interval', $browser_update);
- set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
- set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
- set_pconfig(local_user(),'system','no_smilies',$nosmile);
- set_pconfig(local_user(),'system','first_day_of_week',$first_day_of_week);
- set_pconfig(local_user(),'system','ignore_info',$noinfo);
- set_pconfig(local_user(),'system','infinite_scroll',$infinite_scroll);
- set_pconfig(local_user(),'system','no_auto_update',$no_auto_update);
-
+ if ($mobile_theme !== '') {
+ set_pconfig(local_user(), 'system', 'mobile_theme', $mobile_theme);
+ }
- if ($theme == $a->user['theme']){
+ set_pconfig(local_user(), 'system', 'update_interval', $browser_update);
+ set_pconfig(local_user(), 'system', 'itemspage_network', $itemspage_network);
+ set_pconfig(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
+ set_pconfig(local_user(), 'system', 'no_smilies', $nosmile);
+ set_pconfig(local_user(), 'system', 'first_day_of_week', $first_day_of_week);
+ set_pconfig(local_user(), 'system', 'ignore_info', $noinfo);
+ set_pconfig(local_user(), 'system', 'infinite_scroll', $infinite_scroll);
+ set_pconfig(local_user(), 'system', 'no_auto_update', $no_auto_update);
+ set_pconfig(local_user(), 'system', 'bandwidth_saver', $bandwidth_saver);
+
+ if ($theme == $a->user['theme']) {
// call theme_post only if theme has not been changed
- if( ($themeconfigfile = get_theme_config_file($theme)) != null){
- require_once($themeconfigfile);
+ if (($themeconfigfile = get_theme_config_file($theme)) != null) {
+ require_once $themeconfigfile;
theme_post($a);
}
}
-
$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
dbesc($theme),
intval(local_user())
);
call_hooks('display_settings_post', $_POST);
- goaway($a->get_baseurl(true) . '/settings/display' );
+ goaway('settings/display');
+
return; // NOTREACHED
}
check_form_security_token_redirectOnErr('/settings', 'settings');
- if (x($_POST,'resend_relocate')) {
- proc_run('php', 'include/notifier.php', 'relocate', local_user());
- info(t("Relocate message has been send to your contacts"));
- goaway($a->get_baseurl(true) . '/settings');
+ if (x($_POST, 'resend_relocate')) {
+ proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user());
+ info(t('Relocate message has been send to your contacts'));
+ goaway('settings');
}
call_hooks('settings_post', $_POST);
- if((x($_POST,'password')) || (x($_POST,'confirm'))) {
-
+ if ((x($_POST, 'password')) || (x($_POST, 'confirm'))) {
$newpass = $_POST['password'];
$confirm = $_POST['confirm'];
$oldpass = hash('whirlpool', $_POST['opassword']);
$err = false;
- if($newpass != $confirm ) {
- notice( t('Passwords do not match. Password unchanged.') . EOL);
+ if ($newpass != $confirm) {
+ notice(t('Passwords do not match. Password unchanged.').EOL);
$err = true;
}
- if((! x($newpass)) || (! x($confirm))) {
- notice( t('Empty passwords are not allowed. Password unchanged.') . EOL);
+ if ((!x($newpass)) || (!x($confirm))) {
+ notice(t('Empty passwords are not allowed. Password unchanged.').EOL);
$err = true;
- }
-
- // check if the old password was supplied correctly before
- // changing it to the new value
- $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
- if( $oldpass != $r[0]['password'] ) {
- notice( t('Wrong password.') . EOL);
- $err = true;
- }
-
- if(! $err) {
- $password = hash('whirlpool',$newpass);
+ }
+
+ // check if the old password was supplied correctly before
+ // changing it to the new value
+ $r = q('SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1', intval(local_user()));
+ if ($oldpass != $r[0]['password']) {
+ notice(t('Wrong password.').EOL);
+ $err = true;
+ }
+
+ if (!$err) {
+ $password = hash('whirlpool', $newpass);
$r = q("UPDATE `user` SET `password` = '%s' WHERE `uid` = %d",
dbesc($password),
intval(local_user())
);
- if($r)
- info( t('Password changed.') . EOL);
- else
- notice( t('Password update failed. Please try again.') . EOL);
+ if ($r) {
+ info(t('Password changed.').EOL);
+ } else {
+ notice(t('Password update failed. Please try again.').EOL);
+ }
}
}
- $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
- $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
- $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
- $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
+ $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
+ $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
+ $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
+ $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
- $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
- $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
- $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
- $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
- $def_gid = ((x($_POST,'group-selection')) ? intval($_POST['group-selection']) : 0);
+ $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
+ $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+ $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
+ $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
+ $def_gid = ((x($_POST,'group-selection')) ? intval($_POST['group-selection']) : 0);
- $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
- $expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
+ $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
+ $expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
$expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
- $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
- $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
+ $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
+ $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
$allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
- $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
- $net_publish = (((x($_POST,'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
+ $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+ $net_publish = (((x($_POST,'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
$old_visibility = (((x($_POST,'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
- $page_flags = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
- $blockwall = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
- $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
- $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
- $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
- $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
- $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
- $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
+ $account_type = (((x($_POST,'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
+ $page_flags = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
+ $blockwall = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+ $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+ $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+ $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
+ $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
+ $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
+ $hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
$post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
$post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
@@ -421,22 +442,41 @@ function settings_post(&$a) {
$notify = 0;
- if(x($_POST,'notify1'))
+ if (x($_POST, 'notify1')) {
$notify += intval($_POST['notify1']);
- if(x($_POST,'notify2'))
+ }
+ if (x($_POST, 'notify2')) {
$notify += intval($_POST['notify2']);
- if(x($_POST,'notify3'))
+ }
+ if (x($_POST, 'notify3')) {
$notify += intval($_POST['notify3']);
- if(x($_POST,'notify4'))
+ }
+ if (x($_POST, 'notify4')) {
$notify += intval($_POST['notify4']);
- if(x($_POST,'notify5'))
+ }
+ if (x($_POST, 'notify5')) {
$notify += intval($_POST['notify5']);
- if(x($_POST,'notify6'))
+ }
+ if (x($_POST, 'notify6')) {
$notify += intval($_POST['notify6']);
- if(x($_POST,'notify7'))
+ }
+ if (x($_POST, 'notify7')) {
$notify += intval($_POST['notify7']);
- if(x($_POST,'notify8'))
+ }
+ if (x($_POST, 'notify8')) {
$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) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
+ $page_flags = PAGE_NORMAL;
+ } elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
+ $page_flags = PAGE_SOAPBOX;
+ } elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX))) {
+ $page_flags = PAGE_SOAPBOX;
+ } elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
+ $page_flags = PAGE_COMMUNITY;
+ }
$email_changed = false;
@@ -444,30 +484,33 @@ function settings_post(&$a) {
$name_change = false;
- if($username != $a->user['username']) {
+ if ($username != $a->user['username']) {
$name_change = true;
- if(strlen($username) > 40)
+ if (strlen($username) > 40) {
$err .= t(' Please use a shorter name.');
- if(strlen($username) < 3)
+ }
+ if (strlen($username) < 3) {
$err .= t(' Name too short.');
+ }
}
- if($email != $a->user['email']) {
+ if ($email != $a->user['email']) {
$email_changed = true;
// check for the correct password
- $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
+ $r = q('SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1', intval(local_user()));
$password = hash('whirlpool', $_POST['mpassword']);
if ($password != $r[0]['password']) {
- $err .= t('Wrong Password') . EOL;
+ $err .= t('Wrong Password').EOL;
$email = $a->user['email'];
}
// check the email is valid
- if(! valid_email($email))
+ if (!valid_email($email)) {
$err .= t(' Not valid email.');
+ }
// ensure new email is not the admin mail
//if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
- if(x($a->config,'admin_email')) {
- $adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
+ if (x($a->config, 'admin_email')) {
+ $adminlist = explode(',', str_replace(' ', '', strtolower($a->config['admin_email'])));
if (in_array(strtolower($email), $adminlist)) {
$err .= t(' Cannot change to that email.');
$email = $a->user['email'];
@@ -475,70 +518,70 @@ function settings_post(&$a) {
}
}
- if(strlen($err)) {
- notice($err . EOL);
+ if (strlen($err)) {
+ notice($err.EOL);
+
return;
}
- if($timezone != $a->user['timezone']) {
- if(strlen($timezone))
+ if ($timezone != $a->user['timezone']) {
+ if (strlen($timezone)) {
date_default_timezone_set($timezone);
+ }
}
- $str_group_allow = perms2str($_POST['group_allow']);
+ $str_group_allow = perms2str($_POST['group_allow']);
$str_contact_allow = perms2str($_POST['contact_allow']);
- $str_group_deny = perms2str($_POST['group_deny']);
- $str_contact_deny = perms2str($_POST['contact_deny']);
+ $str_group_deny = perms2str($_POST['group_deny']);
+ $str_contact_deny = perms2str($_POST['contact_deny']);
$openidserver = $a->user['openidserver'];
//$openid = normalise_openid($openid);
// If openid has changed or if there's an openid but no openidserver, try and discover it.
- if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
+ if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
$tmp_str = $openid;
- if(strlen($tmp_str) && validate_url($tmp_str)) {
+ if (strlen($tmp_str) && validate_url($tmp_str)) {
logger('updating openidserver');
- require_once('library/openid.php');
- $open_id_obj = new LightOpenID;
+ require_once 'library/openid.php';
+ $open_id_obj = new LightOpenID();
$open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity);
- }
- else
+ } else {
$openidserver = '';
+ }
}
- set_pconfig(local_user(),'expire','items', $expire_items);
- set_pconfig(local_user(),'expire','notes', $expire_notes);
- set_pconfig(local_user(),'expire','starred', $expire_starred);
- set_pconfig(local_user(),'expire','photos', $expire_photos);
- set_pconfig(local_user(),'expire','network_only', $expire_network_only);
+ set_pconfig(local_user(), 'expire', 'items', $expire_items);
+ set_pconfig(local_user(), 'expire', 'notes', $expire_notes);
+ set_pconfig(local_user(), 'expire', 'starred', $expire_starred);
+ set_pconfig(local_user(), 'expire', 'photos', $expire_photos);
+ set_pconfig(local_user(), 'expire', 'network_only', $expire_network_only);
- set_pconfig(local_user(),'system','suggestme', $suggestme);
- set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
- set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
- set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
+ set_pconfig(local_user(), 'system', 'suggestme', $suggestme);
+ set_pconfig(local_user(), 'system', 'post_newfriend', $post_newfriend);
+ set_pconfig(local_user(), 'system', 'post_joingroup', $post_joingroup);
+ set_pconfig(local_user(), 'system', 'post_profilechange', $post_profilechange);
- set_pconfig(local_user(),'system','email_textonly', $email_textonly);
+ set_pconfig(local_user(), 'system', 'email_textonly', $email_textonly);
- if($page_flags == PAGE_PRVGROUP) {
+ if ($page_flags == PAGE_PRVGROUP) {
$hidewall = 1;
- if((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) {
- if($def_gid) {
- info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
- $str_group_allow = '<' . $def_gid . '>';
- }
- else {
- notice( t('Private forum has no privacy permissions and no default privacy group.') . EOL);
+ if ((!$str_contact_allow) && (!$str_group_allow) && (!$str_contact_deny) && (!$str_group_deny)) {
+ if ($def_gid) {
+ info(t('Private forum has no privacy permissions. Using default privacy group.').EOL);
+ $str_group_allow = '<'.$def_gid.'>';
+ } else {
+ notice(t('Private forum has no privacy permissions and no default privacy group.').EOL);
}
}
}
-
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s',
`openid` = '%s', `timezone` = '%s',
`allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s',
- `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s',
+ `notify-flags` = %d, `page-flags` = %d, `account-type` = %d, `default-location` = '%s',
`allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s',
`def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d,
`unkmail` = %d, `cntunkmail` = %d, `language` = '%s'
@@ -553,6 +596,7 @@ function settings_post(&$a) {
dbesc($str_group_deny),
intval($notify),
intval($page_flags),
+ intval($account_type),
dbesc($defloc),
intval($allow_location),
intval($maxreq),
@@ -567,8 +611,9 @@ function settings_post(&$a) {
dbesc($language),
intval(local_user())
);
- if($r)
- info( t('Settings updated.') . EOL);
+ if ($r) {
+ info(t('Settings updated.').EOL);
+ }
// clear session language
unset($_SESSION['language']);
@@ -586,642 +631,676 @@ function settings_post(&$a) {
intval(local_user())
);
-
- if($name_change) {
- q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1",
+ if ($name_change) {
+ q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
dbesc($username),
dbesc(datetime_convert()),
intval(local_user())
);
}
- if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
+ if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if($url && strlen(get_config('system','directory')))
- proc_run('php',"include/directory.php","$url");
-
+ if ($url && strlen(get_config('system', 'directory'))) {
+ proc_run(PRIORITY_LOW, 'include/directory.php', $url);
+ }
}
-
- require_once('include/profile_update.php');
+ require_once 'include/profile_update.php';
profile_change();
+ // Update the global contact for the user
+ update_gcontact_for_user(local_user());
+
//$_SESSION['theme'] = $theme;
- if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
+ if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
// FIXME - set to un-verified, blocked and redirect to logout
// Why? Are we verifying people or email addresses?
-
}
- goaway($a->get_baseurl(true) . '/settings' );
+ goaway('settings');
+
return; // NOTREACHED
}
-
-if(! function_exists('settings_content')) {
-function settings_content(&$a) {
-
+function settings_content(&$a)
+{
$o = '';
nav_set_selected('settings');
- if(! local_user()) {
- #notice( t('Permission denied.') . EOL );
+ if (!local_user()) {
+ //notice( t('Permission denied.') . EOL );
return;
}
- if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
- notice( t('Permission denied.') . EOL );
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+ notice(t('Permission denied.').EOL);
+
return;
}
-
-
- if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
-
- if(($a->argc > 2) && ($a->argv[2] === 'add')) {
- $tpl = get_markup_template("settings_oauth_edit.tpl");
+ if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
+ if (($a->argc > 2) && ($a->argv[2] === 'add')) {
+ $tpl = get_markup_template('settings_oauth_edit.tpl');
$o .= replace_macros($tpl, array(
- '$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Save Settings'),
- '$cancel' => t('Cancel'),
- '$name' => array('name', t('Name'), '', ''),
- '$key' => array('key', t('Consumer Key'), '', ''),
- '$secret' => array('secret', t('Consumer Secret'), '', ''),
- '$redirect' => array('redirect', t('Redirect'), '', ''),
- '$icon' => array('icon', t('Icon url'), '', ''),
+ '$form_security_token' => get_form_security_token('settings_oauth'),
+ '$title' => t('Add application'),
+ '$submit' => t('Save Settings'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), '', ''),
+ '$key' => array('key', t('Consumer Key'), '', ''),
+ '$secret' => array('secret', t('Consumer Secret'), '', ''),
+ '$redirect' => array('redirect', t('Redirect'), '', ''),
+ '$icon' => array('icon', t('Icon url'), '', ''),
));
+
return $o;
}
- if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
+ if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
local_user());
- if (!count($r)){
+ if (!count($r)) {
notice(t("You can't edit this application."));
+
return;
}
$app = $r[0];
- $tpl = get_markup_template("settings_oauth_edit.tpl");
+ $tpl = get_markup_template('settings_oauth_edit.tpl');
$o .= replace_macros($tpl, array(
- '$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Update'),
- '$cancel' => t('Cancel'),
- '$name' => array('name', t('Name'), $app['name'] , ''),
- '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
- '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
- '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
- '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
+ '$form_security_token' => get_form_security_token('settings_oauth'),
+ '$title' => t('Add application'),
+ '$submit' => t('Update'),
+ '$cancel' => t('Cancel'),
+ '$name' => array('name', t('Name'), $app['name'], ''),
+ '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
+ '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
+ '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
+ '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
));
+
return $o;
}
- if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+ if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
local_user());
- goaway($a->get_baseurl(true)."/settings/oauth/");
+ goaway($a->get_baseurl(true).'/settings/oauth/');
+
return;
}
-
- $r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
+ $r = q('SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
FROM clients
LEFT JOIN tokens ON clients.client_id=tokens.client_id
- WHERE clients.uid IN (%d,0)",
+ WHERE clients.uid IN (%d,0)',
local_user(),
local_user());
-
- $tpl = get_markup_template("settings_oauth.tpl");
+ $tpl = get_markup_template('settings_oauth.tpl');
$o .= replace_macros($tpl, array(
- '$form_security_token' => get_form_security_token("settings_oauth"),
- '$baseurl' => $a->get_baseurl(true),
- '$title' => t('Connected Apps'),
- '$add' => t('Add application'),
- '$edit' => t('Edit'),
- '$delete' => t('Delete'),
+ '$form_security_token' => get_form_security_token('settings_oauth'),
+ '$baseurl' => $a->get_baseurl(true),
+ '$title' => t('Connected Apps'),
+ '$add' => t('Add application'),
+ '$edit' => t('Edit'),
+ '$delete' => t('Delete'),
'$consumerkey' => t('Client key starts with'),
- '$noname' => t('No name'),
- '$remove' => t('Remove authorization'),
- '$apps' => $r,
+ '$noname' => t('No name'),
+ '$remove' => t('Remove authorization'),
+ '$apps' => $r,
));
- return $o;
+ return $o;
}
- if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
- $settings_addons = "";
+ if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
+ $settings_addons = '';
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
- if(! count($r))
+ if (!count($r)) {
$settings_addons = t('No Plugin settings configured');
+ }
call_hooks('plugin_settings', $settings_addons);
-
- $tpl = get_markup_template("settings_addons.tpl");
+ $tpl = get_markup_template('settings_addons.tpl');
$o .= replace_macros($tpl, array(
- '$form_security_token' => get_form_security_token("settings_addon"),
- '$title' => t('Plugin Settings'),
- '$settings_addons' => $settings_addons
+ '$form_security_token' => get_form_security_token('settings_addon'),
+ '$title' => t('Plugin Settings'),
+ '$settings_addons' => $settings_addons,
));
+
return $o;
}
- if(($a->argc > 1) && ($a->argv[1] === 'features')) {
-
+ if (($a->argc > 1) && ($a->argv[1] === 'features')) {
$arr = array();
$features = get_features();
- foreach($features as $fname => $fdata) {
+ foreach ($features as $fname => $fdata) {
$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(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+ 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')));
}
}
-
- $tpl = get_markup_template("settings_features.tpl");
+ $tpl = get_markup_template('settings_features.tpl');
$o .= replace_macros($tpl, array(
- '$form_security_token' => get_form_security_token("settings_features"),
- '$title' => t('Additional Features'),
+ '$form_security_token' => get_form_security_token('settings_features'),
+ '$title' => t('Additional Features'),
'$features' => $arr,
- '$submit' => t('Save Settings'),
+ '$submit' => t('Save Settings'),
));
+
return $o;
}
- if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
-
+ if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
$settings_connectors = '';
- $settings_connectors .= ''. t('General Social Media Settings').'
';
+ $settings_connectors .= ''.t('General Social Media Settings').'
';
$settings_connectors .= '';
$settings_connectors .= '