X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=8a36fa4cb6ced11b63946b00bd81a4f5e0193eaf;hb=31064a15eca8c70ff154e91116bb5928c99f7143;hp=f84a988c8df8524952b0cfb0f933bfbb06612bc5;hpb=be090cc8513504edcfaf368915e45308711f7e7c;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
index f84a988c8d..8a36fa4cb6 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -28,39 +28,40 @@ function contacts_init(&$a) {
if($contact_id) {
$a->data['contact'] = $r[0];
- $o .= '
';
- $o .= '
' . $a->data['contact']['name'] . '
';
- $o .= '
';
- $o .= '
';
- $a->page['aside'] .= $o;
-
+ $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
+ '$name' => $a->data['contact']['name'],
+ '$photo' => $a->data['contact']['photo']
+ ));
+ $follow_widget = '';
}
- else
- $a->page['aside'] .= follow_widget();
-
- $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+ else {
+ $vcard_widget = '';
+ $follow_widget = follow_widget();
+ }
- $a->page['aside'] .= findpeople_widget();
+ $groups_widget .= group_side('contacts','group',false,0,$contact_id);
+ $findpeople_widget .= findpeople_widget();
+ $networks_widget .= networks_widget('contacts',$_GET['nets']);
+ $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
+ '$vcard_widget' => $vcard_widget,
+ '$follow_widget' => $follow_widget,
+ '$groups_widget' => $groups_widget,
+ '$findpeople_widget' => $findpeople_widget,
+ '$networks_widget' => $networks_widget
+ ));
- $a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
$base = $a->get_baseurl();
+ $tpl = get_markup_template("contacts-head.tpl");
+ $a->page['htmlhead'] .= replace_macros($tpl,array(
+ '$baseurl' => $a->get_baseurl(true),
+ '$base' => $base
+ ));
- $a->page['htmlhead'] .= '';
- $a->page['htmlhead'] .= <<< EOT
-
-
-EOT;
+ $tpl = get_markup_template("contacts-end.tpl");
+ $a->page['end'] .= replace_macros($tpl,array(
+ '$baseurl' => $a->get_baseurl(true),
+ '$base' => $base
+ ));
}
@@ -247,6 +248,10 @@ function contacts_content(&$a) {
'$baseurl' => $a->get_baseurl(true),
'$editselect' => $editselect,
));
+ $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
+ '$baseurl' => $a->get_baseurl(true),
+ '$editselect' => $editselect,
+ ));
require_once('include/contact_selectors.php');
@@ -479,12 +484,13 @@ function contacts_content(&$a) {
-
+ $searching = false;
if($search) {
$search_hdr = $search;
- $search = dbesc($search.'*');
+ $search_txt = dbesc(protect_sprintf(preg_quote($search)));
+ $searching = true;
}
- $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
+ $sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
if($nets)
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@@ -501,7 +507,6 @@ function contacts_content(&$a) {
}
-
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
intval($_SESSION['uid']),
intval($a->pager['start']),
@@ -568,7 +573,7 @@ function contacts_content(&$a) {
'$total' => $total,
'$search' => $search_hdr,
'$desc' => t('Search your contacts'),
- '$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
+ '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd,
'$contacts' => $contacts,