X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=59b92df0a7d0d8c48a6f0acbaa2d8cb6894e0072;hb=db2d0e009503539b134fd43837d440028d5b8de7;hp=98202ae0b006310cddf8d697d6030054c23ceb95;hpb=f82ce0de66c2bb3ce8fb7e635ca8126e9e5b0039;p=friendica.git

diff --git a/mod/crepair.php b/mod/crepair.php
index 98202ae0b0..59b92df0a7 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -3,8 +3,9 @@ require_once("include/contact_selectors.php");
 require_once("mod/contacts.php");
 
 function crepair_init(&$a) {
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$contact_id = 0;
 
@@ -14,7 +15,7 @@ function crepair_init(&$a) {
 			intval(local_user()),
 			intval($contact_id)
 		);
-		if(! count($r)) {
+		if (! dbm::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
@@ -23,32 +24,16 @@ function crepair_init(&$a) {
 		$a->page['aside'] = '';
 
 	if($contact_id) {
-			$a->data['contact'] = $r[0];
-
-			if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
-				$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
-			} else 
-				$networkname = '';
-
-			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-				'$name' => htmlentities($a->data['contact']['name']),
-				'$photo' => $a->data['contact']['photo'],
-				'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
-				'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
-				'$network_name' => $networkname,
-				'$network' => t('Network:'),
-				'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
-			));
-
-			$a->page['aside'] .= $vcard_widget;
-
+		$a->data['contact'] = $r[0];
+		$contact = $r[0];
+		profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
 	}
 }
 
-
 function crepair_post(&$a) {
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
@@ -59,8 +44,9 @@ function crepair_post(&$a) {
 		);
 	}
 
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$contact = $r[0];
 
@@ -96,24 +82,7 @@ function crepair_post(&$a) {
 		logger('mod-crepair: updating photo from ' . $photo);
 		require_once("include/Photo.php");
 
-		$photos = import_profile_photo($photo,local_user(),$contact['id']);
-
-		$x = q("UPDATE `contact` SET `photo` = '%s',
-			`thumb` = '%s',
-			`micro` = '%s',
-			`name-date` = '%s',
-			`uri-date` = '%s',
-			`avatar-date` = '%s'
-			WHERE `id` = %d
-			",
-			dbesc($photos[0]),
-			dbesc($photos[1]),
-			dbesc($photos[2]),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			intval($contact['id'])
-		);
+		update_contact_avatar($photo,local_user(),$contact['id']);
 	}
 
 	if($r)
@@ -129,7 +98,7 @@ function crepair_post(&$a) {
 
 function crepair_content(&$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -143,7 +112,7 @@ function crepair_content(&$a) {
 		);
 	}
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
@@ -170,7 +139,7 @@ function crepair_content(&$a) {
 
 	$update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
 
-	$tab_str = contact_tabs($a, $contact['id'], 3);
+	$tab_str = contacts_tab($a, $contact['id'], 5);
 
 
 	$tpl = get_markup_template('crepair.tpl');
@@ -183,15 +152,9 @@ function crepair_content(&$a) {
 		'$return'	=> t('Return to contact editor'),
 		'$update_profile' => update_profile,
 		'$udprofilenow' => t('Refetch contact data'),
-		'$label_name' => t('Name'),
-		'$label_nick' => t('Account Nickname'),
-		'$label_attag' => t('@Tagname - overrides Name/Nickname'),
-		'$label_url' => t('Account URL'),
-		'$label_request' => t('Friend Request URL'),
-		'$label_confirm' => t('Friend Confirm URL'),
-		'$label_notify' => t('Notification Endpoint URL'),
-		'$label_poll' => t('Poll/Feed URL'),
-		'$label_photo' => t('New photo from this URL'),
+		'$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',
@@ -200,16 +163,16 @@ function crepair_content(&$a) {
 					t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
 					$remote_self_options
 				),
-		'$contact_name' => htmlentities($contact['name']),
-		'$contact_nick' => htmlentities($contact['nick']),
-		'$contact_id'   => $contact['id'],
-		'$contact_url'  => $contact['url'],
-		'$request'      => $contact['request'],
-		'$confirm'      => $contact['confirm'],
-		'$notify'       => $contact['notify'],
-		'$poll'         => $contact['poll'],
-		'$contact_attag'  => $contact['attag'],
-		'$lbl_submit'   => t('Submit')
+
+		'$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'), ''),
 	));
 
 	return $o;