- Merge with edhelas

VERSION

@@ -1 +1 @@
-0.8alpha12
+0.8alpha13

app/models/config/Config.php

@@ -36,7 +36,7 @@ class Config extends Model {
             "timezone" : 
                 {"type":"string", "size":16, "mandatory":true  },
             "boshurl" : 
-                {"type":"string", "size":32, "mandatory":true  },
+                {"type":"string", "size":128, "mandatory":true  },
             "xmppwhitelist" : 
                 {"type":"text" },
             "info" : 

app/widgets/AdminMain/AdminMain.php

@@ -44,7 +44,7 @@ class AdminMain extends WidgetBase
 
     public function testBosh($url)
     {
-        return requestURL($url, 2);
+        return requestURL($url, 1);
     }
 
     public function date()

system/Utils.php

@@ -512,6 +512,7 @@ function requestURL($url, $timeout = 10, $post = false) {
     curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate');
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
     curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
 
     if(is_array($post)) {
         $params = '';