# HG changeset patch # User Florian Zeitz # Date 1293326425 -3600 # Node ID a70284e0145328ca1e16279cf4a67fb3096334d2 # Parent d49702971a5e669c095eee9d6fa2ea39bd9c762e mod_admin_web: Add support for calling adhoc commands diff -r d49702971a5e -r a70284e01453 mod_admin_web/admin_web/get_deps.sh --- a/mod_admin_web/admin_web/get_deps.sh Fri Dec 24 02:00:50 2010 +0100 +++ b/mod_admin_web/admin_web/get_deps.sh Sun Dec 26 02:20:25 2010 +0100 @@ -1,8 +1,7 @@ #!/bin/sh cd www_files/js -wget http://code.jquery.com/jquery-1.4.4.min.js -git clone git://github.com/metajack/strophejs.git strophejs -cd strophejs -make strophe.js && cp strophe.js ../strophe.js -cd .. -rm -rf strophejs +test -e jquery-1.4.4.min.js || wget http://code.jquery.com/jquery-1.4.4.min.js +test -e adhoc.js || wget http://cgit.babelmonkeys.de/cgit.cgi/adhocweb/plain/js/adhoc.js +test -e strophe.js || (git clone git://github.com/metajack/strophejs.git strophejs && \ + cd strophejs && make strophe.js && cp strophe.js ../strophe.js && \ + cd .. && rm -rf strophejs) diff -r d49702971a5e -r a70284e01453 mod_admin_web/admin_web/www_files/index.html --- a/mod_admin_web/admin_web/www_files/index.html Fri Dec 24 02:00:50 2010 +0100 +++ b/mod_admin_web/admin_web/www_files/index.html Sun Dec 26 02:20:25 2010 +0100 @@ -8,10 +8,17 @@ +
+

@@ -23,16 +30,10 @@
-
-
More later
+
Incomming S2S connections: diff -r d49702971a5e -r a70284e01453 mod_admin_web/admin_web/www_files/js/main.js --- a/mod_admin_web/admin_web/www_files/js/main.js Fri Dec 24 02:00:50 2010 +0100 +++ b/mod_admin_web/admin_web/www_files/js/main.js Sun Dec 26 02:20:25 2010 +0100 @@ -62,6 +62,7 @@ } else if (status == Strophe.Status.CONNECTED) { log('Strophe is connected.'); showDisconnect(); + Adhoc.checkFeatures('#adhoc', connection.domain); connection.send($iq({to: pubsubHost, type: 'set', id: connection.getUniqueId()}).c('pubsub', {xmlns: Strophe.NS.PUBSUB}) .c('subscribe', {node: Strophe.NS.S2SPUBSUB, jid: connection.jid})); connection.addHandler(_cbNewS2S, Strophe.NS.PUBSUB + '#event', 'message');