fixing stuff that broke with the last big code push

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 0a7d7355e76910d31dfb0cf2388be22637f1a80d..094cf028f9a3f4ef0def72085f8481aa20b96b0c 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,16 +1,34 @@
 <?php
-
+function directory_init(&$a) {
+       $a->set_pager_itemspage(60);
+}
 
 function directory_content(&$a) {
 
+       $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
        $tpl .= file_get_contents('view/directory_header.tpl');
 
        $o .= replace_macros($tpl, array(
-
+               '$search' => $search,
+               '$finding' => (strlen($search) ? "<h4>Finding: '$search'</h4>" : "")
        ));
 
-       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 ORDER BY `name` ASC");
+       if($search)
+               $search = dbesc($search);
+       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+
+       $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 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 AND `publish` = 1 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');
@@ -36,8 +54,10 @@ function directory_content(&$a) {
                                        $details .= ', ';
                                $details .= $rr['country-name'];
                        }
-                       if(strlen($rr['dob']))
-                               $details .= '<br />Age: ' ; // . calculate age($rr['dob'])) ;
+                       if(strlen($rr['dob'])) {
+                               if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
+                                       $details .= "<br />Age: $years" ; 
+                       }
                        if(strlen($rr['gender']))
                                $details .= '<br />Gender: ' . $rr['gender'];
 
@@ -54,6 +74,8 @@ function directory_content(&$a) {
 
                }
                $o .= "<div class=\"directory-end\" ></div>\r\n";
+               $o .= paginate($a);
+
        }
        else
                notice("No entries (some entries may be hidden).");