- Etenil merge

infos.php

@@ -52,12 +52,17 @@ $doc->appendChild($infos);
         $version = $doc->createElement("version");
         $version->appendChild($doc->createTextNode(trim(fgets($f))));
         $infos->appendChild($version);
+        fclose($f);
     }
     
     $phpversion = $doc->createElement("phpversion");
     $phpversion->appendChild($doc->createTextNode(phpversion()));
     $infos->appendChild($phpversion);
 
+    $limit = $doc->createElement("userlimit");
+    $limit->appendChild($doc->createTextNode($conf['maxUsers']));
+    $infos->appendChild($limit);
+
 // And we dispatch it !
 ob_clean();
 ob_start();

system/Widget/widgets/AccountAdd/AccountAdd.php

@@ -53,15 +53,27 @@ class AccountAdd extends WidgetBase {
         $u = new UserConf();
         if($u->getConf($data['jid']) == false) {
             $host = end(explode('@', $data['jid']));
-            $dns = dns_get_record('_xmpp-client._tcp.'.$host);
-            
-            if(isset($dns[0]['target']) && $dns[0]['target'] != null)
+
+            // We attempt to resolve the actual xmpp domain.
+            $domain = null;
+            $dns = dns_get_record('_xmpp-client._tcp.'.$host, DNS_SRV);
+
+            if(count($dns) > 0) {
                 $domain = $dns[0]['target'];
-            else {
+            } else {
+                // Just checking if the domain exists.
+                $dns = dns_get_record($host, DNS_A);
+                if(count($dns) > 0) {
+                    $domain = $host;
+                }
+            }
+
+            if(!$domain) {
             	RPC::call('movim_reload', RPC::cdata(BASE_URI."index.php?q=accountAdd&err=dnsdomain"));
                 RPC::commit();
  	            exit;
             }
+
             $confvar = Conf::getServerConf();
 
             global $sdb;