$_startTime = microtime(true);
$_perfCounters = array();
+// We provide all our dependencies through our own autoload.
+// This will probably be configurable for distributing with
+// system packages (like with Debian apt etc. where included
+// libraries are maintained through repositories)
+set_include_path('.'); // mainly fixes an issue where /usr/share/{pear,php*}/DB/DataObject.php is _old_ on various systems...
+
define('INSTALLDIR', dirname(__FILE__));
define('GNUSOCIAL', true);
define('STATUSNET', true); // compatibility
return;
}
- $logmsg = "PEAR error: " . $error->getMessage();
- if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
- $logmsg .= " : ". $error->toText();
+ $logmsg = "Exception thrown: " . _ve($error->getMessage());
+ if ($error instanceof PEAR_Exception && common_config('log', 'debugtrace')) {
+ $logmsg .= " PEAR: ". $error->toText();
}
// DB queries often end up with a lot of newlines; merge to a single line
// for easier grepability...
common_log(LOG_ERR, $logmsg);
// @fixme backtrace output should be consistent with exception handling
- if (common_config('site', 'logdebug')) {
+ if (common_config('log', 'debugtrace')) {
$bt = $error->getTrace();
foreach ($bt as $n => $line) {
common_log(LOG_ERR, formatBacktraceLine($n, $line));
$args = $r->map($path);
- $site_ssl = common_config('site', 'ssl');
-
// If the request is HTTP and it should be HTTPS...
- if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
+ if (GNUsocial::useHTTPS() && !GNUsocial::isHTTPS()) {
common_redirect(common_local_url($args['action'], $args));
}