X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=9970d32595a9815a3792b394891790e6ff3d4143;hb=6957069fb7d12fa4c5b1d8cb6be2718cf47e70c0;hp=2707565abf73bd696e9d7ffd18d30e749a7c0b8c;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git
diff --git a/mod/settings.php b/mod/settings.php
index 2707565abf..9970d32595 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,6 +1,7 @@
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',
@@ -722,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;
}
@@ -738,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'),
@@ -828,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 .= '
';
@@ -837,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 .= '