Browse Source

Merge pull request #2119 from annando/1511-contact-evolution

Refurbished contact settings/contact posts
tags/3.4.3
fabrixxm 4 years ago
parent
commit
2753e62483
7 changed files with 179 additions and 50 deletions
  1. +1
    -1
      include/Contact.php
  2. +1
    -1
      include/conversation.php
  3. +139
    -39
      mod/contacts.php
  4. +14
    -1
      mod/crepair.php
  5. +12
    -0
      view/global.css
  6. +8
    -5
      view/templates/contact_edit.tpl
  7. +4
    -3
      view/templates/crepair.tpl

+ 1
- 1
include/Contact.php View File

@@ -349,7 +349,7 @@ function contact_photo_menu($contact, $uid = 0) {
$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];

$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
$posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
$posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts';
$contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';




+ 1
- 1
include/conversation.php View File

@@ -891,7 +891,7 @@ function item_photo_menu($item){
if(($cid) && (! $item['self'])) {
$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
$posts_link = $a->get_baseurl($ssl_state) . '/network/0?nets=all&cid=' . $cid;
$posts_link = $a->get_baseurl($ssl_state) . '/contacts/' . $cid . '/posts';

$clean_url = normalise_link($item['author-link']);



+ 139
- 39
mod/contacts.php View File

@@ -13,7 +13,7 @@ function contacts_init(&$a) {

$contact_id = 0;

if(($a->argc == 2) && intval($a->argv[1])) {
if((($a->argc == 2) && intval($a->argv[1])) OR (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
$contact_id = intval($a->argv[1]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
intval(local_user()),
@@ -464,6 +464,9 @@ function contacts_content(&$a) {
goaway($a->get_baseurl(true) . '/contacts');
return; // NOTREACHED
}
if($cmd === 'posts') {
return contact_posts($a, $contact_id);
}
}


@@ -548,43 +551,7 @@ function contacts_content(&$a) {
$all_friends = (($x) ? t('View all contacts') : '');

// tabs
$tabs = array(
array(
'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
'sel' => '',
'title' => t('Toggle Blocked status'),
'id' => 'toggle-block-tab',
'accesskey' => 'b',
),
array(
'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
'sel' => '',
'title' => t('Toggle Ignored status'),
'id' => 'toggle-ignore-tab',
'accesskey' => 'i',
),

array(
'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
'sel' => '',
'title' => t('Toggle Archive status'),
'id' => 'toggle-archive-tab',
'accesskey' => 'v',
),
array(
'label' => t('Repair'),
'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
'sel' => '',
'title' => t('Advanced Contact Settings'),
'id' => 'repair-tab',
'accesskey' => 'r',
)
);
$tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
$tab_str = contact_tabs($a, $contact_id, 2);

$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');

@@ -602,8 +569,17 @@ function contacts_content(&$a) {
($contact['rel'] == CONTACT_IS_FOLLOWER))
$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);


$header = $contact["name"];

if ($contact["addr"] != "")
$header .= " <".$contact["addr"].">";

$header .= " (".network_to_name($contact['network'], $contact['url']).")";

$o .= replace_macros($tpl, array(
'$header' => t('Contact Editor'),
//'$header' => t('Contact Editor'),
'$header' => htmlentities($header),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'),
@@ -653,6 +629,12 @@ function contacts_content(&$a) {
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
'$location' => bbcode($contact["location"]),
'$location_label' => t("Location:"),
'$about' => bbcode($contact["about"], false, false),
'$about_label' => t("About:"),
'$keywords' => $contact["keywords"],
'$keywords_label' => t("Tags:")

));

@@ -830,6 +812,124 @@ function contacts_content(&$a) {
return $o;
}

function contact_tabs($a, $contact_id, $active_tab) {
// tabs
$tabs = array(
array(
'label'=>t('Status'),
'url' => "contacts/".$contact_id."/posts",
'sel' => (($active_tab == 1)?'active':''),
'title' => t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
),
array(
'label'=>t('Profile'),
'url' => "contacts/".$contact_id,
'sel' => (($active_tab == 2)?'active':''),
'title' => t('Profile Details'),
'id' => 'status-tab',
'accesskey' => 'r',
),
array(
'label' => t('Repair'),
'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
'sel' => (($active_tab == 3)?'active':''),
'title' => t('Advanced Contact Settings'),
'id' => 'repair-tab',
'accesskey' => 'r',
),
array(
'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
'sel' => '',
'title' => t('Toggle Blocked status'),
'id' => 'toggle-block-tab',
'accesskey' => 'b',
),
array(
'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
'sel' => '',
'title' => t('Toggle Ignored status'),
'id' => 'toggle-ignore-tab',
'accesskey' => 'i',
),
array(
'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
'sel' => '',
'title' => t('Toggle Archive status'),
'id' => 'toggle-archive-tab',
'accesskey' => 'v',
)
);
$tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));

return $tab_str;
}

function contact_posts($a, $contact_id) {

require_once('include/conversation.php');

$r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($contact_id));
if ($r) {
$contact = $r[0];
$a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
}

if(get_config('system', 'old_pager')) {
$r = q("SELECT COUNT(*) AS `total` FROM `item`
WHERE `item`.`uid` = %d AND (`author-link` = '%s')",
intval(local_user()), dbesc($contact["url"]));

$a->set_pager_total($r[0]['total']);
}

$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`,
`owner-link` AS `url`, `owner-avatar` AS `thumb`
FROM `item` FORCE INDEX (uid_contactid_created)
WHERE `item`.`uid` = %d AND `contact-id` = %d
AND (`author-link` = '%s')
ORDER BY `item`.`created` DESC LIMIT %d, %d",
intval(local_user()),
intval($contact_id),
dbesc($contact["url"]),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);

$tab_str = contact_tabs($a, $contact_id, 1);

$header = $contact["name"];

if ($contact["addr"] != "")
$header .= " <".$contact["addr"].">";

$header .= " (".network_to_name($contact['network'], $contact['url']).")";

$tpl = get_markup_template("section_title.tpl");
$o = replace_macros($tpl,array(
'$title' => htmlentities($header)
));

$o .= $tab_str;

$o .= conversation($a,$r,'community',false);

if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r));
} else {
$o .= paginate($a);
}

return $o;
}

function _contact_detail_for_template($rr){
switch($rr['rel']) {
case CONTACT_IS_FRIEND:


+ 14
- 1
mod/crepair.php View File

@@ -1,4 +1,6 @@
<?php
require_once("include/contact_selectors.php");
require_once("mod/contacts.php");

function crepair_init(&$a) {
if(! local_user())
@@ -157,9 +159,20 @@ 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);

$header = $contact["name"];

if ($contact["addr"] != "")
$header .= " <".$contact["addr"].">";

$header .= " (".network_to_name($contact['network'], $contact['url']).")";

$tpl = get_markup_template('crepair.tpl');
$o .= replace_macros($tpl, array(
'$title' => t('Repair Contact Settings'),
//'$title' => t('Repair Contact Settings'),
'$title' => htmlentities($header),
'$tab_str' => $tab_str,
'$warning' => $warning,
'$info' => $info,
'$returnaddr' => $returnaddr,


+ 12
- 0
view/global.css View File

@@ -301,3 +301,15 @@ ul.credits li {
#forum-widget-collapse:hover {
opacity: 1.0;
}

.crepair-label {
margin-top: 10px;
float: left;
width: 250px;
}

.crepair-input {
margin-top: 10px;
float: left;
width: 200px;
}

+ 8
- 5
view/templates/contact_edit.tpl View File

@@ -1,5 +1,3 @@


<h2>{{$header}}</h2>

<div id="contact-edit-wrapper" >
@@ -19,8 +17,6 @@
{{if $relation_text}}
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
{{/if}}
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
<li><div id="contact-edit-profileurl">{{$profileurllabel}}: <a href="{{$url}}">{{$profileurl}}</a></div></li>
{{if $lost_contact}}
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
{{/if}}
@@ -37,6 +33,7 @@
<li><div id="archive-message">{{$archived}}</div></li>
{{/if}}
</ul>

<ul>

{{if $common_text}}
@@ -47,7 +44,7 @@
{{/if}}


<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
<!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $lblsuggest}}
<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
{{/if}}
@@ -56,10 +53,16 @@
{{/if}}

</ul>

<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
</div>
</div>
<div id="contact-edit-nav-end"></div>

<hr />

<form action="contacts/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}">


+ 4
- 3
view/templates/crepair.tpl View File

@@ -1,16 +1,17 @@

{{include file="section_title.tpl"}}

{{$tab_str}}

<div class="crepair-error-message">{{$warning}}</div><br>
<div class="crepair-return">
{{$info}}<br>
<a href="{{$returnaddr}}">{{$return}}</a>
<!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
</div>
<br />

<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >

<h4>{{$contact_name}}</h4>
<!-- <h4>{{$contact_name}}</h4> -->

<div id="contact-update-profile-wrapper">
{{if $update_profile}}


Loading…
Cancel
Save