diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-08-18 18:55:18 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-08-18 18:55:18 +0200 |
| commit | b5d1c7865b14fa60c35618b4179eb3c91949a441 (patch) | |
| tree | 38ddb2fcab0f4c2c3baf6917e3544148cbe1eb9e /mod/directory.php | |
| parent | 3b979dd2a9f8bb8f569c234408d02dfd1e7039d7 (diff) | |
| parent | d9ff121930554aa9bcad4f4ceffeb9b5e3b83d17 (diff) | |
| download | volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.tar.gz volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.tar.bz2 volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.zip | |
Merge pull request #1 from friendica/master
Red master has been merged
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/mod/directory.php b/mod/directory.php index b11b0d410..8dbed4115 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -199,20 +199,37 @@ function directory_content(&$a) { $a->data['directory_keywords'] = $j['keywords']; } -// logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); + logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); - $o .= replace_macros($tpl, array( - '$search' => $search, - '$desc' => t('Find'), - '$finddsc' => t('Finding:'), - '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), - '$entries' => $entries, - '$dirlbl' => t('Directory'), - '$submit' => t('Find') - )); + if($_REQUEST['aj']) { + if($entries) { + $o = replace_macros(get_markup_template('directajax.tpl'),array( + '$entries' => $entries + )); + } + else { + $o = '<div id="content-complete"></div>'; + } + echo $o; + killme(); + } + else { - $o .= alt_pager($a,$j['records'], t('next page'), t('previous page')); + $o .= "<script> var page_query_args = '" . $a->query_string . "'; </script>"; + $o .= replace_macros($tpl, array( + '$search' => $search, + '$desc' => t('Find'), + '$finddsc' => t('Finding:'), + '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), + '$entries' => $entries, + '$dirlbl' => t('Directory'), + '$submit' => t('Find') + )); + +// $o .= alt_pager($a,$j['records'], t('next page'), t('previous page')); + + } } else { |