Facebook app wasn't loading the theme css

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

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 5af407fc5a7f934066389f996193fd3b7152e2d7..22d5b4cb5442e762b05d7a0d9a85c0944f4ad8e3 100644 (file)
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,14 +19,18 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ShortUrlApi {
+class ShortUrlApi
+{
     protected $service_url;
+    protected $long_limit = 27;
 
-    function __construct($service_url) {
+    function __construct($service_url)
+    {
         $this->service_url = $service_url;
     }
 
-    function shorten($url) {
+    function shorten($url)
+    {
         if ($this->is_long($url)) return $this->shorten_imp($url);
         return $url;
     }
@@ -36,7 +40,7 @@ class ShortUrlApi {
     }
 
     private function is_long($url) {
-        return strlen($url) >= 30;
+        return strlen($url) >= common_config('site', 'shorturllength');
     }
 
     protected function http_post($data) {
@@ -67,8 +71,10 @@ class ShortUrlApi {
     }
 }
 
-class LilUrl extends ShortUrlApi {
-    function __construct() {
+class LilUrl extends ShortUrlApi
+{
+    function __construct()
+    {
         parent::__construct('http://ur1.ca/');
     }
 
@@ -76,15 +82,19 @@ class LilUrl extends ShortUrlApi {
         $data['longurl'] = $url;
         $response = $this->http_post($data);
         if (!$response) return $url;
-        $x = simplexml_load_string($response)->body->p[0]->a->attributes();
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $x = $y->body->p[0]->a->attributes();
         if (isset($x['href'])) return $x['href'];
         return $url;
     }
 }
 
 
-class PtitUrl extends ShortUrlApi {
-    function __construct() {
+class PtitUrl extends ShortUrlApi
+{
+    function __construct()
+    {
         parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url=');
     }
 
@@ -92,14 +102,18 @@ class PtitUrl extends ShortUrlApi {
         $response = $this->http_get($url);
         if (!$response) return $url;
         $response = $this->tidy($response);
-        $xml = simplexml_load_string($response)->body->center->table->tr->td->pre->a->attributes();
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $xml = $y->body->center->table->tr->td->pre->a->attributes();
         if (isset($xml['href'])) return $xml['href'];
         return $url;
     }
 }
 
-class TightUrl extends ShortUrlApi {
-    function __construct() {
+class TightUrl extends ShortUrlApi
+{
+    function __construct()
+    {
         parent::__construct('http://2tu.us/?save=y&url=');
     }
 
@@ -107,10 +121,11 @@ class TightUrl extends ShortUrlApi {
         $response = $this->http_get($url);
         if (!$response) return $url;
         $response = $this->tidy($response);
-        $xml = simplexml_load_string($response)->body->p[0]->code[0]->a->attributes();
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $xml = $y->body->p[0]->code[0]->a->attributes();
         if (isset($xml['href'])) return $xml['href'];
         return $url;
     }
 }
 
-