Fix forumdirectory reference to deleted files/functions
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 19 Jan 2018 00:36:05 +0000 (19:36 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Fri, 19 Jan 2018 00:39:02 +0000 (19:39 -0500)
- Fix formatting
- Fix reference to nav_set_selected
- Fix reference to widget_findpeople

forumdirectory/forumdirectory.php

index 890c3d61b04c2610e45bf288602b4772107986ef..393063cb03bd6a72681149ec6d18f22580429e27 100644 (file)
 <?php
-/**
-* Name: Forum Directory
-* Description: Add a directory of forums hosted on your server, with verbose descriptions.
-* Version: 1.0
-* Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
-*/
 
+/**
+ * Name: Forum Directory
+ * Description: Add a directory of forums hosted on your server, with verbose descriptions.
+ * Version: 1.0
+ * Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
+ */
+
+use Friendica\Content\Nav;
+use Friendica\Content\Widget;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
-function forumdirectory_install() {
-register_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
+function forumdirectory_install()
+{
+       register_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-function forumdirectory_uninstall() {
-unregister_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
+function forumdirectory_uninstall()
+{
+       unregister_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-function forumdirectory_module() {
-return;
+function forumdirectory_module()
+{
+       return;
 }
 
-function forumdirectory_app_menu($a,&$b) {
-$b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . t('Forum Directory') . '</a></div>';
+function forumdirectory_app_menu($a, &$b)
+{
+       $b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . t('Forum Directory') . '</a></div>';
 }
 
-function forumdirectory_init(&$a) {
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/forumdirectory/forumdirectory.css" media="all" />';
+function forumdirectory_init(&$a)
+{
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
 
        $a->set_pager_itemspage(60);
 
-       if(local_user()) {
-               require_once('include/contact_widgets.php');
-
-               $a->page['aside'] .= findpeople_widget();
-
-       }
-       else
+       if (local_user()) {
+               $a->page['aside'] .= Widget::findPeople();
+       } else {
                unset($_SESSION['theme']);
-
-
+       }
 }
 
-
-function forumdirectory_post(&$a) {
-       if(x($_POST,'search'))
+function forumdirectory_post(&$a)
+{
+       if (x($_POST, 'search')) {
                $a->data['search'] = $_POST['search'];
+       }
 }
 
-
-
-function forumdirectory_content(&$a) {
-
-       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+function forumdirectory_content(&$a)
+{
+       if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+               notice(t('Public access denied.') . EOL);
                return;
        }
 
        $o = '';
-       nav_set_selected('directory');
+       Nav::setSelected('directory');
 
-       if(x($a->data,'search'))
+       if (x($a->data, 'search')) {
                $search = notags(trim($a->data['search']));
-       else
-               $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+       } else {
+               $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+       }
 
        $tpl = get_markup_template('directory_header.tpl');
 
        $globaldir = '';
-       $gdirpath = Config::get('system','directory');
-       if(strlen($gdirpath)) {
+       $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>';
+                       . zrl($gdirpath, true) . '">' . t('Global Directory') . '</a></div></li></ul>';
        }
 
        $admin = '';
 
        $o .= replace_macros($tpl, [
-               '$search' => $search,
+               '$search'    => $search,
                '$globaldir' => $globaldir,
-               '$desc' => t('Find on this site'),
-               '$admin' => $admin,
-               '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-               '$sitedir' => t('Site Directory'),
-               '$submit' => t('Find')
+               '$desc'      => t('Find on this site'),
+               '$admin'     => $admin,
+               '$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 = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " );
+       $sql_extra = '';
+       if (strlen($search)) {
+               $sql_extra = " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,"
+                       . "`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` )"
+                       . " AGAINST ('" . dbesc($search) . "' IN BOOLEAN MODE) ";
+       }
 
+       $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))
+       $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 (DBM::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
+       }
 
        $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 ",
+       $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 ",
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
-       if(count($r)) {
-
-               if(in_array('small', $a->argv))
+       if (DBM::is_result($r)) {
+               if (in_array('small', $a->argv)) {
                        $photo = 'thumb';
-               else
+               } else {
                        $photo = 'photo';
+               }
 
-               foreach($r as $rr) {
-
-
+               foreach ($r as $rr) {
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
                        $details = '';
-                       if(strlen($rr['locality']))
+                       if (strlen($rr['locality'])) {
                                $details .= $rr['locality'];
-                       if(strlen($rr['region'])) {
-                               if(strlen($rr['locality']))
+                       }
+
+                       if (strlen($rr['region'])) {
+                               if (strlen($rr['locality'])) {
                                        $details .= ', ';
+                               }
                                $details .= $rr['region'];
                        }
-                       if(strlen($rr['country-name'])) {
-                               if(strlen($details))
+                       if (strlen($rr['country-name'])) {
+                               if (strlen($details)) {
                                        $details .= ', ';
+                               }
                                $details .= $rr['country-name'];
                        }
-                       if(strlen($rr['dob'])) {
-                               if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-                                       $details .= '<br />' . t('Age: ') . $years ;
+
+                       if (strlen($rr['dob']) && ($years = age($rr['dob'], $rr['timezone'], '')) != 0) {
+                               $details .= '<br />' . t('Age: ') . $years;
                        }
-                       if(strlen($rr['gender']))
+
+                       if (strlen($rr['gender'])) {
                                $details .= '<br />' . t('Gender: ') . $rr['gender'];
+                       }
 
-                       if($rr['page-flags'] == PAGE_NORMAL)
-                               $page_type = "Personal Profile";
-                       if($rr['page-flags'] == PAGE_SOAPBOX)
-                               $page_type = "Fan Page";
-                       if($rr['page-flags'] == PAGE_COMMUNITY)
-                               $page_type = "Community Forum";
-                       if($rr['page-flags'] == PAGE_FREELOVE)
-                               $page_type = "Open Forum";
-                       if($rr['page-flags'] == PAGE_PRVGROUP)
-                               $page_type = "Private Group";
+                       switch ($rr['page-flags']) {
+                               case PAGE_NORMAL   : $page_type = "Personal Profile"; break;
+                               case PAGE_SOAPBOX  : $page_type = "Fan Page"        ; break;
+                               case PAGE_COMMUNITY: $page_type = "Community Forum" ; break;
+                               case PAGE_FREELOVE : $page_type = "Open Forum"      ; break;
+                               case PAGE_PRVGROUP : $page_type = "Private Group"   ; break;
+                       }
 
                        $profile = $rr;
 
-                       if((x($profile,'address') == 1)
-                               || (x($profile,'locality') == 1)
-                               || (x($profile,'region') == 1)
-                               || (x($profile,'postal-code') == 1)
-                               || (x($profile,'country-name') == 1))
-                       $location = t('Location:');
-
-                       $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
-
-                       $marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
-
-                       $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+                       $location = '';
+                       if (x($profile, 'address') == 1
+                               || x($profile, 'locality') == 1
+                               || x($profile, 'region') == 1
+                               || x($profile, 'postal-code') == 1
+                               || x($profile, 'country-name') == 1
+                       ) {
+                               $location = t('Location:');
+                       }
 
-                       $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+                       $gender   = x($profile, 'gender')   == 1 ? t('Gender:')   : false;
+                       $marital  = x($profile, 'marital')  == 1 ? t('Status:')   : false;
+                       $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/' );
+                       $tpl = get_markup_template('forumdirectory_item.tpl', 'addon/forumdirectory/');
 
-                       $entry = replace_macros($tpl,[
-                               '$id' => $rr['id'],
+                       $entry = replace_macros($tpl, [
+                               '$id'           => $rr['id'],
                                '$profile_link' => $profile_link,
-                               '$photo' => $rr[$photo],
-                               '$alt_text' => $rr['name'],
-                               '$name' => $rr['name'],
-                               '$details' => $pdesc . $details,
-                               '$page_type' => $page_type,
-                               '$profile' => $profile,
-                               '$location' => $location,
-                               '$gender'   => $gender,
-                               '$pdesc'        => $pdesc,
-                               '$marital'  => $marital,
-                               '$homepage' => $homepage,
-                               '$about' => $about,
-
+                               '$photo'        => $rr[$photo],
+                               '$alt_text'     => $rr['name'],
+                               '$name'         => $rr['name'],
+                               '$details'      => $pdesc . $details,
+                               '$page_type'    => $page_type,
+                               '$profile'      => $profile,
+                               '$location'     => $location,
+                               '$gender'       => $gender,
+                               '$pdesc'        => $pdesc,
+                               '$marital'      => $marital,
+                               '$homepage'     => $homepage,
+                               '$about'        => $about,
                        ]);
 
-                       $arr = ['contact' => $rr, 'entry' => $entry];
-
-                       unset($profile);
-                       unset($location);
-
                        $o .= $entry;
-
                }
 
                $o .= "<div class=\"directory-end\" ></div>\r\n";
                $o .= paginate($a);
-
+       } else {
+               info(t("No entries \x28some entries may be hidden\x29.") . EOL);
        }
-       else
-               info( t("No entries \x28some entries may be hidden\x29.") . EOL);
 
        return $o;
 }