X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=3fd0aa848bec837401e1132f14e41f1d567572d6;hb=e447375cddb847edbc9d4486be3938674ae66b8c;hp=9dc08f0fbce33612e7efbf07af1d77f193d3b410;hpb=35d334dd26cdddfe019d41750ee689e4bfe94cbe;p=friendica.git diff --git a/mod/directory.php b/mod/directory.php index 9dc08f0fbc..3fd0aa848b 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -2,58 +2,65 @@ /** * @file mod/directory.php */ + use Friendica\App; +use Friendica\Content\Nav; +use Friendica\Content\Pager; +use Friendica\Content\Widget; +use Friendica\Core\Addon; use Friendica\Core\Config; -use Friendica\Database\DBM; +use Friendica\Core\L10n; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Profile; - -function directory_init(App $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 { +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; + +function directory_init(App $a) +{ + 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 (!empty($_POST['search'])) { $a->data['search'] = $_POST['search']; + } } -function directory_content(App $a) { - require_once("mod/proxy.php"); - - if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) || - (Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); +function directory_content(App $a) +{ + 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')) - $search = notags(trim($a->data['search'])); - else - $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); + if (!empty($a->data['search'])) { + $search = Strings::escapeTags(trim($a->data['search'])); + } else { + $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); + } $gdirpath = ''; - $dirurl = Config::get('system','directory'); - if(strlen($dirurl)) { - $gdirpath = Profile::zrl($dirurl,true); + $dirurl = Config::get('system', 'directory'); + if (strlen($dirurl)) { + $gdirpath = Profile::zrl($dirurl, true); } - if($search) { - $search = dbesc($search); + if ($search) { + $search = DBA::escape($search); $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR (`user`.`nickname` LIKE '%$search%') OR @@ -70,37 +77,41 @@ function directory_content(App $a) { (`profile`.`education` LIKE '%$search%') OR (`profile`.`pub_keywords` LIKE '%$search%') OR (`profile`.`prv_keywords` LIKE '%$search%'))"; + } else { + $sql_extra = ''; } - $publish = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " ); + $publish = (Config::get('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 "); - if (DBM::is_result($r)) - $a->set_pager_total($r[0]['total']); + $total = 0; + $cnt = DBA::fetchFirst("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 (DBA::isResult($cnt)) { + $total = $cnt['total']; + } + $pager = new Pager($a->query_string, 60); $order = " ORDER BY `name` ASC "; - $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']); + $limit = $pager->getStart()."," . $pager->getItemsPerPage(); - $r = 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` $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 (DBA::isResult($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']); @@ -110,101 +121,105 @@ 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); + if (!empty($profile['address']) + || !empty($profile['locality']) + || !empty($profile['region']) + || !empty($profile['postal-code']) + || !empty($profile['country-name']) + ) { + $location = L10n::t('Location:'); + } else { + $location = ''; + } - $about = ((x($profile,'about') == 1) ? t('About:') : False); + $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false); + $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false); + $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false); + $about = (!empty($profile['about']) ? L10n::t('About:') : false); $location_e = $location; - $photo_menu = array( - 'profile' => array(t("View Profile"), 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, + $photo_menu = [ + 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)] + ]; + + $entry = [ + 'id' => $rr['id'], + 'url' => $profile_link, + 'itemurl' => $itemurl, + 'thumb' => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::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, + '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); + $arr = ['contact' => $rr, 'entry' => $entry]; - call_hooks('directory_item', $arr); + Addon::callHooks('directory_item', $arr); unset($profile); unset($location); - if(! $arr['entry']) + if (!$arr['entry']) { continue; + } $entries[] = $arr['entry']; - } - - $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), - )); - + DBA::close($r); + + $tpl = Renderer::getMarkupTemplate('directory_header.tpl'); + + $o .= Renderer::replaceMacros($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' => $pager->renderFull($total), + ]); + } 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; }