X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=cb0b1f4cd115d18af37ba4bbd55faf796d02132c;hb=7034d6efbd988e7481ac6f5d6413a8925221ed6b;hp=a6a9cb8ab24356f4ef017c7ed3e01b9e0414e75c;hpb=c138455c5e25fbb11a12d959d1737de2116d356f;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index a6a9cb8ab2..cb0b1f4cd1 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,8 @@
set_pager_itemspage(60);
if(local_user()) {
@@ -9,30 +11,24 @@ function directory_init(&$a) {
$a->page['aside'] .= findpeople_widget();
$a->page['aside'] .= follow_widget();
-
}
else {
unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']);
}
-
-
}
-
-function directory_post(&$a) {
+function directory_post(App $a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
-
-
-function directory_content(&$a) {
+function directory_content(App $a) {
global $db;
require_once("mod/proxy.php");
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
+ 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;
@@ -78,7 +74,7 @@ function directory_content(&$a) {
$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))
+ if (dbm::is_result($r))
$a->set_pager_total($r[0]['total']);
$order = " ORDER BY `name` ASC ";
@@ -90,16 +86,17 @@ function directory_content(&$a) {
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)) {
+ if (dbm::is_result($r)) {
- if(in_array('small', $a->argv))
+ if (in_array('small', $a->argv)) {
$photo = 'thumb';
- else
+ }
+ else {
$photo = 'photo';
+ }
- foreach($r as $rr) {
+ foreach ($r as $rr) {
- $community = '';
$itemurl= '';
$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
@@ -123,18 +120,11 @@ function directory_content(&$a) {
}
// if(strlen($rr['dob'])) {
// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-// $details .= '
' . t('Age: ') . $years ;
+// $details .= '
' . t('Age: ') . $years ;
// }
// if(strlen($rr['gender']))
// $details .= '
' . t('Gender: ') . $rr['gender'];
-
- // show if account is a community account
- /// @TODO The other page types 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;
if((x($profile,'address') == 1)
@@ -171,7 +161,7 @@ function directory_content(&$a) {
'img_hover' => $rr['name'],
'name' => $rr['name'],
'details' => $details,
- 'account_type' => ($community ? t('Forum') : ''),
+ 'account_type' => account_type($rr),
'profile' => $profile,
'location' => $location_e,
'tags' => $rr['pub_keywords'],