X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=a83b1b76ceb6f9aebb60598d2acdf4528227cd95;hb=0448ca38973fed14840d33079989fd71af93708b;hp=cb0b1f4cd115d18af37ba4bbd55faf796d02132c;hpb=8f253f6c1288534c50fac34f05afb1a2c07c9335;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index cb0b1f4cd1..a83b1b76ce 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,54 +1,64 @@
set_pager_itemspage(60);
- if(local_user()) {
- require_once('include/contact_widgets.php');
-
- $a->page['aside'] .= findpeople_widget();
-
- $a->page['aside'] .= follow_widget();
- }
- else {
+ if (local_user()) {
+ $a->page['aside'] .= Widget::findPeople();
+ $a->page['aside'] .= Widget::follow();
+ } else {
unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']);
}
}
-function directory_post(App $a) {
- if(x($_POST,'search'))
+function directory_post(App $a)
+{
+ if (x($_POST, 'search')) {
$a->data['search'] = $_POST['search'];
+ }
}
-function directory_content(App $a) {
- global $db;
-
+function directory_content(App $a)
+{
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);
+ if ((Config::get('system', 'block_public') && !local_user() && !remote_user())
+ || (Config::get('system', 'block_local_dir') && !local_user() && !remote_user())
+ ) {
+ notice(L10n::t('Public access denied.') . EOL);
return;
}
$o = '';
- nav_set_selected('directory');
+ Nav::setSelected('directory');
- if(x($a->data,'search'))
+ if (x($a->data, 'search')) {
$search = notags(trim($a->data['search']));
- else
- $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+ } else {
+ $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+ }
$gdirpath = '';
- $dirurl = get_config('system','directory');
- if(strlen($dirurl)) {
- $gdirpath = zrl($dirurl,true);
+ $dirurl = Config::get('system', 'directory');
+ if (strlen($dirurl)) {
+ $gdirpath = Profile::zrl($dirurl, true);
}
- if($search) {
+ if ($search) {
$search = dbesc($search);
$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
@@ -68,35 +78,35 @@ function directory_content(App $a) {
(`profile`.`prv_keywords` LIKE '%$search%'))";
}
- $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+ $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 " );
- $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 (dbm::is_result($r))
- $a->set_pager_total($r[0]['total']);
+ $cnt = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `profile`
+ LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+ WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
+ if (DBM::is_result($cnt)) {
+ $a->set_pager_total($cnt['total']);
+ }
$order = " ORDER BY `name` ASC ";
- $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
+ $limit = 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`,
+ $r = dba::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
`contact`.`addr`, `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 (dbm::is_result($r)) {
-
+ WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
+ $sql_extra $order LIMIT $limit"
+ );
+ if (DBM::is_result($r)) {
if (in_array('small', $a->argv)) {
$photo = 'thumb';
- }
- else {
+ } else {
$photo = 'photo';
}
- foreach ($r as $rr) {
-
+ while ($rr = dba::fetch($r)) {
$itemurl= '';
$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
@@ -106,106 +116,103 @@ function directory_content(App $a) {
$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '
' : '');
$details = '';
- if(strlen($rr['locality']))
+ if (strlen($rr['locality'])) {
$details .= $rr['locality'];
- if(strlen($rr['region'])) {
- if(strlen($rr['locality']))
+ }
+ if (strlen($rr['region'])) {
+ if (strlen($rr['locality'])) {
$details .= ', ';
+ }
$details .= $rr['region'];
}
- if(strlen($rr['country-name'])) {
- if(strlen($details))
+ if (strlen($rr['country-name'])) {
+ if (strlen($details)) {
$details .= ', ';
+ }
$details .= $rr['country-name'];
}
// if(strlen($rr['dob'])) {
// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-// $details .= '
' . t('Age: ') . $years ;
+// $details .= '
' . L10n::t('Age: ') . $years ;
// }
// if(strlen($rr['gender']))
-// $details .= '
' . t('Gender: ') . $rr['gender'];
+// $details .= '
' . L10n::t('Gender: ') . $rr['gender'];
$profile = $rr;
- 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;
+ if ((x($profile, 'address') == 1)
+ || (x($profile, 'locality') == 1)
+ || (x($profile, 'region') == 1)
+ || (x($profile, 'postal-code') == 1)
+ || (x($profile, 'country-name') == 1)
+ ) {
+ $location = L10n::t('Location:');
}
- $photo_menu = array(
- 'profile' => array(t("View Profile"), zrl($profile_link))
- );
-
- $entry = array(
- 'id' => $rr['id'],
- 'url' => $profile_link,
- 'itemurl' => $itemurl,
- 'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
- 'img_hover' => $rr['name'],
- 'name' => $rr['name'],
- 'details' => $details,
- 'account_type' => account_type($rr),
- '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);
+ $gender = ((x($profile, 'gender') == 1) ? L10n::t('Gender:') : false);
+ $marital = ((x($profile, 'marital') == 1) ? L10n::t('Status:') : false);
+ $homepage = ((x($profile, 'homepage') == 1) ? L10n::t('Homepage:') : false);
+ $about = ((x($profile, 'about') == 1) ? L10n::t('About:') : false);
+
+ $location_e = $location;
+
+ $photo_menu = [
+ 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
+ ];
+
+ $entry = [
+ 'id' => $rr['id'],
+ 'url' => $profile_link,
+ 'itemurl' => $itemurl,
+ 'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
+ 'img_hover' => $rr['name'],
+ 'name' => $rr['name'],
+ 'details' => $details,
+ 'account_type' => Contact::getAccountType($rr),
+ 'profile' => $profile,
+ 'location' => $location_e,
+ 'tags' => $rr['pub_keywords'],
+ 'gender' => $gender,
+ 'pdesc' => $pdesc,
+ 'marital' => $marital,
+ 'homepage' => $homepage,
+ 'about' => $about,
+ 'photo_menu' => $photo_menu,
+
+ ];
+
+ $arr = ['contact' => $rr, 'entry' => $entry];
+
+ Addon::callHooks('directory_item', $arr);
unset($profile);
unset($location);
- if(! $arr['entry'])
+ if (!$arr['entry']) {
continue;
+ }
$entries[] = $arr['entry'];
-
}
+ dba::close($r);
$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('Results for:'),
- '$findterm' => (strlen($search) ? $search : ""),
- '$title' => t('Site Directory'),
- '$submit' => t('Find'),
- '$paginate' => paginate($a),
- ));
-
+ $o .= replace_macros($tpl, [
+ '$search' => $search,
+ '$globaldir' => L10n::t('Global Directory'),
+ '$gdirpath' => $gdirpath,
+ '$desc' => L10n::t('Find on this site'),
+ '$contacts' => $entries,
+ '$finding' => L10n::t('Results for:'),
+ '$findterm' => (strlen($search) ? $search : ""),
+ '$title' => L10n::t('Site Directory'),
+ '$submit' => L10n::t('Find'),
+ '$paginate' => paginate($a),
+ ]);
+ } else {
+ info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
}
- else
- info( t("No entries \x28some entries may be hidden\x29.") . EOL);
return $o;
}