X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=12bfc302f74fe0dce870c5d71f8e070fcc273f02;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=b4275f6baa2d4f2a709c57a25de218b6265778c8;hpb=8039ad0e2318c28a22f87c31dbbdb3165f1ef058;p=friendica.git

diff --git a/mod/crepair.php b/mod/crepair.php
index b4275f6baa..12bfc302f7 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -1,64 +1,77 @@
 <?php
-require_once("include/contact_selectors.php");
-require_once("mod/contacts.php");
 
-function crepair_init(&$a) {
-	if(! local_user())
+/**
+ * @file mod/crepair.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+
+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])) {
+	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)) {
+		if (!DBM::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
 
-	if(! x($a->page,'aside'))
+	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
+	}
 
-	if($contact_id) {
+	if ($contact_id) {
 		$a->data['contact'] = $r[0];
 		$contact = $r[0];
-		profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
+		profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 	}
 }
 
-
-function crepair_post(&$a) {
-	if(! local_user())
+function crepair_post(App $a)
+{
+	if (!local_user()) {
 		return;
+	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if($cid) {
+	if ($cid) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($cid),
 			intval(local_user())
 		);
 	}
 
-	if(! dbm::is_result($r))
+	if (!DBM::is_result($r)) {
 		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",
@@ -76,42 +89,39 @@ function crepair_post(&$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(t('Contact settings applied.') . EOL);
+	} else {
+		notice(t('Contact update failed.') . EOL);
+	}
 
 	return;
 }
 
-
-
-function crepair_content(&$a) {
-
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function crepair_content(App $a)
+{
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if($cid) {
+	if ($cid) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($cid),
 			intval(local_user())
 		);
 	}
 
-	if(! dbm::is_result($r)) {
-		notice( t('Contact not found.') . EOL);
+	if (!DBM::is_result($r)) {
+		notice(t('Contact not found.') . EOL);
 		return;
 	}
 
@@ -122,45 +132,44 @@ function crepair_content(&$a) {
 
 	$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'], array(NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA))) {
 		$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 = 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'));
+	}
 
-	$update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
+	$update_profile = in_array($contact['network'], array(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'),
-
+	$o = replace_macros($tpl, array(
+		'$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'),
 		'$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
-				),
+			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'])),
@@ -174,5 +183,4 @@ function crepair_content(&$a) {
 	));
 
 	return $o;
-
 }