aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-02 22:09:54 -0800
committerFriendika <info@friendika.com>2011-01-02 22:09:54 -0800
commitd92659560b8edd0594b587103b43ad5bd5012639 (patch)
treef334d76dbd89093d8448e13e62f8b094159e576c
parentde5495f90b0327f565888d6cae9b9ae9cfa2664f (diff)
downloadvolse-hubzilla-d92659560b8edd0594b587103b43ad5bd5012639.tar.gz
volse-hubzilla-d92659560b8edd0594b587103b43ad5bd5012639.tar.bz2
volse-hubzilla-d92659560b8edd0594b587103b43ad5bd5012639.zip
site config to force publish in site directory
-rw-r--r--mod/directory.php6
-rw-r--r--mod/settings.php17
2 files changed, 13 insertions, 10 deletions
diff --git a/mod/directory.php b/mod/directory.php
index e1c83f05e..b0cee76cb 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -39,16 +39,16 @@ function directory_content(&$a) {
$search = dbesc($search);
$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `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 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 ");
+ $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 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
+ $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'])
);
diff --git a/mod/settings.php b/mod/settings.php
index eb27de06e..0f01807a2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -247,13 +247,16 @@ function settings_content(&$a) {
}
-
-
- $opt_tpl = load_view_file("view/profile-in-directory.tpl");
- $profile_in_dir = replace_macros($opt_tpl,array(
- '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
- '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
- ));
+ if(get_config('system','publish_all')) {
+ $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
+ }
+ else {
+ $opt_tpl = load_view_file("view/profile-in-directory.tpl");
+ $profile_in_dir = replace_macros($opt_tpl,array(
+ '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""),
+ '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
+ ));
+ }
if(strlen(get_config('system','directory_submit_url'))) {
$opt_tpl = load_view_file("view/profile-in-netdir.tpl");