mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-05 17:22:53 +00:00
[forumdirectory] Fixes, type-hints and PAGE_* moval (#671)
* Rewrite: - moved PAGE_* constants to class Friendica\Model\Profile * Rewrites: - added type-hint `App` - added type-hint `array` to $b - used empty() instead of deprecated x() * [forumdirectory] CR request: - moved constants PAGE_* from Profile to Contact class * [forumdirectory] CR request: Removed superfluous == 1
This commit is contained in:
parent
31d0fac64a
commit
05bea7c61d
1 changed files with 23 additions and 21 deletions
|
@ -6,12 +6,14 @@
|
||||||
* Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
|
* Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use Friendica\App;
|
||||||
use Friendica\Content\Nav;
|
use Friendica\Content\Nav;
|
||||||
use Friendica\Content\Widget;
|
use Friendica\Content\Widget;
|
||||||
use Friendica\Core\Addon;
|
use Friendica\Core\Addon;
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\Model\Contact;
|
||||||
use Friendica\Model\Profile;
|
use Friendica\Model\Profile;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
|
|
||||||
|
@ -34,12 +36,12 @@ function forumdirectory_module()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function forumdirectory_app_menu($a, &$b)
|
function forumdirectory_app_menu(App $a, array &$b)
|
||||||
{
|
{
|
||||||
$b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . L10n::t('Forum Directory') . '</a></div>';
|
$b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . L10n::t('Forum Directory') . '</a></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
function forumdirectory_init(&$a)
|
function forumdirectory_init(App $a)
|
||||||
{
|
{
|
||||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
|
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
|
||||||
|
|
||||||
|
@ -52,14 +54,14 @@ function forumdirectory_init(&$a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function forumdirectory_post(&$a)
|
function forumdirectory_post(App $a)
|
||||||
{
|
{
|
||||||
if (x($_POST, 'search')) {
|
if (!empty($_POST['search'])) {
|
||||||
$a->data['search'] = $_POST['search'];
|
$a->data['search'] = $_POST['search'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function forumdirectory_content(&$a)
|
function forumdirectory_content(App $a)
|
||||||
{
|
{
|
||||||
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
|
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
|
||||||
notice(L10n::t('Public access denied.') . EOL);
|
notice(L10n::t('Public access denied.') . EOL);
|
||||||
|
@ -69,10 +71,10 @@ function forumdirectory_content(&$a)
|
||||||
$o = '';
|
$o = '';
|
||||||
Nav::setSelected('directory');
|
Nav::setSelected('directory');
|
||||||
|
|
||||||
if (x($a->data, 'search')) {
|
if (!empty($a->data['search'])) {
|
||||||
$search = notags(trim($a->data['search']));
|
$search = notags(trim($a->data['search']));
|
||||||
} else {
|
} else {
|
||||||
$search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
$search = ((!empty($_GET['search'])) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
$tpl = get_markup_template('directory_header.tpl');
|
$tpl = get_markup_template('directory_header.tpl');
|
||||||
|
@ -159,29 +161,29 @@ function forumdirectory_content(&$a)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ($rr['page-flags']) {
|
switch ($rr['page-flags']) {
|
||||||
case PAGE_NORMAL : $page_type = "Personal Profile"; break;
|
case Contact::PAGE_NORMAL : $page_type = "Personal Profile"; break;
|
||||||
case PAGE_SOAPBOX : $page_type = "Fan Page" ; break;
|
case Contact::PAGE_SOAPBOX : $page_type = "Fan Page" ; break;
|
||||||
case PAGE_COMMUNITY: $page_type = "Community Forum" ; break;
|
case Contact::PAGE_COMMUNITY: $page_type = "Community Forum" ; break;
|
||||||
case PAGE_FREELOVE : $page_type = "Open Forum" ; break;
|
case Contact::PAGE_FREELOVE : $page_type = "Open Forum" ; break;
|
||||||
case PAGE_PRVGROUP : $page_type = "Private Group" ; break;
|
case Contact::PAGE_PRVGROUP : $page_type = "Private Group" ; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$profile = $rr;
|
$profile = $rr;
|
||||||
|
|
||||||
$location = '';
|
$location = '';
|
||||||
if (x($profile, 'address') == 1
|
if (!empty($profile['address'])
|
||||||
|| x($profile, 'locality') == 1
|
|| !empty($profile['locality'])
|
||||||
|| x($profile, 'region') == 1
|
|| !empty($profile['region'])
|
||||||
|| x($profile, 'postal-code') == 1
|
|| !empty($profile['postal-code'])
|
||||||
|| x($profile, 'country-name') == 1
|
|| !empty($profile['country-name'])
|
||||||
) {
|
) {
|
||||||
$location = L10n::t('Location:');
|
$location = L10n::t('Location:');
|
||||||
}
|
}
|
||||||
|
|
||||||
$gender = x($profile, 'gender') == 1 ? L10n::t('Gender:') : false;
|
$gender = !empty($profile['gender']) ? L10n::t('Gender:') : false;
|
||||||
$marital = x($profile, 'marital') == 1 ? L10n::t('Status:') : false;
|
$marital = !empty($profile['marital']) ? L10n::t('Status:') : false;
|
||||||
$homepage = x($profile, 'homepage') == 1 ? L10n::t('Homepage:') : false;
|
$homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false;
|
||||||
$about = x($profile, 'about') == 1 ? L10n::t('About:') : false;
|
$about = !empty($profile['about']) ? L10n::t('About:') : false;
|
||||||
|
|
||||||
$tpl = get_markup_template('forumdirectory_item.tpl', 'addon/forumdirectory/');
|
$tpl = get_markup_template('forumdirectory_item.tpl', 'addon/forumdirectory/');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue