mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-10 10:28:50 +00:00
pumpio: endless loop in comment completetion should be solved. Bug when registering should be solved as well.
This commit is contained in:
parent
1f8617d372
commit
e912b1fd2e
3 changed files with 49 additions and 30 deletions
|
@ -498,11 +498,12 @@ function jappixmini_script(&$a,&$s) {
|
|||
// get nickname
|
||||
$r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
|
||||
$nickname = json_encode($r[0]["username"]);
|
||||
$groupchats = get_config('jappixmini','groupchats');
|
||||
|
||||
// add javascript to start Jappix Mini
|
||||
$a->page['htmlhead'] .= "<script type=\"text/javascript\">
|
||||
jQuery(document).ready(function() {
|
||||
jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe);
|
||||
jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe, $groupchats);
|
||||
});
|
||||
</script>";
|
||||
|
||||
|
|
|
@ -236,7 +236,7 @@ function jappixmini_addon_subscribe() {
|
|||
sendSubscribe(xid, "subscribe");
|
||||
}
|
||||
|
||||
function jappixmini_addon_start(server, username, proxy, bosh, encrypted, password, nickname, contacts, contacts_hash, autoapprove, autosubscribe) {
|
||||
function jappixmini_addon_start(server, username, proxy, bosh, encrypted, password, nickname, contacts, contacts_hash, autoapprove, autosubscribe, groupchats) {
|
||||
var handler = function(password){
|
||||
// check if settings have changed, reinitialize jappix mini if this is the case
|
||||
var settings_identifier = str_sha1(server);
|
||||
|
@ -261,6 +261,7 @@ function jappixmini_addon_start(server, username, proxy, bosh, encrypted, passwo
|
|||
HOST_BOSH = bosh;
|
||||
|
||||
// start jappix mini
|
||||
MINI_GROUPCHATS = groupchats;
|
||||
MINI_NICKNAME = nickname;
|
||||
LOCK_HOST = "off";
|
||||
launchMini(true, false, server, username, password);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue