From 299c8b83acc575614ae19612c537f0e981805dab Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Tue, 27 Oct 2015 15:27:26 +0100
Subject: [PATCH 1/3] template-rework: let common friends and allfriends use
viewcontact_template.tpl
---
mod/allfriends.php | 33 +++++++++++++++-----------
mod/common.php | 39 +++++++++++++++++--------------
view/templates/common_friends.tpl | 13 -----------
3 files changed, 42 insertions(+), 43 deletions(-)
delete mode 100644 view/templates/common_friends.tpl
diff --git a/mod/allfriends.php b/mod/allfriends.php
index 784dfb8771..bb1b7f1ce5 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -12,10 +12,11 @@ function allfriends_content(&$a) {
if($a->argc > 1)
$cid = intval($a->argv[1]);
+
if(! $cid)
return;
- $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
+ $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($cid),
intval(local_user())
);
@@ -33,10 +34,6 @@ function allfriends_content(&$a) {
if(! count($c))
return;
- $o .= replace_macros(get_markup_template("section_title.tpl"),array(
- '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name']))
- ));
-
$r = all_friends(local_user(),$cid);
@@ -45,19 +42,29 @@ function allfriends_content(&$a) {
return $o;
}
- $tpl = get_markup_template('common_friends.tpl');
+ $id = 0;
foreach($r as $rr) {
- $o .= replace_macros($tpl,array(
- '$url' => $rr['url'],
- '$name' => htmlentities($rr['name']),
- '$photo' => $rr['photo'],
- '$tags' => ''
- ));
+ $entry = array(
+ 'url' => $rr['url'],
+ 'itemurl' => $rr['url'],
+ 'name' => htmlentities($rr['name']),
+ 'thumb' => $rr['photo'],
+ 'img_hover' => htmlentities($rr['name']),
+ 'tags' => '',
+ 'id' => ++$id,
+ );
+ $entries[] = $entry;
}
- $o .= cleardiv();
+ $tpl = get_markup_template('viewcontact_template.tpl');
+
+ $o .= replace_macros($tpl,array(
+ '$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+ '$contacts' => $entries,
+ ));
+
// $o .= paginate($a);
return $o;
}
diff --git a/mod/common.php b/mod/common.php
index 1e65137ac6..caf2f7ea5e 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -17,13 +17,13 @@ function common_content(&$a) {
return;
if($cmd === 'loc' && $cid) {
- $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
+ $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($cid),
intval($uid)
);
}
else {
- $c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1",
+ $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid)
);
}
@@ -41,21 +41,16 @@ function common_content(&$a) {
if(! count($c))
return;
- $o .= replace_macros(get_markup_template("section_title.tpl"),array(
- '$title' => t('Common Friends')
- ));
-
-
if(! $cid) {
if(get_my_url()) {
- $r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
+ $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link(get_my_url())),
intval($profile_uid)
);
if(count($r))
$cid = $r[0]['id'];
else {
- $r = q("select id from gcontact where nurl = '%s' limit 1",
+ $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link(get_my_url()))
);
if(count($r))
@@ -94,19 +89,29 @@ function common_content(&$a) {
return $o;
}
- $tpl = get_markup_template('common_friends.tpl');
+ $id = 0;
foreach($r as $rr) {
- $o .= replace_macros($tpl,array(
- '$url' => $rr['url'],
- '$name' => htmlentities($rr['name']),
- '$photo' => $rr['photo'],
- '$tags' => ''
- ));
+ $entry = array(
+ 'url' => $rr['url'],
+ 'itemurl' => $rr['url'],
+ 'name' => htmlentities($rr['name']),
+ 'thumb' => $rr['photo'],
+ 'img_hover' => htmlentities($rr['name']),
+ 'tags' => '',
+ 'id' => ++$id,
+ );
+ $entries[] = $entry;
}
- $o .= cleardiv();
+ $tpl = get_markup_template('viewcontact_template.tpl');
+
+ $o .= replace_macros($tpl,array(
+ '$title' => t('Common Friends'),
+ '$contacts' => $entries,
+ ));
+
// $o .= paginate($a);
return $o;
}
diff --git a/view/templates/common_friends.tpl b/view/templates/common_friends.tpl
deleted file mode 100644
index 6502dd6ed7..0000000000
--- a/view/templates/common_friends.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
From e785759a8bd90c4d0e2bb5866e2ad014f45ddb2a Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Tue, 3 Nov 2015 14:31:15 +0100
Subject: [PATCH 2/3] template-rework:make use of get_contact_details_by_url()
---
include/Contact.php | 2 +-
mod/allfriends.php | 42 +++++++++++++++----
mod/common.php | 36 ++++++++++++----
view/templates/contact_template.tpl | 9 +++-
.../templates/contact_template.tpl | 30 +++++++------
.../frost/templates/contact_template.tpl | 8 +++-
view/theme/quattro/dark/style.css | 2 +-
view/theme/quattro/green/style.css | 2 +-
view/theme/quattro/lilac/style.css | 2 +-
view/theme/quattro/quattro.less | 2 +-
.../quattro/templates/contact_template.tpl | 8 +++-
.../theme/vier/templates/contact_template.tpl | 8 +++-
12 files changed, 111 insertions(+), 40 deletions(-)
diff --git a/include/Contact.php b/include/Contact.php
index 3f74a19d5f..db5480f517 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -245,7 +245,7 @@ function get_contact_details_by_url($url, $uid = -1) {
$profile["keywords"] = $r[0]["keywords"];
if (isset($r[0]["gender"]) AND $r[0]["gender"])
$profile["gender"] = $r[0]["gender"];
- if (isset($r[0]["forum"]) AND isset($r[0]["prv"]))
+ if (isset($r[0]["forum"]) OR isset($r[0]["prv"]))
$profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]);
if (isset($r[0]["network"]) AND $r[0]["network"])
$profile["network"] = $r[0]["network"];
diff --git a/mod/allfriends.php b/mod/allfriends.php
index bb1b7f1ce5..8396efdd2d 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,6 +1,8 @@
user[uid];
+
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($cid),
intval(local_user())
@@ -46,14 +50,38 @@ function allfriends_content(&$a) {
foreach($r as $rr) {
+ //get further details of the contact
+ $contact_details = get_contact_details_by_url($rr['url'], $uid);
+
+ $photo_menu = '';
+
+ // $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
+ // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
+ if ($rr[cid]) {
+ $rr[id] = $rr[cid];
+ $photo_menu = contact_photo_menu ($rr);
+ }
+ else {
+ $connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
+ $photo_menu = array(array(t("View Profile"), zrl($rr['url'])));
+ $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+ }
+
$entry = array(
- 'url' => $rr['url'],
- 'itemurl' => $rr['url'],
- 'name' => htmlentities($rr['name']),
- 'thumb' => $rr['photo'],
- 'img_hover' => htmlentities($rr['name']),
- 'tags' => '',
- 'id' => ++$id,
+ 'url' => $rr['url'],
+ 'itemurl' => $rr['url'],
+ 'name' => htmlentities($rr['name']),
+ 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+ 'img_hover' => htmlentities($rr['name']),
+ 'details' => $contact_details['location'],
+ 'tags' => $contact_details['keywords'],
+ 'about' => $contact_details['about'],
+ 'account_type' => (($contact_details['community']) ? t('Forum') : ''),
+ 'network' => network_to_name($contact_details['network'], $contact_details['url']),
+ 'photo_menu' => $photo_menu,
+ 'conntxt' => t('Connect'),
+ 'connlnk' => $connlnk,
+ 'id' => ++$id,
);
$entries[] = $entry;
}
diff --git a/mod/common.php b/mod/common.php
index caf2f7ea5e..60a4a450b2 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,6 +1,8 @@
argv[3]);
$zcid = 0;
+ if (! local_user()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
if($cmd !== 'loc' && $cmd != 'rem')
return;
+
if(! $uid)
return;
@@ -93,14 +101,28 @@ function common_content(&$a) {
foreach($r as $rr) {
+ // $rr[id] is needed to use contact_photo_menu()
+ $rr[id] = $rr[cid];
+
+ $photo_menu = '';
+ $photo_menu = contact_photo_menu ($rr);
+
+ //get further details of the contact
+ $contact_details = get_contact_details_by_url($rr['url'], $uid);
+
$entry = array(
- 'url' => $rr['url'],
- 'itemurl' => $rr['url'],
- 'name' => htmlentities($rr['name']),
- 'thumb' => $rr['photo'],
- 'img_hover' => htmlentities($rr['name']),
- 'tags' => '',
- 'id' => ++$id,
+ 'url' => $rr['url'],
+ 'itemurl' => $rr['url'],
+ 'name' => $rr['name'],
+ 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+ 'img_hover' => htmlentities($rr['name']),
+ 'details' => $contact_details['location'],
+ 'tags' => $contact_details['keywords'],
+ 'about' => $contact_details['about'],
+ 'account_type' => (($contact_details['community']) ? t('Forum') : ''),
+ 'network' => network_to_name($contact_details['network'], $contact_details['url']),
+ 'photo_menu' => $photo_menu,
+ 'id' => ++$id,
);
$entries[] = $entry;
}
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
index 75f49653b0..06918533ca 100644
--- a/view/templates/contact_template.tpl
+++ b/view/templates/contact_template.tpl
@@ -30,11 +30,16 @@
-
{{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
{{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}}
- {{if $contact.network}}
{{$contact.network}}
{{/if}}
+ {{if $contact.tags}}
{{$contact.tags}}
{{/if}}
{{if $contact.details}}
{{$contact.details}}
{{/if}}
+ {{if $contact.network}}
{{$contact.network}}
{{/if}}
+
-
{{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
{{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}}
- {{if $contact.network}}
{{$contact.network}}
{{/if}}
+ {{if $contact.tags}}
{{$contact.tags}}
{{/if}}
{{if $contact.details}}
{{$contact.details}}
{{/if}}
+ {{if $contact.network}}
{{$contact.network}}
{{/if}}
-
{{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
{{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}}
- {{if $contact.network}}
{{$contact.network}}
{{/if}}
+ {{if $contact.tags}}
{{$contact.tags}}
{{/if}}
{{if $contact.details}}
{{$contact.details}}
{{/if}}
+ {{if $contact.network}}
{{$contact.network}}
{{/if}}
{{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}{{$contact.alt_text}}
{{/if}}
{{if $contact.itemurl}}{{$contact.itemurl}}
{{/if}}
- {{if $contact.network}}{{$contact.network}}
{{/if}}
+ {{if $contact.tags}}{{$contact.tags}}
{{/if}}
{{if $contact.details}}{{$contact.details}}
{{/if}}
+ {{if $contact.network}}{{$contact.network}}
{{/if}}
{{if $contact.connlnk}}
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl
index 2993bb92cb..60e05610f6 100644
--- a/view/theme/vier/templates/contact_template.tpl
+++ b/view/theme/vier/templates/contact_template.tpl
@@ -31,11 +31,15 @@
-
{{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
{{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}}
- {{if $contact.network}}
{{$contact.network}}
{{/if}}
+ {{if $contact.tags}}
{{$contact.tags}}
{{/if}}
{{if $contact.details}}
{{$contact.details}}
{{/if}}
+ {{if $contact.network}}
{{$contact.network}}
{{/if}}
-
-