[various] Rename forum to group

[friendica-addons.git] / forumdirectory / forumdirectory.php

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 8c260fd71b512935eca399a70097d0dba4ace825..79267c4ee5ee72388255a91d5c95d1071746562b 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -4,6 +4,8 @@
  * Description: Add a directory of forums hosted on your server, with verbose descriptions.
  * Version: 1.1
  * Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
+ * Status: Unsupported
+ * Note: Please use Group Directory instead
  */
 
 use Friendica\App;
@@ -16,46 +18,53 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Util\Strings;
+
+global $forumdirectory_search;
 
 function forumdirectory_install()
 {
        Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-function forumdirectory_uninstall()
-{
-       Hook::unregister('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
-}
-
-function forumdirectory_module()
-{
-       return;
-}
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function forumdirectory_module() {}
 
-function forumdirectory_app_menu(App $a, array &$b)
+function forumdirectory_app_menu(array &$b)
 {
        $b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . DI::l10n()->t('Forum Directory') . '</a></div>';
 }
 
-function forumdirectory_init(App $a)
+function forumdirectory_init()
 {
-       if (local_user()) {
+       if (DI::userSession()->getLocalUserId()) {
                DI::page()['aside'] .= Widget::findPeople();
        }
 }
 
-function forumdirectory_post(App $a)
+function forumdirectory_post()
 {
+       global $forumdirectory_search;
+
        if (!empty($_POST['search'])) {
-               $a->data['search'] = $_POST['search'];
+               $forumdirectory_search = $_POST['search'];
        }
 }
 
-function forumdirectory_content(App $a)
+function forumdirectory_content()
 {
-       if ((DI::config()->get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
-               notice(DI::l10n()->t('Public access denied.') . EOL);
+       global $forumdirectory_search;
+
+       if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteUserId()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
@@ -64,10 +73,10 @@ function forumdirectory_content(App $a)
 
        Nav::setSelected('directory');
 
-       if (!empty($a->data['search'])) {
-               $search = Strings::escapeTags(trim($a->data['search']));
+       if (!empty($forumdirectory_search)) {
+               $search = trim($forumdirectory_search);
        } else {
-               $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+               $search = (!empty($_GET['search']) ? trim(rawurldecode($_GET['search'])) : '');
        }
 
        $gdirpath = '';
@@ -95,7 +104,7 @@ function forumdirectory_content(App $a)
        $total = 0;
        $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
                                INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = ? $sql_extra",
+                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
                                User::PAGE_FLAGS_COMMUNITY);
        if (DBA::isResult($cnt)) {
                $total = $cnt['total'];
@@ -116,7 +125,7 @@ function forumdirectory_content(App $a)
        );
 
        if (DBA::isResult($r)) {
-               if (in_array('small', $a->argv)) {
+               if (in_array('small', DI::args()->getArgv())) {
                        $photo = 'thumb';
                } else {
                        $photo = 'photo';
@@ -127,7 +136,7 @@ function forumdirectory_content(App $a)
                }
                DBA::close($r);
        } else {
-               info(DI::l10n()->t("No entries \x28some entries may be hidden\x29.") . EOL);
+               DI::sysmsg()->addNotice(DI::l10n()->t("No entries \x28some entries may be hidden\x29."));
        }
 
        $tpl = Renderer::getMarkupTemplate('directory_header.tpl');