Merge pull request #439 from zeroadam/Issue3873

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

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 0d7fbee804891533deffd4b888cbc0f09c081546..8e668d883eb27dacd857b23ad9b69d6fa5fb5a28 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -3,9 +3,11 @@
 * Name: Forum Directory
 * Description: Add a directory of forums hosted on your server, with verbose descriptions.
 * Version: 1.0
-* Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
+* Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
 */
 
+use Friendica\Core\Config;
+
 function forumdirectory_install() {
 register_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
@@ -49,7 +51,7 @@ function forumdirectory_post(&$a) {
 
 function forumdirectory_content(&$a) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
@@ -65,7 +67,7 @@ function forumdirectory_content(&$a) {
        $tpl = get_markup_template('directory_header.tpl');
 
        $globaldir = '';
-       $gdirpath = dirname(get_config('system','directory_submit_url'));
+       $gdirpath = Config::get('system','directory');
        if(strlen($gdirpath)) {
                $globaldir = '<ul><li><div id="global-directory-link"><a href="'
                . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
@@ -87,7 +89,7 @@ function forumdirectory_content(&$a) {
                $search = dbesc($search);
        $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
-       $publish = ((get_config('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 AND `page-flags` = 2 $sql_extra ");
@@ -168,12 +170,12 @@ function forumdirectory_content(&$a) {
 
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
-                               '$profile-link' => $profile_link,
+                               '$profile_link' => $profile_link,
                                '$photo' => $a->get_cached_avatar_image($rr[$photo]),
-                               '$alt-text' => $rr['name'],
+                               '$alt_text' => $rr['name'],
                                '$name' => $rr['name'],
                                '$details' => $pdesc . $details,
-                               '$page-type' => $page_type,
+                               '$page_type' => $page_type,
                                '$profile' => $profile,
                                '$location' => template_escape($location),
                                '$gender'   => $gender,
@@ -186,8 +188,6 @@ function forumdirectory_content(&$a) {
 
                        $arr = array('contact' => $rr, 'entry' => $entry);
 
-                       call_hooks('directory_item', $arr);
-                       
                        unset($profile);
                        unset($location);