use Friendica\Content\Widget;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Session;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
+use Friendica\Network\HTTPException;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
*/
class Directory extends BaseModule
{
- public static function init()
+ public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
+ $config = DI::config();
- if (local_user()) {
- $app->page['aside'] .= Widget::findPeople();
- $app->page['aside'] .= Widget::follow();
- } else {
- unset($_SESSION['theme']);
- unset($_SESSION['mobile-theme']);
- }
- }
-
- public static function post()
- {
- if (!empty($_POST['search'])) {
- self::getApp()->data['search'] = $_POST['search'];
+ if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
+ ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
+ throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
}
- }
-
- public static function content()
- {
- $app = self::getApp();
- $config = $app->getConfig();
- 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 '';
+ if (local_user()) {
+ DI::page()['aside'] .= Widget::findPeople();
+ DI::page()['aside'] .= Widget::follow();
}
$output = '';
Nav::setSelected('directory');
- if (!empty($app->data['search'])) {
- $search = Strings::escapeTags(trim($app->data['search']));
- } else {
- $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
- }
+ $search = (!empty($_REQUEST['search']) ?
+ Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) :
+ '');
$gDirPath = '';
$dirURL = $config->get('system', 'directory');
$gDirPath = Profile::zrl($dirURL, true);
}
- $pager = new Pager($app->query_string, 60);
+ $pager = new Pager(DI::args()->getQueryString(), 60);
$profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
$output .= Renderer::replaceMacros($tpl, [
- '$search' => $search,
- '$globaldir' => L10n::t('Global Directory'),
- '$gDirPath' => $gDirPath,
- '$desc' => L10n::t('Find on this site'),
- '$contacts' => $profiles['entries'],
- '$finding' => L10n::t('Results for:'),
- '$findterm' => (strlen($search) ? $search : ""),
- '$title' => L10n::t('Site Directory'),
+ '$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'),
'$search_mod' => 'directory',
- '$submit' => L10n::t('Find'),
- '$paginate' => $pager->renderFull($profiles['total']),
+ '$submit' => L10n::t('Find'),
+ '$paginate' => $pager->renderFull($profiles['total']),
]);
return $output;
$location = '';
}
- $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
- $marital = (!empty($profile['marital']) ? L10n::t('Status:') : 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);
+ $about = (!empty($profile['about']) ? L10n::t('About:') : false);
$location_e = $location;
$entry = [
'id' => $contact['id'],
- 'url' => Contact::magicLInk($profile_link),
+ 'url' => Contact::magicLink($profile_link),
'itemurl' => $itemurl,
'thumb' => ProxyUtils::proxifyUrl($contact[$photo_size], false, ProxyUtils::SIZE_THUMB),
'img_hover' => $contact['name'],