summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.php.sample1
-rw-r--r--lib/common.php1
-rw-r--r--lib/jabber.php3
3 files changed, 4 insertions, 1 deletions
diff --git a/config.php.sample b/config.php.sample
index e5dfdbae2..bfcbf26a9 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -54,6 +54,7 @@ $config['db']['database'] = 'mysql://laconica:microblog@localhost/laconica';
#$config['xmpp']['server'] = 'server.example.net';
#$config['xmpp']['port'] = 5222;
#$config['xmpp']['user'] = 'update';
+#$config['xmpp']['encryption'] = false;
#$config['xmpp']['resource'] = 'uniquename';
#$config['xmpp']['password'] = 'blahblahblah';
#$config['xmpp']['public'][] = 'someindexer@example.net';
diff --git a/lib/common.php b/lib/common.php
index 13c7d0d45..e4c8e9032 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -86,6 +86,7 @@ $config =
'server' => 'INVALID SERVER',
'port' => 5222,
'user' => 'update',
+ 'encryption' => true,
'resource' => 'uniquename',
'password' => 'blahblahblah',
'host' => NULL, # only set if != server
diff --git a/lib/jabber.php b/lib/jabber.php
index cba7f62c4..01ec8da43 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -82,7 +82,8 @@ function jabber_connect($resource=NULL) {
XMPPHP_Log::LEVEL_VERBOSE : NULL
);
$conn->autoSubscribe();
-
+ $conn->useEncryption(common_config('xmpp', 'encryption'));
+
if (!$conn) {
return false;
}