diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2012-02-23 02:52:04 -0800 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2012-02-23 02:52:04 -0800 |
commit | d5adb67ef480bd24bcca4d384eba72e51ae27446 (patch) | |
tree | 6e7daff5fffd3adf40b30db3b66221543c3d1ec4 /mod/contacts.php | |
parent | 85d09f48d0bdddd43c8dd13c618cc714a679d141 (diff) | |
parent | cbc60d525e9140169c3b2d03998c53907b2fa3a7 (diff) | |
download | volse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.tar.gz volse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.tar.bz2 volse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.zip |
Merge pull request #46 from fabrixxm/master
more work on quattro theme and less html in php
Diffstat (limited to 'mod/contacts.php')
-rwxr-xr-x | mod/contacts.php | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 418cddf17..c8edea151 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -451,19 +451,7 @@ function contacts_content(&$a) { $a->set_pager_total($r[0]['total']); - $tpl = get_markup_template("contacts-top.tpl"); - $o .= replace_macros($tpl,array( - '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), - '$tabs' => $t, - '$total' => $r[0]['total'], - '$search' => $search_hdr, - '$desc' => t('Search your contacts'), - '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""), - '$submit' => t('Find'), - '$cmd' => $a->cmd - - )); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), @@ -471,9 +459,9 @@ function contacts_content(&$a) { intval($a->pager['itemspage']) ); - if(count($r)) { + $contacts = array(); - $tpl = get_markup_template("contact_template.tpl"); + if(count($r)) { foreach($r as $rr) { if($rr['self']) @@ -505,24 +493,40 @@ function contacts_content(&$a) { } - $o .= replace_macros($tpl, array( - '$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), - '$edit_hover' => t('Edit contact'), - '$contact_photo_menu' => contact_photo_menu($rr), - '$id' => $rr['id'], - '$alt_text' => $alt_text, - '$dir_icon' => $dir_icon, - '$thumb' => $rr['thumb'], - '$name' => $rr['name'], - '$username' => $rr['name'], - '$sparkle' => $sparkle, - '$url' => $url - )); + $contacts[] = array( + 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), + 'edit_hover' => t('Edit contact'), + 'photo_menu' => contact_photo_menu($rr), + 'id' => $rr['id'], + 'alt_text' => $alt_text, + 'dir_icon' => $dir_icon, + 'thumb' => $rr['thumb'], + 'name' => $rr['name'], + 'username' => $rr['name'], + 'sparkle' => $sparkle, + 'url' => $url, + 'item' => $rr, + ); } - $o .= '<div id="contact-edit-end"></div>'; + } - $o .= paginate($a); + + $tpl = get_markup_template("contacts-template.tpl"); + $o .= replace_macros($tpl,array( + '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), + '$tabs' => $t, + '$total' => $r[0]['total'], + '$search' => $search_hdr, + '$desc' => t('Search your contacts'), + '$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""), + '$submit' => t('Find'), + '$cmd' => $a->cmd, + '$contacts' => $contacts, + '$paginate' => paginate($a), + + )); + return $o; } |