Use short form array syntax everywhere

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

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9837b9c18aa878f84c4a7bdf0a5f654b76a57acc..c7951b795fffbc37999e8e3a9a179ed47616a147 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>';
@@ -73,7 +75,7 @@ function forumdirectory_content(&$a) {
 
        $admin = '';
 
-       $o .= replace_macros($tpl, array(
+       $o .= replace_macros($tpl, [
                '$search' => $search,
                '$globaldir' => $globaldir,
                '$desc' => t('Find on this site'),
@@ -81,20 +83,20 @@ function forumdirectory_content(&$a) {
                '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
                '$sitedir' => t('Site Directory'),
                '$submit' => t('Find')
-       ));
+       ]);
 
        if($search)
                $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 ");
        if(count($r))
                $a->set_pager_total($r[0]['total']);
 
-       $order = " ORDER BY `name` ASC "; 
+       $order = " ORDER BY `name` ASC ";
 
 
        $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` 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 $order LIMIT %d , %d ",
@@ -112,7 +114,7 @@ function forumdirectory_content(&$a) {
 
 
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-               
+
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
                        $details = '';
@@ -130,7 +132,7 @@ function forumdirectory_content(&$a) {
                        }
                        if(strlen($rr['dob'])) {
                                if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-                                       $details .= '<br />' . t('Age: ') . $years ; 
+                                       $details .= '<br />' . t('Age: ') . $years ;
                        }
                        if(strlen($rr['gender']))
                                $details .= '<br />' . t('Gender: ') . $rr['gender'];
@@ -162,11 +164,11 @@ function forumdirectory_content(&$a) {
                        $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
                        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
-                       
+
 #                      $tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
                        $tpl = get_markup_template( 'forumdirectory_item.tpl', 'addon/forumdirectory/' );
 
-                       $entry = replace_macros($tpl,array(
+                       $entry = replace_macros($tpl,[
                                '$id' => $rr['id'],
                                '$profile_link' => $profile_link,
                                '$photo' => $a->get_cached_avatar_image($rr[$photo]),
@@ -175,19 +177,17 @@ function forumdirectory_content(&$a) {
                                '$details' => $pdesc . $details,
                                '$page_type' => $page_type,
                                '$profile' => $profile,
-                               '$location' => template_escape($location),
+                               '$location' => $location,
                                '$gender'   => $gender,
                                '$pdesc'        => $pdesc,
                                '$marital'  => $marital,
                                '$homepage' => $homepage,
                                '$about' => $about,
 
-                       ));
+                       ]);
 
-                       $arr = array('contact' => $rr, 'entry' => $entry);
+                       $arr = ['contact' => $rr, 'entry' => $entry];
 
-                       call_hooks('directory_item', $arr);
-                       
                        unset($profile);
                        unset($location);