tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Added feedback

Browse source
This commit is contained in:
Philipp Holzer 2019-05-02 23:26:02 +02:00
parent 2e9b2d72be
commit 47d03058d1
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
2 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Model/Profile.php
View file

@ -1273,9 +1273,9 @@ class Profile
$publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 "); $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
$total = 0; $total = 0;
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile` $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra"); WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
if (DBA::isResult($cnt)) { if (DBA::isResult($cnt)) {
@ -1286,7 +1286,8 @@ class Profile
$limit = $start . ',' . $count; $limit = $start . ',' . $count;
$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, $profiles = 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` `contact`.`addr`, `contact`.`url` AS `profile_url`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self` WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`

38
src/Module/Directory.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Network\HTTPException;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -46,8 +47,7 @@ class Directory extends BaseModule
if (($config->get('system', 'block_public') && !local_user() && !remote_user()) || if (($config->get('system', 'block_public') && !local_user() && !remote_user()) ||
($config->get('system', 'block_local_dir') && !local_user() && !remote_user())) { ($config->get('system', 'block_local_dir') && !local_user() && !remote_user())) {
notice(L10n::t('Public access denied.') . EOL); throw new HTTPException\ForbiddenException();
return '';
} }
$output = ''; $output = '';
@ -55,11 +55,9 @@ class Directory extends BaseModule
Nav::setSelected('directory'); Nav::setSelected('directory');
if (!empty($app->data['search'])) { $search = (!empty($_REQUEST['search']) ?
$search = Strings::escapeTags(trim($app->data['search'])); Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) :
} else { '');
$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
}
$gDirPath = ''; $gDirPath = '';
$dirURL = $config->get('system', 'directory'); $dirURL = $config->get('system', 'directory');
@ -88,17 +86,17 @@ class Directory extends BaseModule
$tpl = Renderer::getMarkupTemplate('directory_header.tpl'); $tpl = Renderer::getMarkupTemplate('directory_header.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$search' => $search, '$search' => $search,
'$globaldir' => L10n::t('Global Directory'), '$globaldir' => L10n::t('Global Directory'),
'$gDirPath' => $gDirPath, '$gDirPath' => $gDirPath,
'$desc' => L10n::t('Find on this site'), '$desc' => L10n::t('Find on this site'),
'$contacts' => $profiles['entries'], '$contacts' => $profiles['entries'],
'$finding' => L10n::t('Results for:'), '$finding' => L10n::t('Results for:'),
'$findterm' => (strlen($search) ? $search : ""), '$findterm' => (strlen($search) ? $search : ""),
'$title' => L10n::t('Site Directory'), '$title' => L10n::t('Site Directory'),
'$search_mod' => 'directory', '$search_mod' => 'directory',
'$submit' => L10n::t('Find'), '$submit' => L10n::t('Find'),
'$paginate' => $pager->renderFull($profiles['total']), '$paginate' => $pager->renderFull($profiles['total']),
]); ]);
return $output; return $output;
@ -153,10 +151,10 @@ class Directory extends BaseModule
$location = ''; $location = '';
} }
$gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false); $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
$marital = (!empty($profile['marital']) ? L10n::t('Status:') : false); $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false);
$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false); $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
$about = (!empty($profile['about']) ? L10n::t('About:') : false); $about = (!empty($profile['about']) ? L10n::t('About:') : false);
$location_e = $location; $location_e = $location;