X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=29b00b4e3aab3a6848837636e5c45406a5edbb34;hb=0e8fa341561c7fafb962564d4d46988298b84671;hp=c141958e8b958778acddab4e78858f7f2fd5697d;hpb=479180ca8ea9fb02c8e90b0017d2f584aa199043;p=friendica.git

diff --git a/mod/crepair.php b/mod/crepair.php
index c141958e8b..29b00b4e3a 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -1,66 +1,65 @@
 <?php
-require_once("include/contact_selectors.php");
-require_once("mod/contacts.php");
-
-function crepair_init(App &$a) {
-	if (! local_user()) {
+/**
+ * @file mod/crepair.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+
+require_once 'mod/contacts.php';
+
+function crepair_init(App $a)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	$contact_id = 0;
-
-	if(($a->argc == 2) && intval($a->argv[1])) {
-		$contact_id = intval($a->argv[1]);
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($contact_id)
-		);
-		if (! dbm::is_result($r)) {
-			$contact_id = 0;
-		}
+	$contact = null;
+	if (($a->argc == 2) && intval($a->argv[1])) {
+		$contact = dba::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
 	}
 
-	if(! x($a->page,'aside'))
+	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
+	}
 
-	if($contact_id) {
-		$a->data['contact'] = $r[0];
-		$contact = $r[0];
-		profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
+	if (DBM::is_result($contact)) {
+		$a->data['contact'] = $contact;
+		Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 	}
 }
 
-function crepair_post(App &$a) {
-	if (! local_user()) {
+function crepair_post(App $a)
+{
+	if (!local_user()) {
 		return;
 	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if($cid) {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($cid),
-			intval(local_user())
-		);
+	$contact = null;
+	if ($cid) {
+		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (! dbm::is_result($r)) {
+	if (!DBM::is_result($contact)) {
 		return;
 	}
 
-	$contact = $r[0];
-
-	$name    = ((x($_POST,'name')) ? $_POST['name'] : $contact['name']);
-	$nick    = ((x($_POST,'nick')) ? $_POST['nick'] : '');
-	$url     = ((x($_POST,'url')) ? $_POST['url'] : '');
-	$request = ((x($_POST,'request')) ? $_POST['request'] : '');
-	$confirm = ((x($_POST,'confirm')) ? $_POST['confirm'] : '');
-	$notify  = ((x($_POST,'notify')) ? $_POST['notify'] : '');
-	$poll    = ((x($_POST,'poll')) ? $_POST['poll'] : '');
-	$attag   = ((x($_POST,'attag')) ? $_POST['attag'] : '');
-	$photo   = ((x($_POST,'photo')) ? $_POST['photo'] : '');
-	$remote_self = ((x($_POST,'remote_self')) ? $_POST['remote_self'] : false);
-	$nurl    = normalise_link($url);
+	$name        = defaults($_POST, 'name'       , $contact['name']);
+	$nick        = defaults($_POST, 'nick'       , '');
+	$url         = defaults($_POST, 'url'        , '');
+	$request     = defaults($_POST, 'request'    , '');
+	$confirm     = defaults($_POST, 'confirm'    , '');
+	$notify      = defaults($_POST, 'notify'     , '');
+	$poll        = defaults($_POST, 'poll'       , '');
+	$attag       = defaults($_POST, 'attag'      , '');
+	$photo       = defaults($_POST, 'photo'      , '');
+	$remote_self = defaults($_POST, 'remote_self', false);
+	$nurl        = normalise_link($url);
 
 	$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",
@@ -78,103 +77,94 @@ function crepair_post(App &$a) {
 		local_user()
 	);
 
-	if($photo) {
+	if ($photo) {
 		logger('mod-crepair: updating photo from ' . $photo);
-		require_once("include/Photo.php");
 
-		update_contact_avatar($photo,local_user(),$contact['id']);
+		Contact::updateAvatar($photo, local_user(), $contact['id']);
 	}
 
-	if($r)
-		info( t('Contact settings applied.') . EOL);
-	else
-		notice( t('Contact update failed.') . EOL);
-
+	if ($r) {
+		info(L10n::t('Contact settings applied.') . EOL);
+	} else {
+		notice(L10n::t('Contact update failed.') . EOL);
+	}
 
 	return;
 }
 
-
-
-function crepair_content(App &$a) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function crepair_content(App $a)
+{
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if($cid) {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($cid),
-			intval(local_user())
-		);
+		$contact = null;
+	if ($cid) {
+		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (! dbm::is_result($r)) {
-		notice( t('Contact not found.') . EOL);
+	if (!DBM::is_result($contact)) {
+		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
 
-	$contact = $r[0];
-
-	$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";
 
-	$allow_remote_self = get_config('system','allow_users_remote_self');
+	$allow_remote_self = Config::get('system', 'allow_users_remote_self');
 
 	// 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'], array(NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA)))
+	if (!in_array($contact['network'], [NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_TWITTER])) {
 		$allow_remote_self = false;
+	}
 
-	if ($contact['network'] == NETWORK_FEED)
-		$remote_self_options = array('0'=>t('No mirroring'), '1'=>t('Mirror as forwarded posting'), '2'=>t('Mirror as my own posting'));
-	else
-		$remote_self_options = array('0'=>t('No mirroring'), '2'=>t('Mirror as my own posting'));
+	if ($contact['network'] == NETWORK_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' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
+	}
 
-	$update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
+	$update_profile = in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]);
 
 	$tab_str = contacts_tab($a, $contact['id'], 5);
 
-
 	$tpl = get_markup_template('crepair.tpl');
-	$o .= replace_macros($tpl, array(
-		//'$title'	=> t('Repair Contact Settings'),
-		'$tab_str'	=> $tab_str,
-		'$warning'	=> $warning,
-		'$info'		=> $info,
-		'$returnaddr'	=> $returnaddr,
-		'$return'	=> t('Return to contact editor'),
-		'$update_profile' => update_profile,
-		'$udprofilenow' => t('Refetch contact data'),
-		'$contact_id'	=> $contact['id'],
-		'$lbl_submit'	=> t('Submit'),
-
-		'$label_remote_self' => t('Remote Self'),
+	$o = replace_macros($tpl, [
+		'$tab_str'        => $tab_str,
+		'$warning'        => $warning,
+		'$info'           => $info,
+		'$returnaddr'     => $returnaddr,
+		'$return'         => L10n::t('Return to contact editor'),
+		'$update_profile' => $update_profile,
+		'$udprofilenow'   => L10n::t('Refetch contact data'),
+		'$contact_id'     => $contact['id'],
+		'$lbl_submit'     => L10n::t('Submit'),
+		'$label_remote_self' => L10n::t('Remote Self'),
 		'$allow_remote_self' => $allow_remote_self,
-		'$remote_self' => array('remote_self',
-					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.'),
-					$remote_self_options
-				),
-
-		'$name'		=> array('name', t('Name') , htmlentities($contact['name'])),
-		'$nick'		=> array('nick', t('Account Nickname'), htmlentities($contact['nick'])),
-		'$attag'	=> array('attag', t('@Tagname - overrides Name/Nickname'), $contact['attag']),
-		'$url'		=> array('url', t('Account URL'), $contact['url']),
-		'$request'	=> array('request', t('Friend Request URL'), $contact['request']),
-		'confirm'	=> array('confirm', t('Friend Confirm URL'), $contact['confirm']),
-		'notify'	=> array('notify', t('Notification Endpoint URL'), $contact['notify']),
-		'poll'		=> array('poll', t('Poll/Feed URL'), $contact['poll']),
-		'photo'		=> array('photo', t('New photo from this URL'), ''),
-	));
+		'$remote_self' => ['remote_self',
+			L10n::t('Mirror postings from this contact'),
+			$contact['remote_self'],
+			L10n::t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
+			$remote_self_options
+		],
+
+		'$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;
-
 }