X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcontacts.php;h=934472b39ff9c4172db531056b1d8ce551efdbef;hb=be067bcf9660cb7451b00657b5f826c0b16a888f;hp=0ecc5a76dbbefe0f04a6f68bcf36447565498f6c;hpb=4dd2a748b9625e134b62d71ef2e2772b75d51a96;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 0ecc5a76db..934472b39f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -27,6 +27,9 @@ function contacts_init(&$a) { require_once('include/group.php'); require_once('include/contact_widgets.php'); + if ($_GET['nets'] == "all") + $_GET['nets'] = ""; + if(! x($a->page,'aside')) $a->page['aside'] = ''; @@ -35,29 +38,30 @@ function contacts_init(&$a) { $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( '$name' => htmlentities($a->data['contact']['name']), '$photo' => $a->data['contact']['photo'], - '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] )); + $finpeople_widget = ''; $follow_widget = ''; + $networks_widget = ''; } else { $vcard_widget = ''; + $networks_widget .= networks_widget('contacts',$_GET['nets']); if (isset($_GET['add'])) $follow_widget = follow_widget($_GET['add']); else $follow_widget = follow_widget(); - } - if ($_GET['nets'] == "all") - $_GET['nets'] = ""; + $findpeople_widget .= 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, + '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, '$groups_widget' => $groups_widget, - '$findpeople_widget' => $findpeople_widget, '$networks_widget' => $networks_widget )); @@ -810,6 +814,7 @@ function contacts_content(&$a) { '$cmd' => $a->cmd, '$contacts' => $contacts, '$contact_drop_confirm' => t('Do you really want to delete this contact?'), + 'multiselect' => 1, '$batch_actions' => array( 'contacts_batch_update' => t('Update'), 'contacts_batch_block' => t('Block')."/".t("Unblock"),