Merge commit 'mike/master'

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index aec34f910d8f57ac1653b1d483779092925ee6d8..0504ac321c1e80d667538895f0e3728dd420d948 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,25 +1,63 @@
 <?php
 
+function directory_init(&$a) {
+       $a->set_pager_itemspage(60);
+}
+
+
+function directory_post(&$a) {
+       if(x($_POST,'search'))
+               $a->data['search'] = $_POST['search'];
+}
+
+
 
 function directory_content(&$a) {
+       $o = '';
+       $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
+       if(x($_SESSION,'theme'))
+               unset($_SESSION['theme']);
+
+       if(x($a->data,'search'))
+               $search = notags(trim($a->data['search']));
+       else
+               $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+       $tpl = load_view_file('view/directory_header.tpl');
 
-       $tpl .= file_get_contents('view/directory_header.tpl');
+       $globaldir = '';
+       $gdirpath = dirname(get_config('system','directory_submit_url'));
+       if(strlen($gdirpath)) {
+               $globaldir = '<ul><li><div id="global-directory-link"><a href="'
+               . $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+       }
 
        $o .= replace_macros($tpl, array(
-               '$search' => $search
-
+               '$search' => $search,
+               '$globaldir' => $globaldir,
+               '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")
        ));
 
        if($search)
                $search = dbesc($search);
-       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`employer`,`school`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+       $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+
 
-       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 $sql_extra ORDER BY `name` ASC");
+       $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 $sql_extra ");
+       if(count($r))
+               $a->set_pager_total($r[0]['total']);
+
+
+
+       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
+               intval($a->pager['start']),
+               intval($a->pager['itemspage'])
+       );
        if(count($r)) {
 
-               $tpl = file_get_contents('view/directory_item.tpl');
+               $tpl = load_view_file('view/directory_item.tpl');
 
                if(in_array('small', $a->argv))
                        $photo = 'thumb';
@@ -28,7 +66,11 @@ function directory_content(&$a) {
 
                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']))
                                $details .= $rr['locality'];
@@ -49,19 +91,28 @@ function directory_content(&$a) {
                        if(strlen($rr['gender']))
                                $details .= '<br />Gender: ' . $rr['gender'];
 
-                       $o .= replace_macros($tpl,array(
+                       $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
                                '$profile-link' => $profile_link,
                                '$photo' => $rr[$photo],
                                '$alt-text' => $rr['name'],
                                '$name' => $rr['name'],
-                               '$details' => $details  
+                               '$details' => $pdesc . $details  
 
 
                        ));
 
+                       $arr = array('contact' => $rr, 'entry' => $entry);
+
+                       call_hooks('directory_item', $arr);
+
+                       $o .= $entry;
+
                }
+
                $o .= "<div class=\"directory-end\" ></div>\r\n";
+               $o .= paginate($a);
+
        }
        else
                notice("No entries (some entries may be hidden).");