Fix formatting and PHP notices in contacts

- Use x() and defaults() to fix undefined indexes
- Fix variable and constant name typos
- Remove unused variables and commented out code
- Add back undefined variables

mod/hovercard.php

@@ -7,90 +7,87 @@
  * Author: Rabuzarus <https://github.com/rabuzarus>
  * License: GNU AFFERO GENERAL PUBLIC LICENSE (Version 3)
  */
-
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 
-function hovercard_init(App $a) {
+function hovercard_init(App $a)
+{
 	// Just for testing purposes
-	$_GET["mode"] = "minimal";
+	$_GET['mode'] = 'minimal';
 }
 
-function hovercard_content() {
-	$profileurl	=	(x($_REQUEST,'profileurl')	? $_REQUEST['profileurl']	: "");
-	$datatype	=	(x($_REQUEST,'datatype')	?$_REQUEST['datatype']		: "json");
+function hovercard_content()
+{
+	$profileurl = defaults($_REQUEST, 'profileurl', '');
+	$datatype   = defaults($_REQUEST, 'datatype'  , 'json');
 
 	// Get out if the system doesn't have public access allowed
-	if(intval(Config::get('system','block_public')))
+	if (intval(Config::get('system', 'block_public'))) {
 		http_status_exit(401);
+	}
 
 	// Return the raw content of the template. We use this to make templates usable for js functions.
 	// Look at hovercard.js (function getHoverCardTemplate()).
-	// This part should be moved in it's own module. Maybe we could make more templates accessabel.
-	// (We need to discuss possible security lacks before doing this)
-	if ($datatype == "tpl") {
-		$templatecontent = get_template_content("hovercard.tpl");
+	// This part should be moved in its own module. Maybe we could make more templates accessible.
+	// (We need to discuss possible security leaks before doing this)
+	if ($datatype == 'tpl') {
+		$templatecontent = get_template_content('hovercard.tpl');
 		echo $templatecontent;
 		killme();
 	}
 
-	// If a contact is connected the url is internally changed to "redir/CID". We need the pure url to search for
+	// If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
 	// the contact. So we strip out the contact id from the internal url and look in the contact table for
 	// the real url (nurl)
-	if (local_user() && strpos($profileurl, "redir/") === 0) {
+	$cid = 0;
+	if (local_user() && strpos($profileurl, 'redir/') === 0) {
 		$cid = intval(substr($profileurl, 6));
-		$r = dba::select('contact', array('nurl', 'self'), array('id' => $cid), array('limit' => 1));
-		$profileurl = ($r["nurl"] ? $r["nurl"] : "");
-		$self = ($r["self"] ? $r["self"] : "");
+		$r = dba::select('contact', array('nurl'), array('id' => $cid), array('limit' => 1));
+		$profileurl = defaults($r, 'nurl', '');
 	}
 
+	$contact = [];
 	// if it's the url containing https it should be converted to http
 	$nurl = normalise_link(GContact::cleanContactUrl($profileurl));
-	if($nurl) {
+	if ($nurl) {
 		// Search for contact data
 		$contact = Contact::getDetailsByURL($nurl);
 	}
-	if(!is_array($contact))
+	if (!count($contact)) {
 		return;
+	}
 
 	// Get the photo_menu - the menu if possible contact actions
-	if(local_user())
+	if (local_user()) {
 		$actions = Contact::photoMenu($contact);
-
+	}
 
 	// Move the contact data to the profile array so we can deliver it to
-	//
 	$profile = array(
-		'name' => $contact["name"],
-		'nick'	=> $contact["nick"],
-		'addr'	=> (($contact["addr"] != "") ? $contact["addr"] : $contact["url"]),
-		'thumb' => proxy_url($contact["thumb"], false, PROXY_SIZE_THUMB),
-		'url' => ($cid ? ("redir/".$cid) : zrl($contact["url"])),
-		'nurl' => $contact["nurl"], // We additionally store the nurl as identifier
-//		'alias' => $contact["alias"],
-		'location' => $contact["location"],
-		'gender' => $contact["gender"],
-		'about' => $contact["about"],
-		'network' => format_network_name($contact["network"], $contact["url"]),
-		'tags' => $contact["keywords"],
-//		'nsfw' => intval($contact["nsfw"]),
-//		'server_url' => $contact["server_url"],
-		'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]),
-//		'generation' => $contact["generation"],
+		'name'     => $contact['name'],
+		'nick'     => $contact['nick'],
+		'addr'     => defaults($contact, 'addr', $contact['url']),
+		'thumb'    => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+		'url'      => $cid ? ('redir/' . $cid) : zrl($contact['url']),
+		'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
+		'location' => $contact['location'],
+		'gender'   => $contact['gender'],
+		'about'    => $contact['about'],
+		'network'  => format_network_name($contact['network'], $contact['url']),
+		'tags'     => $contact['keywords'],
+		'bd'       => $contact['birthday'] <= '0001-01-01' ? '' : $contact['birthday'],
 		'account_type' => Contact::getAccountType($contact),
-		'actions' => $actions,
+		'actions'  => $actions,
 	);
-	if($datatype == "html") {
-		$t = get_markup_template("hovercard.tpl");
-
-		$o = replace_macros($t, array(
+	if ($datatype == 'html') {
+		$tpl = get_markup_template('hovercard.tpl');
+		$o = replace_macros($tpl, array(
 			'$profile' => $profile,
 		));
 
 		return $o;
-
 	} else {
 		json_return_and_die($profile);
 	}
@@ -104,15 +101,15 @@ function hovercard_content() {
  *
  * @return string|bool Output the raw content if existent, otherwise false
  */
-function get_template_content($template, $root = "") {
-
+function get_template_content($template, $root = '')
+{
 	// We load the whole template system to get the filename.
 	// Maybe we can do it a little bit smarter if I get time.
 	$t = get_markup_template($template, $root);
 	$filename = $t->filename;
 
 	// Get the content of the template file
-	if(file_exists($filename)) {
+	if (file_exists($filename)) {
 		$content = file_get_contents($filename);
 
 		return $content;