Don't always make spam_score writeable

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 49764f86a5fe40cc32effaa60a75fb682547202c..a061d17739356cc0bc9643a39bec2106513b7efb 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -1307,11 +1307,11 @@ function common_inject_session($url, $serverpart = null)
 {
     if (common_have_session()) {
 
-       if (empty($serverpart)) {
-           $serverpart = parse_url($url, PHP_URL_HOST);
-       }
+        if (empty($serverpart)) {
+            $serverpart = parse_url($url, PHP_URL_HOST);
+        }
 
-        $currentServer = $_SERVER['HTTP_HOST'];
+        $currentServer = (array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['HTTP_HOST'] : null;
 
         // Are we pointing to another server (like an SSL server?)
 
@@ -1459,6 +1459,7 @@ function common_redirect($url, $code=307)
 
     header('HTTP/1.1 '.$code.' '.$status[$code]);
     header("Location: $url");
+    header("Connection: close");
 
     $xo = new XMLOutputter();
     $xo->startXML('a',
@@ -2162,7 +2163,11 @@ function common_shorten_url($long_url, User $user=null, $force = false)
             } else {
                 $shortenedUrl = common_local_url('redirecturl',
                                                  array('id' => $f->id));
-                return $shortenedUrl;
+                if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) {
+                    return $shortenedUrl;
+                } else {
+                    return $long_url;
+                }
             }
         } else {
             return $long_url;