X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=367438845427d420f9139fd64ee817044ca88404;hb=146f386e37670b64c588c65d25c9f068a0e8e066;hp=0504ac321c1e80d667538895f0e3728dd420d948;hpb=d8f9458663f3a8212e98c1d781a06fc22c34e3a2;p=friendica.git diff --git a/mod/directory.php b/mod/directory.php index 0504ac321c..bedc71907e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -2,6 +2,21 @@ function directory_init(&$a) { $a->set_pager_itemspage(60); + + if(local_user()) { + require_once('include/contact_widgets.php'); + + $a->page['aside'] .= findpeople_widget(); + + $a->page['aside'] .= follow_widget(); + + } + else { + unset($_SESSION['theme']); + unset($_SESSION['mobile-theme']); + } + + } @@ -13,52 +28,70 @@ function directory_post(&$a) { function directory_content(&$a) { + global $db; + + require_once("mod/proxy.php"); + + if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || + (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { + notice( t('Public access denied.') . EOL); + return; + } + $o = ''; - $o .= ''; - if(x($_SESSION,'theme')) - unset($_SESSION['theme']); + nav_set_selected('directory'); if(x($a->data,'search')) $search = notags(trim($a->data['search'])); else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - $tpl = load_view_file('view/directory_header.tpl'); - - $globaldir = ''; - $gdirpath = dirname(get_config('system','directory_submit_url')); - if(strlen($gdirpath)) { - $globaldir = ''; + $gdirpath = ''; + $dirurl = get_config('system','directory'); + if(strlen($dirurl)) { + $gdirpath = zrl($dirurl,true); } - $o .= replace_macros($tpl, array( - '$search' => $search, - '$globaldir' => $globaldir, - '$finding' => (strlen($search) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : "") - )); - - if($search) + if($search) { $search = dbesc($search); - $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); + + $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR + (`user`.`nickname` LIKE '%$search%') OR + (`pdesc` LIKE '%$search%') OR + (`locality` LIKE '%$search%') OR + (`region` LIKE '%$search%') OR + (`country-name` LIKE '%$search%') OR + (`gender` LIKE '%$search%') OR + (`marital` LIKE '%$search%') OR + (`sexual` LIKE '%$search%') OR + (`about` LIKE '%$search%') OR + (`romance` LIKE '%$search%') OR + (`work` LIKE '%$search%') OR + (`education` LIKE '%$search%') OR + (`pub_keywords` LIKE '%$search%') OR + (`prv_keywords` LIKE '%$search%'))"; + } $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " ); - $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra "); + $r = $db->q("SELECT COUNT(*) AS `total` FROM `profile` + LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` + WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra "); if(count($r)) $a->set_pager_total($r[0]['total']); + $order = " ORDER BY `name` ASC "; + $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']); - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ", - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); + $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, + `contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile` + LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` + LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` + WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit); if(count($r)) { - $tpl = load_view_file('view/directory_item.tpl'); - if(in_array('small', $a->argv)) $photo = 'thumb'; else @@ -66,9 +99,13 @@ function directory_content(&$a) { foreach($r as $rr) { + $community = ''; + $itemurl= ''; + + $itemurl = (($rr['faddr'] != "") ? $rr['faddr'] : $rr['profile_url']); + + $profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '
' : ''); $details = ''; @@ -84,38 +121,99 @@ function directory_content(&$a) { $details .= ', '; $details .= $rr['country-name']; } - if(strlen($rr['dob'])) { - if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) - $details .= "
Age: $years" ; - } - if(strlen($rr['gender'])) - $details .= '
Gender: ' . $rr['gender']; +// if(strlen($rr['dob'])) { +// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) +// $details .= '
' . t('Age: ') . $years ; +// } +// if(strlen($rr['gender'])) +// $details .= '
' . t('Gender: ') . $rr['gender']; + + + // show if account is a community account + // ToDo the other should be also respected, but first we need a good translatiion + // and systemwide consistency for displaying the page type + if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP)) + $community = true; + + $profile = $rr; - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - '$name' => $rr['name'], - '$details' => $pdesc . $details + if((x($profile,'address') == 1) + || (x($profile,'locality') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postal-code') == 1) + || (x($profile,'country-name') == 1)) + $location = t('Location:'); + $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); - )); + $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + + $about = ((x($profile,'about') == 1) ? t('About:') : False); + + if($a->theme['template_engine'] === 'internal') { + $location_e = template_escape($location); + } + else { + $location_e = $location; + } + + $photo_menu = array(array(t("View Profile"), zrl($profile_link))); + + $entry = array( + 'id' => $rr['id'], + 'url' => $profile_link, + 'itemurl' => $itemurl, + 'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), + 'img_hover' => $rr['name'], + 'name' => $rr['name'], + 'details' => $details, + 'account_type' => ($community ? t('Forum') : ''), + 'profile' => $profile, + 'location' => $location_e, + 'tags' => $rr['pub_keywords'], + 'gender' => $gender, + 'pdesc' => $pdesc, + 'marital' => $marital, + 'homepage' => $homepage, + 'about' => $about, + 'photo_menu' => $photo_menu, + + ); $arr = array('contact' => $rr, 'entry' => $entry); call_hooks('directory_item', $arr); - $o .= $entry; + unset($profile); + unset($location); + + if(! $arr['entry']) + continue; + + $entries[] = $arr['entry']; } - $o .= "
\r\n"; - $o .= paginate($a); + $tpl = get_markup_template('directory_header.tpl'); + + $o .= replace_macros($tpl, array( + '$search' => $search, + '$globaldir' => t('Global Directory'), + '$gdirpath' => $gdirpath, + '$desc' => t('Find on this site'), + '$contacts' => $entries, + '$finding' => t('Finding:'), + '$findterm' => (strlen($search) ? $search : ""), + '$title' => t('Site Directory'), + '$submit' => t('Find'), + '$paginate' => paginate($a), + )); } else - notice("No entries (some entries may be hidden)."); + info( t("No entries \x28some entries may be hidden\x29.") . EOL); return $o; -} \ No newline at end of file +}