X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=37956421f52bdaa69a1cca9f94f7f42c171ab96f;hb=578549df13dac667b7386a2b74f3fe2a1dd7f254;hp=57796c44d1c59867d89599729270b0ff203be195;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/crepair.php b/mod/crepair.php
index 57796c44d1..37956421f5 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,9 +2,12 @@
 /**
  * @file mod/crepair.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
@@ -18,14 +21,14 @@ function crepair_init(App $a)
 
 	$contact = null;
 	if (($a->argc == 2) && intval($a->argv[1])) {
-		$contact = dba::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
+		$contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
 	}
 
 	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
 	}
 
-	if (DBM::is_result($contact)) {
+	if (DBA::isResult($contact)) {
 		$a->data['contact'] = $contact;
 		Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 	}
@@ -41,10 +44,10 @@ function crepair_post(App $a)
 
 	$contact = null;
 	if ($cid) {
-		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
@@ -62,15 +65,15 @@ function crepair_post(App $a)
 
 	$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
 		WHERE `id` = %d AND `uid` = %d",
-		dbesc($name),
-		dbesc($nick),
-		dbesc($url),
-		dbesc($nurl),
-		dbesc($request),
-		dbesc($confirm),
-		dbesc($notify),
-		dbesc($poll),
-		dbesc($attag),
+		DBA::escape($name),
+		DBA::escape($nick),
+		DBA::escape($url),
+		DBA::escape($nurl),
+		DBA::escape($request),
+		DBA::escape($confirm),
+		DBA::escape($notify),
+		DBA::escape($poll),
+		DBA::escape($attag),
 		intval($remote_self),
 		intval($contact['id']),
 		local_user()
@@ -83,9 +86,9 @@ function crepair_post(App $a)
 	}
 
 	if ($r) {
-		info(t('Contact settings applied.') . EOL);
+		info(L10n::t('Contact settings applied.') . EOL);
 	} else {
-		notice(t('Contact update failed.') . EOL);
+		notice(L10n::t('Contact update failed.') . EOL);
 	}
 
 	return;
@@ -94,7 +97,7 @@ function crepair_post(App $a)
 function crepair_content(App $a)
 {
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -102,16 +105,16 @@ function crepair_content(App $a)
 
 		$contact = null;
 	if ($cid) {
-		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (!DBM::is_result($contact)) {
-		notice(t('Contact not found.') . EOL);
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
 
-	$warning = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
-	$info = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
+	$warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
+	$info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
 
 	$returnaddr = "contacts/$cid";
 
@@ -120,17 +123,17 @@ function crepair_content(App $a)
 	// Disable remote self for everything except feeds.
 	// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
 	// Problem is, you couldn't reply to both networks.
-	if (!in_array($contact['network'], [NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA])) {
+	if (!in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) {
 		$allow_remote_self = false;
 	}
 
-	if ($contact['network'] == NETWORK_FEED) {
-		$remote_self_options = ['0' => t('No mirroring'), '1' => t('Mirror as forwarded posting'), '2' => t('Mirror as my own posting')];
+	if ($contact['network'] == Protocol::FEED) {
+		$remote_self_options = ['0' => L10n::t('No mirroring'), '1' => L10n::t('Mirror as forwarded posting'), '2' => L10n::t('Mirror as my own posting')];
 	} else {
-		$remote_self_options = ['0' => t('No mirroring'), '2' => t('Mirror as my own posting')];
+		$remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
 	}
 
-	$update_profile = in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]);
+	$update_profile = in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
 
 	$tab_str = contacts_tab($a, $contact['id'], 5);
 
@@ -140,29 +143,29 @@ function crepair_content(App $a)
 		'$warning'        => $warning,
 		'$info'           => $info,
 		'$returnaddr'     => $returnaddr,
-		'$return'         => t('Return to contact editor'),
+		'$return'         => L10n::t('Return to contact editor'),
 		'$update_profile' => $update_profile,
-		'$udprofilenow'   => t('Refetch contact data'),
+		'$udprofilenow'   => L10n::t('Refetch contact data'),
 		'$contact_id'     => $contact['id'],
-		'$lbl_submit'     => t('Submit'),
-		'$label_remote_self' => t('Remote Self'),
+		'$lbl_submit'     => L10n::t('Submit'),
+		'$label_remote_self' => L10n::t('Remote Self'),
 		'$allow_remote_self' => $allow_remote_self,
 		'$remote_self' => ['remote_self',
-			t('Mirror postings from this contact'),
+			L10n::t('Mirror postings from this contact'),
 			$contact['remote_self'],
-			t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
+			L10n::t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
 			$remote_self_options
 		],
 
-		'$name'		=> ['name', t('Name') , htmlentities($contact['name'])],
-		'$nick'		=> ['nick', t('Account Nickname'), htmlentities($contact['nick'])],
-		'$attag'	=> ['attag', t('@Tagname - overrides Name/Nickname'), $contact['attag']],
-		'$url'		=> ['url', t('Account URL'), $contact['url']],
-		'$request'	=> ['request', t('Friend Request URL'), $contact['request']],
-		'confirm'	=> ['confirm', t('Friend Confirm URL'), $contact['confirm']],
-		'notify'	=> ['notify', t('Notification Endpoint URL'), $contact['notify']],
-		'poll'		=> ['poll', t('Poll/Feed URL'), $contact['poll']],
-		'photo'		=> ['photo', t('New photo from this URL'), ''],
+		'$name'		=> ['name', L10n::t('Name') , htmlentities($contact['name'])],
+		'$nick'		=> ['nick', L10n::t('Account Nickname'), htmlentities($contact['nick'])],
+		'$attag'	=> ['attag', L10n::t('@Tagname - overrides Name/Nickname'), $contact['attag']],
+		'$url'		=> ['url', L10n::t('Account URL'), $contact['url']],
+		'$request'	=> ['request', L10n::t('Friend Request URL'), $contact['request']],
+		'confirm'	=> ['confirm', L10n::t('Friend Confirm URL'), $contact['confirm']],
+		'notify'	=> ['notify', L10n::t('Notification Endpoint URL'), $contact['notify']],
+		'poll'		=> ['poll', L10n::t('Poll/Feed URL'), $contact['poll']],
+		'photo'		=> ['photo', L10n::t('New photo from this URL'), ''],
 	]);
 
 	return $o;