--- a/include/common.inc.php +++ b/include/common.inc.php @@ -49,19 +49,23 @@ if (strstr($_SERVER['PHP_SELF'], "labs/") || strstr($_SERVER['PHP_SELF'], "myway/") || strstr($_SERVER['PHP_SELF'], "lib/") + || strstr($_SERVER['PHP_SELF'], "geo/") || strstr($_SERVER['PHP_SELF'], "include/") || strstr($_SERVER['PHP_SELF'], "servicealerts/")) $basePath = "../"; function isDebugServer() { + return php_sapi_name() == "cli" || isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "azusa" || $_SERVER['SERVER_NAME'] == "vanille" - || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1"); + || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || $_SERVER['SERVER_NAME'] == "192.168.1.8"); } include_once ("common-geo.inc.php"); include_once ("common-net.inc.php"); include_once ("common-transit.inc.php"); -include_once ("common-db.inc.php"); +if (!strstr($_SERVER['PHP_SELF'], "feedback")) { + include_once ("common-db.inc.php"); +} include_once ("common-request.inc.php"); include_once ("common-session.inc.php"); @@ -70,7 +74,7 @@ function isAnalyticsOn() { $user_agent = $_SERVER['HTTP_USER_AGENT']; - return!isDebugServer() && !preg_match('/cloudkick/i', $user_agent) && !preg_match('/googlebot/i', $user_agent) && + return !isDebugServer() && !preg_match('/cloudkick/i', $user_agent) && !preg_match('/googlebot/i', $user_agent) && !preg_match('/baidu/i', $user_agent); } @@ -132,10 +136,6 @@ return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); } return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); -} - -function bracketsMeanNewLine($input) { - return str_replace(")", "", str_replace("(", "
", $input)); } function sksort(&$array, $subkey = "id", $sort_ascending = false) { @@ -201,5 +201,6 @@ return implode($glue, $retVal); } + ?>