Merge pull request #4301 from MrPetovan/bug/3396-frio-fix-contact-autocomplete
[frio] Fix contact autocomplete
This commit is contained in:
Michael Vogel
GitHub
commit
9853f552fb
|
|
@ -125,123 +125,122 @@
|
||||||
|
|
||||||
{{* the following part is a nearly a copy of the part above but it is modified for working with js.
|
{{* the following part is a nearly a copy of the part above but it is modified for working with js.
|
||||||
We use this part to filter the contacts with jquery.textcomplete *}}
|
We use this part to filter the contacts with jquery.textcomplete *}}
|
||||||
<div class="javascript-template" rel="contact-template" style="display: none">
|
<template class="javascript-template" rel="contact-template" style="display: none">
|
||||||
<div class="contact-wrapper media" id="contact-entry-wrapper-{$id}">
|
<div class="contact-wrapper media" id="contact-entry-wrapper-{$id}">
|
||||||
|
|
||||||
{{* This is a wrapper for the contact picture *}}
|
{{* This is a wrapper for the contact picture *}}
|
||||||
<div class="contact-photo-wrapper dropdown media-left">
|
<div class="contact-photo-wrapper dropdown media-left">
|
||||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
|
<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
|
||||||
|
|
||||||
<div class="contact-photo-image-wrapper hidden-xs">
|
<div class="contact-photo-image-wrapper hidden-xs">
|
||||||
<img class="contact-photo media-object xl" src="{{$contact.thumb}}" {11} alt="{{$contact.name}}" />
|
<img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{* For very small displays we use a drobdown menu for contact relating actions *}}
|
{{* For very small displays we use a drobdown menu for contact relating actions *}}
|
||||||
<button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
<button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||||
{{* use a smaller picture on very small displays (e.g. mobiles) *}}
|
{{* use a smaller picture on very small displays (e.g. mobiles) *}}
|
||||||
<div class="contact-photo-image-wrapper visible-xs">
|
<div class="contact-photo-image-wrapper visible-xs">
|
||||||
<img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {11} alt="{{$contact.name}}" />
|
<img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name}" />
|
||||||
|
|
||||||
{{* Overlay background on hover the avatar picture *}}
|
{{* Overlay background on hover the avatar picture *}}
|
||||||
<div class="contact-photo-overlay">
|
<div class="contact-photo-overlay">
|
||||||
<span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down" aria-hidden="true"></i></span>
|
<span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down" aria-hidden="true"></i></span>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</button>
|
|
||||||
|
|
||||||
{if $photo_menu}
|
|
||||||
<ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{$id}" role="menu" aria-labelledby="contact-photo-menu-{$id}">
|
|
||||||
{foreach $photo_menu as $c}
|
|
||||||
{if $c.2}
|
|
||||||
<li role="presentation"><a role="menuitem" target="redir" href="{$c.1}">{$c.0}</a></li>
|
|
||||||
{elseif $c.3}
|
|
||||||
<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
|
|
||||||
{else}
|
|
||||||
<li role="presentation"><a role="menuitem" href="{$c.1}">{$c.0}</a></li>
|
|
||||||
{/if}
|
|
||||||
{/foreach}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="media-body">
|
|
||||||
{if $photo_menu}
|
|
||||||
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
|
|
||||||
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
|
|
||||||
{if $photo_menu.pm}
|
|
||||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
|
|
||||||
<i class="fa fa-envelope" aria-hidden="true"></i>
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
{if $photo_menu.poke}
|
|
||||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
|
|
||||||
<i class="fa fa-heartbeat" aria-hidden="true"></i>
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
{if $photo_menu.network}
|
|
||||||
<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
|
|
||||||
<i class="fa fa-cloud" aria-hidden="true"></i>
|
|
||||||
</a>
|
|
||||||
{/if}
|
|
||||||
{if $photo_menu.edit}
|
|
||||||
<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
|
|
||||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
|
||||||
</a>
|
|
||||||
{/if}
|
|
||||||
{if $photo_menu.drop}
|
|
||||||
<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
|
|
||||||
<i class="fa fa-user-times" aria-hidden="true"></i>
|
|
||||||
</a>
|
|
||||||
{/if}
|
|
||||||
{if $photo_menu.follow}
|
|
||||||
<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
|
|
||||||
<i class="fa fa-user-plus" aria-hidden="true"></i>
|
|
||||||
</a>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{{* The button to add or remove contacts from a contact group - group edit page *}}
|
|
||||||
{if $contact.change_member}
|
|
||||||
<div class="contact-group-actions pull-right nav-pills preferences">
|
|
||||||
<button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
|
|
||||||
{if $contact.label == "members"}
|
|
||||||
<i class="fa fa-times-circle" aria-hidden="true"></i>
|
|
||||||
{elseif $contact.label == "contacts"}
|
|
||||||
<i class="fa fa-plus-circle" aria-hidden="true"></i>
|
|
||||||
{/if}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
|
|
||||||
<div class="contact-entry-desc">
|
|
||||||
<div class="contact-entry-name" id="contact-entry-name-{$id}">
|
|
||||||
<h4 class="media-heading"><a href="{$url}">{$name}</a>
|
|
||||||
{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
|
|
||||||
{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
|
|
||||||
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
|
|
||||||
</h4>
|
|
||||||
</div>
|
</div>
|
||||||
{if $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}" >{$alt_text}</div>{/if}
|
</button>
|
||||||
{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}" >{$itemurl}</div>{/if}
|
|
||||||
{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}" >{$tags}</div>{/if}
|
|
||||||
{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}" >{$details}</div>{/if}
|
|
||||||
{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}" >{$network}</div>{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
|
{if $photo_menu}
|
||||||
{{* if !$no_contacts_checkbox *}}
|
<ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{$id}" role="menu" aria-labelledby="contact-photo-menu-{$id}">
|
||||||
{{if $multiselect}}
|
{foreach $photo_menu as $c}
|
||||||
<div class="checkbox contact-entry-checkbox pull-right">
|
{if $c.2}
|
||||||
<input id="checkbox-{$id}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{$id}">
|
<li role="presentation"><a role="menuitem" target="redir" href="{$c.1}">{$c.0}</a></li>
|
||||||
<label for="checkbox-{$id}"></label>
|
{elseif $c.3}
|
||||||
</div>
|
<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
|
||||||
{{/if}}
|
{else}
|
||||||
|
<li role="presentation"><a role="menuitem" href="{$c.1}">{$c.0}</a></li>
|
||||||
|
{/if}
|
||||||
|
{/foreach}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="media-body">
|
||||||
|
{if $photo_menu}
|
||||||
|
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
|
||||||
|
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
|
||||||
|
{if $photo_menu.pm}
|
||||||
|
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
|
||||||
|
<i class="fa fa-envelope" aria-hidden="true"></i>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
{if $photo_menu.poke}
|
||||||
|
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
|
||||||
|
<i class="fa fa-heartbeat" aria-hidden="true"></i>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
{if $photo_menu.network}
|
||||||
|
<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
|
||||||
|
<i class="fa fa-cloud" aria-hidden="true"></i>
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
|
{if $photo_menu.edit}
|
||||||
|
<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
|
||||||
|
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
|
{if $photo_menu.drop}
|
||||||
|
<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
|
||||||
|
<i class="fa fa-user-times" aria-hidden="true"></i>
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
|
{if $photo_menu.follow}
|
||||||
|
<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
|
||||||
|
<i class="fa fa-user-plus" aria-hidden="true"></i>
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{{* The button to add or remove contacts from a contact group - group edit page *}}
|
||||||
|
{if $contact.change_member}
|
||||||
|
<div class="contact-group-actions pull-right nav-pills preferences">
|
||||||
|
<button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
|
||||||
|
{if $contact.label == "members"}
|
||||||
|
<i class="fa fa-times-circle" aria-hidden="true"></i>
|
||||||
|
{elseif $contact.label == "contacts"}
|
||||||
|
<i class="fa fa-plus-circle" aria-hidden="true"></i>
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
|
||||||
|
<div class="contact-entry-desc">
|
||||||
|
<div class="contact-entry-name" id="contact-entry-name-{$id}">
|
||||||
|
<h4 class="media-heading"><a href="{$url}">{$name}</a>
|
||||||
|
{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
|
||||||
|
{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
|
||||||
|
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
|
||||||
|
</h4>
|
||||||
|
</div>
|
||||||
|
{if $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}" >{$alt_text}</div>{/if}
|
||||||
|
{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}" >{$itemurl}</div>{/if}
|
||||||
|
{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}" >{$tags}</div>{/if}
|
||||||
|
{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}" >{$details}</div>{/if}
|
||||||
|
{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}" >{$network}</div>{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
|
||||||
|
{{* if !$no_contacts_checkbox *}}
|
||||||
|
{{if $multiselect}}
|
||||||
|
<div class="checkbox contact-entry-checkbox pull-right">
|
||||||
|
<input id="checkbox-{$id}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{$id}">
|
||||||
|
<label for="checkbox-{$id}"></label>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -292,46 +292,47 @@ function frio_acl_lookup(App $a, &$results)
|
||||||
|
|
||||||
// we introduce a new search type, r should do the same query like it's
|
// we introduce a new search type, r should do the same query like it's
|
||||||
// done in /mod/contacts for connections
|
// done in /mod/contacts for connections
|
||||||
if ($results["type"] == "r") {
|
if ($results["type"] !== "r") {
|
||||||
$searching = false;
|
return;
|
||||||
if ($search) {
|
|
||||||
$search_hdr = $search;
|
|
||||||
$search_txt = dbesc(protect_sprintf(preg_quote($search)));
|
|
||||||
$searching = true;
|
|
||||||
}
|
|
||||||
$sql_extra = '';
|
|
||||||
if ($searching) {
|
|
||||||
$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($nets) {
|
|
||||||
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
|
||||||
WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ",
|
|
||||||
intval($_SESSION['uid']));
|
|
||||||
if (DBM::is_result($r)) {
|
|
||||||
$total = $r[0]["total"];
|
|
||||||
}
|
|
||||||
|
|
||||||
$sql_extra3 = Widget::unavailableNetworks();
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT 100 ",
|
|
||||||
intval($_SESSION['uid'])
|
|
||||||
);
|
|
||||||
|
|
||||||
$contacts = [];
|
|
||||||
|
|
||||||
if (DBM::is_result($r)) {
|
|
||||||
foreach ($r as $rr) {
|
|
||||||
$contacts[] = _contact_detail_for_template($rr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$results["items"] = $contacts;
|
|
||||||
$results["tot"] = $total;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$searching = false;
|
||||||
|
if ($results["search"]) {
|
||||||
|
$search_txt = dbesc(protect_sprintf(preg_quote($results["search"])));
|
||||||
|
$searching = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql_extra = '';
|
||||||
|
if ($searching) {
|
||||||
|
$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($nets) {
|
||||||
|
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||||
|
WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
|
||||||
|
if (DBM::is_result($r)) {
|
||||||
|
$total = $r[0]["total"];
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql_extra3 = Widget::unavailableNetworks();
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
|
||||||
|
intval($_SESSION['uid']), intval($results['start']), intval($results['count'])
|
||||||
|
);
|
||||||
|
|
||||||
|
$contacts = [];
|
||||||
|
|
||||||
|
if (DBM::is_result($r)) {
|
||||||
|
foreach ($r as $rr) {
|
||||||
|
$contacts[] = _contact_detail_for_template($rr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$results["items"] = $contacts;
|
||||||
|
$results["tot"] = $total;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue