X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=9970d32595a9815a3792b394891790e6ff3d4143;hb=6957069fb7d12fa4c5b1d8cb6be2718cf47e70c0;hp=f13e89cd16be3869c07ee3a24a22f2a5e3f944b1;hpb=b5f58d317e43b3f2b7bafb52e3ea65844976bfba;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index f13e89cd16..9970d32595 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/group.php');
 require_once('include/socgraph.php');
@@ -142,7 +143,7 @@ function settings_post(App $a) {
 		q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
 			dbesc($key),
 			local_user());
-		goaway(App::get_baseurl(true)."/settings/oauth/");
+		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
 
@@ -187,7 +188,7 @@ function settings_post(App $a) {
 						local_user());
 			}
 		}
-		goaway(App::get_baseurl(true)."/settings/oauth/");
+		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
 
@@ -230,17 +231,12 @@ function settings_post(App $a) {
 					intval(local_user())
 				);
 				if (! dbm::is_result($r)) {
-					q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
-						intval(local_user())
-					);
+					dba::insert('mailacct', array('uid' => 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'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
+			$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
 		}
 
 		$settings_connectors .= '<div id="legacy-contact-wrapper" class="field input">';
@@ -837,7 +833,7 @@ function settings_content(App $a) {
 		$settings_connectors .= '<span class="field_help">'.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.').'</span>';
 		$settings_connectors .= '</div>';
 
-		$settings_connectors .= '<p><a href="'.App::get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
+		$settings_connectors .= '<p><a href="'.System::baseUrl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
 
 		$settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 
@@ -1004,7 +1000,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),
@@ -1222,7 +1218,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 <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), App::get_baseurl().'/profile/'.$nickname),
+		'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), System::baseUrl().'/profile/'.$nickname),
 		'$basepath' => $a->get_hostname()
 	));
 
@@ -1270,7 +1266,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,