eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Fixes for making Meteor working with HTTPS.

Browse Source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2014-08-18 21:59:25 +02:00 committed by Mikael Nordfeldth
parent c1a0132cab
commit e1eadbcf4f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Meteor/MeteorPlugin.php
View File

@ -103,9 +103,10 @@ class MeteorPlugin extends RealtimePlugin
function _updateInitialize($timeline, $user_id) function _updateInitialize($timeline, $user_id)
{ {
$script = parent::_updateInitialize($timeline, $user_id); $script = parent::_updateInitialize($timeline, $user_id);
$ours = sprintf("MeteorUpdater.init(%s, %s, %s);", $ours = sprintf("MeteorUpdater.init(%s, %s, %s, %s);",
json_encode($this->webserver), json_encode($this->webserver),
json_encode($this->webport), json_encode($this->webport),
json_encode($this->protocol),
json_encode($timeline)); json_encode($timeline));
return $script." ".$ours; return $script." ".$ours;
} }

3
plugins/Meteor/js/meteorupdater.js
View File

@ -4,7 +4,7 @@ var MeteorUpdater = function()
{ {
return { return {
init: function(server, port, timeline) init: function(server, port, scheme, timeline)
{ {
Meteor.callbacks["process"] = function(data) { Meteor.callbacks["process"] = function(data) {
RealtimeUpdate.receive(JSON.parse(data)); RealtimeUpdate.receive(JSON.parse(data));
@ -12,6 +12,7 @@ var MeteorUpdater = function()
Meteor.host = server; Meteor.host = server;
Meteor.port = port; Meteor.port = port;
Meteor.scheme = scheme;
Meteor.joinChannel(timeline, 0); Meteor.joinChannel(timeline, 0);
Meteor.connect(); Meteor.connect();
} }