From 0a485e66647fb58e58e1a4bcab350109ff28cb22 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 21:01:07 -0800 Subject: [PATCH] don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't) --- library/openid.php | 2 +- mod/directory.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/openid.php b/library/openid.php index eec652bb18..3c58beb8a5 100644 --- a/library/openid.php +++ b/library/openid.php @@ -276,7 +276,7 @@ class LightOpenID protected function request($url, $method='GET', $params=array()) { - if(function_exists('curl_init') && !ini_get('safe_mode')) { + if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) { return $this->request_curl($url, $method, $params); } return $this->request_streams($url, $method, $params); diff --git a/mod/directory.php b/mod/directory.php index 062aae516f..e1c83f05e3 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -40,6 +40,8 @@ function directory_content(&$a) { $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) " : ""); + + $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']);