X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=d96f2396e41e110482d2a66a52c5b3050e3604b0;hb=aa004d03aab4ef8035cc204bc8718c9d2296100a;hp=de57f1078dc407e2532ad58d1b81750ccf2a8c23;hpb=367fc054dcf9cbcfb87fec987219d0810a1c8b9c;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index de57f1078d..d96f2396e4 100644
--- a/index.php
+++ b/index.php
@@ -93,9 +93,9 @@ function handleError($error)
             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...
@@ -103,7 +103,7 @@ function handleError($error)
         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));
@@ -266,10 +266,8 @@ function main()
 
     $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));
     }