Merge pull request #1249 from weiss:push-requirements

If an ACK timer is active while going into the 'wait_for_resume' state,
cancel that timer.

.github/ISSUE_TEMPLATE

@@ -0,0 +1,15 @@
+> What version of ejabberd are you using?
+
+
+
+> What operating system (version) are you using?
+
+
+
+> How did you install ejabberd (source, package, distribution)?
+
+
+
+> What did not work as expected? Are there error messages in the log? What
+> was the unexpected behavior? What was the expected result?
+

.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,20 @@
+We are open to contributions for ejabberd, as GitHub pull requests (PR).
+Here are a few points to consider before submitting your PR. (You can
+remove the whole text after reading.)
+
+1. Does this PR address an issue? Please reference it in the PR
+   description.
+
+2. Have you properly described the proposed change?
+
+3. Please make sure the change is atomic and does only touch the needed
+   modules. If you have other changes/fixes to provide, please submit
+   them as separate PRs.
+
+4. If your change or new feature involves storage backends, did you make
+   sure your change works with all backends?
+
+5. Do you provide tests? How can we check the behavior of the code?
+
+6. Did you consider documentation changes in the
+   processone/docs.ejabberd.im repository?

.gitignore

@@ -39,5 +39,10 @@ XmppAddr.hrl
 /vars.config
 /dialyzer/
 /test/*.beam
+/test/*.ctc
 /logs/
 /priv/sql
+/rel/ejabberd
+/_build
+/mnesiadb
+/.rebar

.travis.yml

@@ -1,19 +1,42 @@
 language: erlang
 
 otp_release:
-  - 17.4
-  - R16B03
+  - 17.5
+  - 18.3
 
 services:
   - riak
+  - redis-server
 
 before_install:
+  #
+  # We need MySQL 5.6 or newer in order to get support for FULLTEXT indexes
+  # with InnoDB. As soon as Travis ships that version, the following lines
+  # (except for the "apt-get update" call) can go away.
+  #
+  # See: https://github.com/travis-ci/travis-ci/issues/1986
+  #
+  - sudo sed -i -e s/table_cache/table_open_cache/ -e /log_slow_queries/d /etc/mysql/my.cnf
+  - sudo apt-key adv --import .travis/mysql_repo_key.asc
+  - sudo add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6'
   - sudo apt-get -qq update
+  - sudo apt-get -qq -o Dpkg::Options::=--force-confold install mysql-server-5.6
+  # /END MYSQL 5.6
+  - pip install --user coveralls-merge
 
 install:
   - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev
 
 before_script:
+  # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328
+  - echo 'ulimit -n 4096' > riak
+  - sudo mv riak /etc/default/riak
+  - mkdir "$PWD/ebin"
+  - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config
+  - sudo mv advanced.config /etc/riak/advanced.config
+  - sudo service riak restart
+  - sudo riak-admin wait-for-service riak_kv 'riak@127.0.0.1'
+  - sudo riak-admin test
   - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';"
   - mysql -u root -e "CREATE DATABASE ejabberd_test;"
   - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';"
@@ -23,16 +46,26 @@ before_script:
 
 script:
   - ./autogen.sh
-  - ./configure --enable-all --disable-odbc --disable-elixir
+  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc
+  - make
+  - make install
   - make xref
-  - ERL_LIBS=$PWD make test
+  - sed -i -e 's/ct:pal/ct:log/' test/suite.erl
+  - ln -sf ../sql priv/
+  - escript ./rebar skip_deps=true ct -v
   - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log
 
 after_script:
   - find logs -name suite.log -exec cat '{}' ';'
 
 after_failure:
+  - find logs -name exunit.log -exec cat '{}' ';'
+  # Try checking Riak database logs
+  - tail -n 100000 /var/log/riak/*.log
   - find logs -name ejabberd.log -exec cat '{}' ';'
 
+after_success:
+  - coveralls-merge erlang.json
+
 notifications:
   email: false

.travis/mysql_repo_key.asc

@@ -0,0 +1,96 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (SunOS)
+
+mQGiBD4+owwRBAC14GIfUfCyEDSIePvEW3SAFUdJBtoQHH/nJKZyQT7h9bPlUWC3
+RODjQReyCITRrdwyrKUGku2FmeVGwn2u2WmDMNABLnpprWPkBdCk96+OmSLN9brZ
+fw2vOUgCmYv2hW0hyDHuvYlQA/BThQoADgj8AW6/0Lo7V1W9/8VuHP0gQwCgvzV3
+BqOxRznNCRCRxAuAuVztHRcEAJooQK1+iSiunZMYD1WufeXfshc57S/+yeJkegNW
+hxwR9pRWVArNYJdDRT+rf2RUe3vpquKNQU/hnEIUHJRQqYHo8gTxvxXNQc7fJYLV
+K2HtkrPbP72vwsEKMYhhr0eKCbtLGfls9krjJ6sBgACyP/Vb7hiPwxh6rDZ7ITnE
+kYpXBACmWpP8NJTkamEnPCia2ZoOHODANwpUkP43I7jsDmgtobZX9qnrAXw+uNDI
+QJEXM6FSbi0LLtZciNlYsafwAPEOMDKpMqAK6IyisNtPvaLd8lH0bPAnWqcyefep
+rv0sxxqUEMcM3o7wwgfN83POkDasDbs3pjwPhxvhz6//62zQJ7Q2TXlTUUwgUmVs
+ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGkE
+ExECACkCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCUwHUZgUJGmbLywAK
+CRCMcY07UHLh9V+DAKCjS1gGwgVI/eut+5L+l2v3ybl+ZgCcD7ZoA341HtoroV3U
+6xRD09fUgeq0O015U1FMIFBhY2thZ2Ugc2lnbmluZyBrZXkgKHd3dy5teXNxbC5j
+b20pIDxidWlsZEBteXNxbC5jb20+iG8EMBECAC8FAk53Pa0oHSBidWlsZEBteXNx
+bC5jb20gd2lsbCBzdG9wIHdvcmtpbmcgc29vbgAKCRCMcY07UHLh9bU9AJ9xDK0o
+xJFL9vTl9OSZC4lX0K9AzwCcCrS9cnJyz79eaRjL0s2r/CcljdyIZQQTEQIAHQUC
+R6yUtAUJDTBYqAULBwoDBAMVAwIDFgIBAheAABIJEIxxjTtQcuH1B2VHUEcAAQGu
+kgCffz4GUEjzXkOi71VcwgCxASTgbe0An34LPr1j9fCbrXWXO14msIADfb5piEwE
+ExECAAwFAj4+o9EFgwlmALsACgkQSVDhKrJykfIk4QCfWbEeKN+3TRspe+5xKj+k
+QJSammIAnjUz0xFWPlVx0f8o38qNG1bq0cU9iEwEExECAAwFAj5CggMFgwliIokA
+CgkQtvXNTca6JD+WkQCgiGmnoGjMojynp5ppvMXkyUkfnykAoK79E6h8rwkSDZou
+iz7nMRisH8uyiEYEEBECAAYFAj+s468ACgkQr8UjSHiDdA/2lgCg21IhIMMABTYd
+p/IBiUsP/JQLiEoAnRzMywEtujQz/E9ono7H1DkebDa4iEYEEBECAAYFAj+0Q3cA
+CgkQhZavqzBzTmbGwwCdFqD1frViC7WRt8GKoOS7hzNN32kAnirlbwpnT7a6NOsQ
+83nk11a2dePhiEYEEBECAAYFAkNbs+oACgkQi9gubzC5S1x/dACdELKoXQKkwJN0
+gZztsM7kjsIgyFMAnRRMbHQ7V39XC90OIpaPjk3a01tgiEYEExECAAYFAkTxMyYA
+CgkQ9knE9GCTUwwKcQCgibak/SwhxWH1ijRhgYCo5GtM4vcAnAhtzL57wcw1Kg1X
+m7nVGetUqJ7fiEwEEBECAAwFAkGBywEFgwYi2YsACgkQGFnQH2d7oexCjQCcD8sJ
+NDc/mS8m8OGDUOx9VMWcnGkAnj1YWOD+Qhxo3mI/Ul9oEAhNkjcfiEwEEBECAAwF
+AkGByzQFgwYi2VgACgkQgcL36+ITtpIiIwCdFVNVUB8xe8mFXoPm4d9Z54PTjpMA
+niSPA/ZsfJ3oOMLKar4F0QPPrdrGiEwEEBECAAwFAkGBy2IFgwYi2SoACgkQa3Ds
+2V3D9HMJqgCbBYzr5GPXOXgP88jKzmdbjweqXeEAnRss4G2G/3qD7uhTL1SPT1SH
+jWUXiEwEEBECAAwFAkHQkyQFgwXUEWgACgkQfSXKCsEpp8JiVQCghvWvkPqowsw8
+w7WSseTcw1tflvkAni+vLHl/DqIly0LkZYn5jzK1dpvfiEwEEBECAAwFAkIrW7oF
+gwV5SNIACgkQ5hukiRXruavzEwCgkzL5QkLSypcw9LGHcFSx1ya0VL4An35nXkum
+g6cCJ1NP8r2I4NcZWIrqiEwEEhECAAwFAkAqWToFgwd6S1IACgkQPKEfNJT6+GEm
+XACcD+A53A5OGM7w750W11ukq4iZ9ckAnRMvndAqn3YTOxxlLPj2UPZiSgSqiEwE
+EhECAAwFAkA9+roFgwdmqdIACgkQ8tdcY+OcZZyy3wCgtDcwlaq20w0cNuXFLLNe
+EUaFFTwAni6RHN80moSVAdDTRkzZacJU3M5QiEwEEhECAAwFAkEOCoQFgwaWmggA
+CgkQOcor9D1qil/83QCeITZ9wIo7XAMjC6y4ZWUL4m+edZsAoMOhRIRi42fmrNFu
+vNZbnMGej81viEwEEhECAAwFAkKApTQFgwUj/1gACgkQBA3AhXyDn6jjJACcD1A4
+UtXk84J13JQyoH9+dy24714Aniwlsso/9ndICJOkqs2j5dlHFq6oiEwEExECAAwF
+Aj5NTYQFgwlXVwgACgkQLbt2v63UyTMFDACglT5G5NVKf5Mj65bFSlPzb92zk2QA
+n1uc2h19/IwwrsbIyK/9POJ+JMP7iEwEExECAAwFAkHXgHYFgwXNJBYACgkQZu/b
+yM2C/T4/vACfXe67xiSHB80wkmFZ2krb+oz/gBAAnjR2ucpbaonkQQgnC3GnBqmC
+vNaJiEwEExECAAwFAkIYgQ4FgwWMI34ACgkQdsEDHKIxbqGg7gCfQi2HcrHn+yLF
+uNlH1oSOh48ZM0oAn3hKV0uIRJphonHaUYiUP1ttWgdBiGUEExECAB0FCwcKAwQD
+FQMCAxYCAQIXgAUCS3AvygUJEPPzpwASB2VHUEcAAQEJEIxxjTtQcuH1sNsAniYp
+YBGqy/HhMnw3WE8kXahOOR5KAJ4xUmWPGYP4l3hKxyNK9OAUbpDVYIh7BDARAgA7
+BQJCdzX1NB0AT29wcy4uLiBzaG91bGQgaGF2ZSBiZWVuIGxvY2FsISBJJ20gKnNv
+KiBzdHVwaWQuLi4ACgkQOcor9D1qil/vRwCdFo08f66oKLiuEAqzlf9iDlPozEEA
+n2EgvCYLCCHjfGosrkrU3WK5NFVgiI8EMBECAE8FAkVvAL9IHQBTaG91bGQgaGF2
+ZSBiZWVuIGEgbG9jYWwgc2lnbmF0dXJlLCBvciBzb21ldGhpbmcgLSBXVEYgd2Fz
+IEkgdGhpbmtpbmc/AAoJEDnKK/Q9aopfoPsAn3BVqKOalJeF0xPSvLR90PsRlnmG
+AJ44oisY7Tl3NJbPgZal8W32fbqgbIkCIgQQAQIADAUCQYHLhQWDBiLZBwAKCRCq
+4+bOZqFEaKgvEACCErnaHGyUYa0wETjj6DLEXsqeOiXad4i9aBQxnD35GUgcFofC
+/nCY4XcnCMMEnmdQ9ofUuU3OBJ6BNJIbEusAabgLooebP/3KEaiCIiyhHYU5jarp
+ZAh+Zopgs3Oc11mQ1tIaS69iJxrGTLodkAsAJAeEUwTPq9fHFFzC1eGBysoyFWg4
+bIjz/zClI+qyTbFA5g6tRoiXTo8ko7QhY2AA5UGEg+83Hdb6akC04Z2QRErxKAqr
+phHzj8XpjVOsQAdAi/qVKQeNKROlJ+iq6+YesmcWGfzeb87dGNweVFDJIGA0qY27
+pTb2lExYjsRFN4Cb13NfodAbMTOxcAWZ7jAPCxAPlHUG++mHMrhQXEToZnBFE4nb
+nC7vOBNgWdjUgXcpkUCkop4b17BFpR+k8ZtYLSS8p2LLz4uAeCcSm2/msJxT7rC/
+FvoH8428oHincqs2ICo9zO/Ud4HmmO0O+SsZdVKIIjinGyOVWb4OOzkAlnnhEZ3o
+6hAHcREIsBgPwEYVTj/9ZdC0AO44Nj9cU7awaqgtrnwwfr/o4V2gl8bLSkltZU27
+/29HeuOeFGjlFe0YrDd/aRNsxbyb2O28H4sG1CVZmC5uK1iQBDiSyA7Q0bbdofCW
+oQzm5twlpKWnY8Oe0ub9XP5p/sVfck4FceWFHwv+/PC9RzSl33lQ6vM2wIkCIgQT
+AQIADAUCQp8KHAWDBQWacAAKCRDYwgoJWiRXzyE+D/9uc7z6fIsalfOYoLN60ajA
+bQbI/uRKBFugyZ5RoaItusn9Z2rAtn61WrFhu4uCSJtFN1ny2RERg40f56pTghKr
+D+YEt+Nze6+FKQ5AbGIdFsR/2bUk+ZZRSt83e14Lcb6ii/fJfzkoIox9ltkifQxq
+Y7Tvk4noKu4oLSc8O1Wsfc/y0B9sYUUCmUfcnq58DEmGie9ovUslmyt5NPnveXxp
+5UeaRc5Rqt9tK2B4A+7/cqENrdZJbAMSunt2+2fkYiRunAFPKPBdJBsY1sxeL/A9
+aKe0viKEXQdAWqdNZKNCi8rd/oOP99/9lMbFudAbX6nL2DSb1OG2Z7NWEqgIAzjm
+pwYYPCKeVz5Q8R+if9/fe5+STY/55OaI33fJ2H3v+U435VjYqbrerWe36xJItcJe
+qUzW71fQtXi1CTEl3w2ch7VF5oj/QyjabLnAlHgSlkSi6p7By5C2MnbCHlCfPnIi
+nPhFoRcRGPjJe9nFwGs+QblvS/Chzc2WX3s/2SWm4gEUKRX4zsAJ5ocyfa/vkxCk
+SxK/erWlCPf/J1T70+i5waXDN/E3enSet/WL7h94pQKpjz8OdGL4JSBHuAVGA+a+
+dknqnPF0KMKLhjrgV+L7O84FhbmAP7PXm3xmiMPriXf+el5fZZequQoIagf8rdRH
+HhRJxQgI0HNknkaOqs8dtrkCDQQ+PqMdEAgA7+GJfxbMdY4wslPnjH9rF4N2qfWs
+EN/lxaZoJYc3a6M02WCnHl6ahT2/tBK2w1QI4YFteR47gCvtgb6O1JHffOo2HfLm
+RDRiRjd1DTCHqeyX7CHhcghj/dNRlW2Z0l5QFEcmV9U0Vhp3aFfWC4Ujfs3LU+hk
+AWzE7zaD5cH9J7yv/6xuZVw411x0h4UqsTcWMu0iM1BzELqX1DY7LwoPEb/O9Rkb
+f4fmLe11EzIaCa4PqARXQZc4dhSinMt6K3X4BrRsKTfozBu74F47D8Ilbf5vSYHb
+uE5p/1oIDznkg/p8kW+3FxuWrycciqFTcNz215yyX39LXFnlLzKUb/F5GwADBQf+
+Lwqqa8CGrRfsOAJxim63CHfty5mUc5rUSnTslGYEIOCR1BeQauyPZbPDsDD9MZ1Z
+aSafanFvwFG6Llx9xkU7tzq+vKLoWkm4u5xf3vn55VjnSd1aQ9eQnUcXiL4cnBGo
+TbOWI39EcyzgslzBdC++MPjcQTcA7p6JUVsP6oAB3FQWg54tuUo0Ec8bsM8b3Ev4
+2LmuQT5NdKHGwHsXTPtl0klk4bQk4OajHsiy1BMahpT27jWjJlMiJc+IWJ0mghkK
+Ht926s/ymfdf5HkdQ1cyvsz5tryVI3Fx78XeSYfQvuuwqp2H139pXGEkg0n6KdUO
+etdZWhe70YGNPw1yjWJT1IhUBBgRAgAMBQJOdz3tBQkT+wG4ABIHZUdQRwABAQkQ
+jHGNO1By4fUUmwCbBYr2+bBEn/L2BOcnw9Z/QFWuhRMAoKVgCFm5fadQ3Afi+UQl
+AcOphrnJ
+=443I
+-----END PGP PUBLIC KEY BLOCK-----

Makefile.in

@@ -17,6 +17,9 @@ BINDIR = $(DESTDIR)@bindir@
 # /sbin/
 SBINDIR = $(DESTDIR)@sbindir@
 
+# /lib/
+LIBDIR =  $(DESTDIR)@libdir@
+
 # /lib/ejabberd/
 EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
 
@@ -101,21 +104,73 @@ xref: all
 translations:
 	contrib/extract_translations/prepare-translation.sh -updateall
 
-doc:
-	echo making $$target in doc; \
-	(cd doc && $(MAKE) $$target) || exit 1
-
 edoc:
 	$(ERL) -noinput +B -eval \
         'case edoc:application(ejabberd, ".", []) of ok -> halt(0); error -> halt(1) end.'
 
 spec:
 	$(ERL) -noinput +B -pa ebin -pa deps/*/ebin -eval \
-	'case xml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
+	'case fxml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
 
-DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so)
+JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))
 
-install: all
+VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
+
+ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
+DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
+MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
+TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
+TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
+
+FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
+FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
+
+ifeq ($(MAKECMDGOALS),copy-files-sub)
+
+DEPS:=$(sort $(shell $(REBAR) list-deps|$(SED) -e '/^=/d;s/ .*//'))
+
+DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
+DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES))
+DEPS_DIRS=$(sort deps/ $(foreach DEP,$(DEPS),deps/$(DEP)/) $(dir $(DEPS_FILES)))
+
+MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/*.app priv/msgs/*.msg priv/lib/* include/*.hrl))
+MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
+
+define DEP_VERSION_template
+DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
+endef
+
+$(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),deps/$(DEP)/ebin/$(DEP).app)))
+$(eval $(call DEP_VERSION_template,ejabberd,ebin/ejabberd.app))
+
+define COPY_template
+$(call TO_DEST,$(1)): $(1) $(call TO_DEST,$(dir $(1))) ; $$(INSTALL) -m 644 $(1) $(call TO_DEST,$(1))
+endef
+
+$(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,$(file))))
+
+$(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
+	$(INSTALL) -d $@
+
+$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/)
+	$(INSTALL) -m 750 $(O_USER) $< $@
+
+$(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
+	$(INSTALL) -m 644 $< $@
+
+$(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
+	$(INSTALL) -m 750 $(O_USER) $< $@
+
+copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
+
+endif
+
+copy-files:
+	$(MAKE) copy-files-sub
+
+copy-files-sub: copy-files-sub2
+
+install: all copy-files
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
@@ -129,7 +184,8 @@ install: all
 		-e "s*{{sysconfdir}}*@sysconfdir@*" \
 		-e "s*{{localstatedir}}*@localstatedir@*" \
 		-e "s*{{docdir}}*@docdir@*" \
-		-e "s*{{erl}}*@ERL@*" ejabberdctl.template \
+		-e "s*{{erl}}*@ERL@*" \
+		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
 		> ejabberdctl.example
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
@@ -141,9 +197,9 @@ install: all
 	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
 	# Elixir binaries
 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-	-[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex
-	-[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir
-	-[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix
+	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
+	[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
+	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
 	#
 	# Init script
 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
@@ -151,44 +207,6 @@ install: all
 		> ejabberd.init
 	chmod 755 ejabberd.init
 	#
-	# Binary Erlang files
-	$(INSTALL) -d $(BEAMDIR)
-	$(INSTALL) -m 644 ebin/*.app $(BEAMDIR)
-	$(INSTALL) -m 644 ebin/*.beam $(BEAMDIR)
-	$(INSTALL) -m 644 deps/*/ebin/*.app $(BEAMDIR)
-	$(INSTALL) -m 644 deps/*/ebin/*.beam $(BEAMDIR)
-	# Install Elixir and Elixir dependancies
-	-$(INSTALL) -m 644 deps/*/lib/*/ebin/*.app $(BEAMDIR)
-	-$(INSTALL) -m 644 deps/*/lib/*/ebin/*.beam $(BEAMDIR)
-	rm -f $(BEAMDIR)/configure.beam
-	#
-	# ejabberd header files
-	$(INSTALL) -d $(INCLUDEDIR)
-	$(INSTALL) -m 644 include/*.hrl $(INCLUDEDIR)
-	$(INSTALL) -m 644 deps/*/include/*.hrl $(INCLUDEDIR)
-	#
-	# Binary C programs
-	$(INSTALL) -d $(PBINDIR)
-	$(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR)
-	$(INSTALL) -m 750 $(O_USER) tools/joincluster $(PBINDIR)
-	$(INSTALL) -m 750 $(O_USER) tools/leavecluster $(PBINDIR)
-	-[ -f deps/p1_pam/priv/bin/epam ] \
-		&& $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR)
-	#
-	# Binary system libraries
-	$(INSTALL) -d $(SODIR)
-	$(INSTALL) -m 644 $(DLLs) $(SODIR)
-	-[ -f $(SODIR)/jiffy.so ] && (cd $(PRIVDIR); ln -s lib/jiffy.so; true)
-	-[ -f $(SODIR)/sqlite3_drv.so ] && (cd $(PRIVDIR); ln -s lib/sqlite3_drv.so; true)
-	#
-	# Translated strings
-	$(INSTALL) -d $(MSGSDIR)
-	$(INSTALL) -m 644 priv/msgs/*.msg $(MSGSDIR)
-	#
-	# Copy lite.sql
-	-[ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR)
-	-[ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR)
-	#
 	# Spool directory
 	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
 	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
@@ -207,16 +225,9 @@ install: all
 	#
 	# Documentation
 	$(INSTALL) -d $(DOCDIR)
-	[ -f doc/dev.html ] \
-		&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \
-		|| echo "No doc/dev.html was built"
 	[ -f doc/guide.html ] \
 		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
-		|| echo "No doc/guide.html was built"
-	[ -f doc/guide.pdf ] \
-		&& $(INSTALL) -m 644 doc/guide.pdf $(DOCDIR) \
-		|| echo "No doc/guide.pdf was built"
-	$(INSTALL) -m 644 doc/*.png $(DOCDIR)
+		|| echo "Documentation not included in sources"
 	$(INSTALL) -m 644 COPYING $(DOCDIR)
 
 uninstall: uninstall-binary
@@ -326,6 +337,6 @@ test:
 quicktest:
 	$(REBAR) skip_deps=true ct suites=elixir
 
-.PHONY: src doc edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
+.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
 	install uninstall uninstall-binary uninstall-all translations deps test spec \
 	quicktest erlang_plt deps_plt ejabberd_plt

Makefile.win32

@@ -1,176 +0,0 @@
-
-include Makefile.inc
-
-ALL : build
-
-REL=..\release
-EREL=$(REL)\ejabberd-$(EJABBERD_VERSION)
-EBIN_DIR=$(EREL)\ebin
-SRC_DIR=$(EREL)\src
-PRIV_DIR=$(EREL)\priv
-SO_DIR=$(EREL)
-MSGS_DIR=$(EREL)\msgs
-WIN32_DIR=$(EREL)\win32
-DOC_DIR=$(EREL)\doc
-
-NSIS_SCRIPT=win32\ejabberd.nsi
-NSIS_HEADER=win32\ejabberd.nsh
-
-installer : $(NSIS_SCRIPT) $(NSIS_HEADER)
-	makensis $(NSIS_SCRIPT)
-
-$(NSIS_HEADER) : Makefile.inc
-	echo !define OUTFILEDIR "..\$(REL)" >$(NSIS_HEADER)
-	echo !define TESTDIR "..\$(REL)\ejabberd-$(EJABBERD_VERSION)" >>$(NSIS_HEADER)
-	echo !define VERSION "$(EJABBERD_VERSION)" >>$(NSIS_HEADER)
-
-release_clean :
-	if exist $(REL) rd /s /q $(REL)
-
-
-release : build release_clean
-	mkdir $(REL)
-	mkdir $(EREL)
-	mkdir $(EBIN_DIR)
-	copy *.beam $(EBIN_DIR)
-	@erase $(EBIN_DIR)\configure.beam
-	copy *.app $(EBIN_DIR)
-	copy *.dll $(SO_DIR)
-	mkdir $(MSGS_DIR)
-	copy msgs\*.msg $(MSGS_DIR)
-	mkdir $(WIN32_DIR)
-	copy win32\ejabberd.cfg $(EREL)
-	copy win32\inetrc $(EREL)
-	copy $(SYSTEMROOT)\system32\libeay32.dll $(EREL)
-	copy $(SYSTEMROOT)\system32\ssleay32.dll $(EREL)
-	copy win32\ejabberd.ico $(WIN32_DIR)
-	mkdir $(SRC_DIR)
-	copy *.app $(SRC_DIR)
-	copy *.erl $(SRC_DIR)
-	copy *.hrl $(SRC_DIR)
-	copy *.c $(SRC_DIR)
-	mkdir $(SRC_DIR)\eldap
-	copy eldap\eldap.* $(SRC_DIR)\eldap
-	copy eldap\ELDAPv3.asn $(SRC_DIR)\eldap
-	mkdir $(SRC_DIR)\mod_irc
-	copy mod_irc\*.erl $(SRC_DIR)\mod_irc
-	copy mod_irc\*.c $(SRC_DIR)\mod_irc
-	mkdir $(SRC_DIR)\mod_muc
-	copy mod_muc\*.erl $(SRC_DIR)\mod_muc
-	mkdir $(SRC_DIR)\mod_pubsub
-	copy mod_pubsub\*.erl $(SRC_DIR)\mod_pubsub
-	mkdir $(SRC_DIR)\mod_proxy65
-	copy mod_proxy65\*.erl $(SRC_DIR)\mod_proxy65
-	copy mod_proxy65\*.hrl $(SRC_DIR)\mod_proxy65
-	mkdir $(SRC_DIR)\stringprep
-	copy stringprep\*.erl $(SRC_DIR)\stringprep
-	copy stringprep\*.c $(SRC_DIR)\stringprep
-	copy stringprep\*.tcl $(SRC_DIR)\stringprep
-	mkdir $(SRC_DIR)\stun
-	copy stun\*.erl $(SRC_DIR)\stun
-	copy stun\*.hrl $(SRC_DIR)\stun
-	mkdir $(SRC_DIR)\tls
-	copy tls\*.erl $(SRC_DIR)\tls
-	copy tls\*.c $(SRC_DIR)\tls
-	mkdir $(SRC_DIR)\ejabberd_zlib
-	copy ejabberd_zlib\*.erl $(SRC_DIR)\ejabberd_zlib
-	copy ejabberd_zlib\*.c $(SRC_DIR)\ejabberd_zlib
-	mkdir $(SRC_DIR)\web
-	copy web\*.erl $(SRC_DIR)\web
-	mkdir $(SRC_DIR)\odbc
-	copy odbc\*.erl $(SRC_DIR)\odbc
-	copy odbc\*.sql $(EREL)
-	mkdir $(DOC_DIR)
-	copy ..\doc\*.txt $(DOC_DIR)
-	copy ..\doc\*.html $(DOC_DIR)
-	copy ..\doc\*.png $(DOC_DIR)
-
-SOURCE = expat_erl.c
-OBJECT = expat_erl.o
-DLL    = expat_erl.dll
-
-build : $(DLL) compile-beam all-recursive
-
-all-recursive :
-	cd eldap
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_irc
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_muc
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_pubsub
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_proxy65
-	nmake -nologo -f Makefile.win32
-	cd ..\stringprep
-	nmake -nologo -f Makefile.win32
-	cd ..\stun
-	nmake -nologo -f Makefile.win32
-	cd ..\tls
-	nmake -nologo -f Makefile.win32
-	cd ..\ejabberd_zlib
-	nmake -nologo -f Makefile.win32
-	cd ..\web
-	nmake -nologo -f Makefile.win32
-	cd ..\odbc
-	nmake -nologo -f Makefile.win32
-	cd ..
-
-compile-beam : XmppAddr.hrl
-	erl -s make all report -noinput -s erlang halt
-
-XmppAddr.hrl : XmppAddr.asn1
-	erlc -bber_bin +der +compact_bit_string +optimize +noobj XmppAddr.asn1
-
-CLEAN : clean-recursive clean-local
-
-clean-local :
-	-@erase $(OBJECT)
-	-@erase $(DLL)
-	-@erase expat_erl.exp
-	-@erase expat_erl.lib
-	-@erase *.beam
-	-@erase XmppAddr.asn1db
-	-@erase XmppAddr.erl
-	-@erase XmppAddr.hrl
-
-clean-recursive :
-	cd eldap
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_irc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_muc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_pubsub
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_proxy65
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\stringprep
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\stun
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\tls
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\ejabberd_zlib
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\web
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\odbc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..
-
-distclean : release_clean clean
-	-@erase $(NSIS_HEADER)
-	-@erase Makefile.inc
-
-CC=cl.exe
-CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT $(EXPAT_FLAG) -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" -I"$(EXPAT_DIR)\source\lib"
-
-LD=link.exe
-LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(EXPAT_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
-
-$(DLL) : $(OBJECT)
-	$(LD) $(LD_FLAGS) -out:$@ $<
-
-$(OBJECT) : $(SOURCE)
-	$(CC) $(CC_FLAGS) -c -Fo$@ $<

README

@@ -1,5 +1,7 @@
-ejabberd Community Edition [![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd)
-=========================================
+ejabberd Community Edition 
+==========================
+
+[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd) [![Hex version](https://img.shields.io/hexpm/v/ejabberd.svg "Hex version")](https://hex.pm/packages/ejabberd)
 
 ejabberd is a distributed, fault-tolerant technology that allows the creation
 of large-scale instant messaging applications. The server can reliably support
@@ -106,8 +108,8 @@ To compile ejabberd you need:
  - GCC.
  - Libexpat 1.95 or higher.
  - Libyaml 0.1.4 or higher.
- - Erlang/OTP R16B03 or higher.
- - OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
+ - Erlang/OTP 17.1 or higher.
+ - OpenSSL 1.0.0 or higher, for STARTTLS, SASL and SSL encryption.
  - Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional.
  - PAM library. Optional. For Pluggable Authentication Modules (PAM).
  - GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not
@@ -152,6 +154,18 @@ Operation Guide available online and in the `doc` directory of the source
 tarball.
 
 
+Development
+-----------
+
+In order to assist in the development of ejabberd, and particularly the
+execution of the test suite, a Vagrant environment is available at
+https://github.com/processone/ejabberd-vagrant-dev.
+
+To start ejabberd in development mode from the repository directory, you can
+type a command like:
+
+    EJABBERD_CONFIG_PATH=ejabberd.yml erl -pa ebin -pa deps/*/ebin -pa test -pa deps/elixir/lib/*/ebin/ -s ejabberd
+
 Links
 -----
 

config/config.exs

@@ -0,0 +1,10 @@
+use Mix.Config
+
+# This is standard path in the context of ejabberd release
+config :ejabberd,
+  file: "config/ejabberd.yml",
+  log_path: 'log/ejabberd.log'
+
+# Customize Mnesia directory:
+config :mnesia,
+  dir: 'mnesiadb/'

config/ejabberd.exs

@@ -0,0 +1,169 @@
+defmodule Ejabberd.ConfigFile do
+  use Ejabberd.Config
+
+  def start do
+    [loglevel: 4,
+     log_rotate_size: 10485760,
+     log_rotate_date: "",
+     log_rotate_count: 1,
+     log_rate_limit: 100,
+     auth_method: :internal,
+     max_fsm_queue: 1000,
+     language: "en",
+     allow_contrib_modules: true,
+     hosts: ["localhost"],
+     shaper: shaper,
+     acl: acl,
+     access: access]
+  end
+
+  defp shaper do
+    [normal: 1000,
+      fast: 50000,
+      max_fsm_queue: 1000]
+  end
+
+  defp acl do
+    [local:
+      [user_regexp: "", loopback: [ip: "127.0.0.0/8"]]]
+  end
+
+  defp access do
+    [max_user_sessions: [all: 10],
+     max_user_offline_messages: [admin: 5000, all: 100],
+     local: [local: :allow],
+     c2s: [blocked: :deny, all: :allow],
+     c2s_shaper: [admin: :none, all: :normal],
+     s2s_shaper: [all: :fast],
+     announce: [admin: :allow],
+     configure: [admin: :allow],
+     muc_admin: [admin: :allow],
+     muc_create: [local: :allow],
+     muc: [all: :allow],
+     pubsub_createnode: [local: :allow],
+     register: [all: :allow],
+     trusted_network: [loopback: :allow]]
+  end
+
+  listen :ejabberd_c2s do
+    @opts [
+      port: 5222,
+      max_stanza_size: 65536,
+      shaper: :c2s_shaper,
+      access: :c2s]
+  end
+
+  listen :ejabberd_s2s_in do
+    @opts [port: 5269]
+  end
+
+  listen :ejabberd_http do
+    @opts [
+      port: 5280,
+      web_admin: true,
+      http_poll: true,
+      http_bind: true,
+      captcha: true]
+  end
+
+  module :mod_adhoc do
+  end
+
+  module :mod_announce do
+    @opts [access: :announce]
+  end
+
+  module :mod_blocking do
+  end
+
+  module :mod_caps do
+  end
+
+  module :mod_carboncopy do
+  end
+
+  module :mod_client_state do
+    @opts [
+      drop_chat_states: true,
+      queue_presence: false]
+  end
+
+  module :mod_configure do
+  end
+
+  module :mod_disco do
+  end
+
+  module :mod_irc do
+  end
+
+  module :mod_http_bind do
+  end
+
+  module :mod_last do
+  end
+
+  module :mod_muc do
+    @opts [
+      access: :muc,
+      access_create: :muc_create,
+      access_persistent: :muc_create,
+      access_admin: :muc_admin]
+  end
+
+  module :mod_offline do
+    @opts [access_max_user_messages: :max_user_offline_messages]
+  end
+
+  module :mod_ping do
+  end
+
+  module :mod_privacy do
+  end
+
+  module :mod_private do
+  end
+
+  module :mod_pubsub do
+    @opts [
+      access_createnode: :pubsub_createnode,
+      ignore_pep_from_offline: true,
+      last_item_cache: true,
+      plugins: ["flat", "hometree", "pep"]]
+  end
+
+  module :mod_register do
+    @opts [welcome_message: [
+      subject: "Welcome!",
+      body: "Hi.\nWelcome to this XMPP Server",
+      ip_access: :trusted_network,
+      access: :register]]
+  end
+
+  module :mod_roster do
+  end
+
+  module :mod_shared_roster do
+  end
+
+  module :mod_stats do
+  end
+
+  module :mod_time do
+  end
+
+  module :mod_version do
+  end
+
+  # Example of how to define a hook, called when the event
+  # specified is triggered.
+  #
+  # @event: Name of the event
+  # @opts: Params are optional. Available: :host and :priority.
+  #        If missing, defaults are used. (host: :global | priority: 50)
+  # @callback Could be an anonymous function or a callback from a module,
+  #           use the &ModuleName.function/arity format for that.
+  hook :register_user, [host: "localhost"], fn(user, server) ->
+    info("User registered: #{user} on #{server}")
+  end
+end

config/ejabberd.yml

@@ -0,0 +1,667 @@
+###
+###               ejabberd configuration file
+###
+###
+
+### The parameters used in this configuration file are explained in more detail
+### in the ejabberd Installation and Operation Guide.
+### Please consult the Guide in case of doubts, it is included with
+### your copy of ejabberd, and is also available online at
+### http://www.process-one.net/en/ejabberd/docs/
+
+### The configuration file is written in YAML.
+### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
+### However, ejabberd treats different literals as different types:
+###
+### - unquoted or single-quoted strings. They are called "atoms".
+###   Example: dog, 'Jupiter', '3.14159', YELLOW
+###
+### - numeric literals. Example: 3, -45.0, .0
+###
+### - quoted or folded strings.
+###   Examples of quoted string: "Lizzard", "orange".
+###   Example of folded string:
+###   > Art thou not Romeo,
+###     and a Montague?
+
+###   =======
+###   LOGGING
+
+##
+## loglevel: Verbosity of log files generated by ejabberd.
+## 0: No ejabberd log at all (not recommended)
+## 1: Critical
+## 2: Error
+## 3: Warning
+## 4: Info
+## 5: Debug
+##
+loglevel: 4
+
+##
+## rotation: Describe how to rotate logs. Either size and/or date can trigger
+## log rotation. Setting count to N keeps N rotated logs. Setting count to 0
+## does not disable rotation, it instead rotates the file and keeps no previous
+## versions around. Setting size to X rotate log when it reaches X bytes.
+## To disable rotation set the size to 0 and the date to ""
+## Date syntax is taken from the syntax newsyslog uses in newsyslog.conf.
+## Some examples:
+##  $D0     rotate every night at midnight
+##  $D23    rotate every day at 23:00 hr
+##  $W0D23  rotate every week on Sunday at 23:00 hr
+##  $W5D16  rotate every week on Friday at 16:00 hr
+##  $M1D0   rotate on the first day of every month at midnight
+##  $M5D6   rotate on every 5th day of the month at 6:00 hr
+##
+log_rotate_size: 10485760
+log_rotate_date: ""
+log_rotate_count: 1
+
+##
+## overload protection: If you want to limit the number of messages per second
+## allowed from error_logger, which is a good idea if you want to avoid a flood
+## of messages when system is overloaded, you can set a limit.
+## 100 is ejabberd's default.
+log_rate_limit: 100
+
+##
+## watchdog_admins: Only useful for developers: if an ejabberd process
+## consumes a lot of memory, send live notifications to these XMPP
+## accounts.
+##
+## watchdog_admins:
+##   - "bob@example.com"
+
+
+###   ================
+###   SERVED HOSTNAMES
+
+##
+## hosts: Domains served by ejabberd.
+## You can define one or several, for example:
+## hosts:
+##   - "example.net"
+##   - "example.com"
+##   - "example.org"
+##
+hosts:
+  - "localhost"
+
+##
+## route_subdomains: Delegate subdomains to other XMPP servers.
+## For example, if this ejabberd serves example.org and you want
+## to allow communication with an XMPP server called im.example.org.
+##
+## route_subdomains: s2s
+
+###   ===============
+###   LISTENING PORTS
+
+##
+## listen: The ports ejabberd will listen on, which service each is handled
+## by and what options to start it with.
+##
+listen:
+  -
+    port: 5222
+    module: ejabberd_c2s
+    ##
+    ## If TLS is compiled in and you installed a SSL
+    ## certificate, specify the full path to the
+    ## file and uncomment these lines:
+    ##
+    ## certfile: "/path/to/ssl.pem"
+    ## starttls: true
+    ##
+    ## To enforce TLS encryption for client connections,
+    ## use this instead of the "starttls" option:
+    ##
+    ## starttls_required: true
+    ##
+    ## Custom OpenSSL options
+    ##
+    ## protocol_options:
+    ##   - "no_sslv3"
+    ##   - "no_tlsv1"
+    max_stanza_size: 65536
+    shaper: c2s_shaper
+    access: c2s
+  -
+    port: 5269
+    module: ejabberd_s2s_in
+  ##
+  ## ejabberd_service: Interact with external components (transports, ...)
+  ##
+  ## -
+  ##   port: 8888
+  ##   module: ejabberd_service
+  ##   access: all
+  ##   shaper_rule: fast
+  ##   ip: "127.0.0.1"
+  ##   hosts:
+  ##     "icq.example.org":
+  ##       password: "secret"
+  ##     "sms.example.org":
+  ##       password: "secret"
+
+  ##
+  ## ejabberd_stun: Handles STUN Binding requests
+  ##
+  ## -
+  ##   port: 3478
+  ##   transport: udp
+  ##   module: ejabberd_stun
+
+  ##
+  ## To handle XML-RPC requests that provide admin credentials:
+  ##
+  ## -
+  ##   port: 4560
+  ##   module: ejabberd_xmlrpc
+  -
+    port: 5280
+    module: ejabberd_http
+    ## request_handlers:
+    ##   "/pub/archive": mod_http_fileserver
+    web_admin: true
+    http_poll: true
+    http_bind: true
+    ## register: true
+    captcha: true
+
+##
+## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
+## Allowed values are: false optional required required_trusted
+## You must specify a certificate file.
+##
+## s2s_use_starttls: optional
+
+##
+## s2s_certfile: Specify a certificate file.
+##
+## s2s_certfile: "/path/to/ssl.pem"
+
+## Custom OpenSSL options
+##
+## s2s_protocol_options:
+##   - "no_sslv3"
+##   - "no_tlsv1"
+
+##
+## domain_certfile: Specify a different certificate for each served hostname.
+##
+## host_config:
+##   "example.org":
+##     domain_certfile: "/path/to/example_org.pem"
+##   "example.com":
+##     domain_certfile: "/path/to/example_com.pem"
+
+##
+## S2S whitelist or blacklist
+##
+## Default s2s policy for undefined hosts.
+##
+## s2s_access: s2s
+
+##
+## Outgoing S2S options
+##
+## Preferred address families (which to try first) and connect timeout
+## in milliseconds.
+##
+## outgoing_s2s_families:
+##   - ipv4
+##   - ipv6
+## outgoing_s2s_timeout: 10000
+
+###   ==============
+###   AUTHENTICATION
+
+##
+## auth_method: Method used to authenticate the users.
+## The default method is the internal.
+## If you want to use a different method,
+## comment this line and enable the correct ones.
+##
+auth_method: internal
+
+##
+## Store the plain passwords or hashed for SCRAM:
+## auth_password_format: plain
+## auth_password_format: scram
+##
+## Define the FQDN if ejabberd doesn't detect it:
+## fqdn: "server3.example.com"
+
+##
+## Authentication using external script
+## Make sure the script is executable by ejabberd.
+##
+## auth_method: external
+## extauth_program: "/path/to/authentication/script"
+
+##
+## Authentication using ODBC
+## Remember to setup a database in the next section.
+##
+## auth_method: odbc
+
+##
+## Authentication using PAM
+##
+## auth_method: pam
+## pam_service: "pamservicename"
+
+##
+## Authentication using LDAP
+##
+## auth_method: ldap
+##
+## List of LDAP servers:
+## ldap_servers:
+##   - "localhost"
+##
+## Encryption of connection to LDAP servers:
+## ldap_encrypt: none
+## ldap_encrypt: tls
+##
+## Port to connect to on LDAP servers:
+## ldap_port: 389
+## ldap_port: 636
+##
+## LDAP manager:
+## ldap_rootdn: "dc=example,dc=com"
+##
+## Password of LDAP manager:
+## ldap_password: "******"
+##
+## Search base of LDAP directory:
+## ldap_base: "dc=example,dc=com"
+##
+## LDAP attribute that holds user ID:
+## ldap_uids:
+##   - "mail": "%u@mail.example.org"
+##
+## LDAP filter:
+## ldap_filter: "(objectClass=shadowAccount)"
+
+##
+## Anonymous login support:
+##   auth_method: anonymous
+##   anonymous_protocol: sasl_anon | login_anon | both
+##   allow_multiple_connections: true | false
+##
+## host_config:
+##   "public.example.org":
+##     auth_method: anonymous
+##     allow_multiple_connections: false
+##     anonymous_protocol: sasl_anon
+##
+## To use both anonymous and internal authentication:
+##
+## host_config:
+##   "public.example.org":
+##     auth_method:
+##       - internal
+##       - anonymous
+
+###   ==============
+###   DATABASE SETUP
+
+## ejabberd by default uses the internal Mnesia database,
+## so you do not necessarily need this section.
+## This section provides configuration examples in case
+## you want to use other database backends.
+## Please consult the ejabberd Guide for details on database creation.
+
+##
+## MySQL server:
+##
+## odbc_type: mysql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+
+##
+## PostgreSQL server:
+##
+## odbc_type: pgsql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+##
+## If you use PostgreSQL, have a large database, and need a
+## faster but inexact replacement for "select count(*) from users"
+##
+## pgsql_users_number_estimate: true
+
+##
+## ODBC compatible or MSSQL server:
+##
+## odbc_type: odbc
+## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
+
+##
+## Number of connections to open to the database for each virtual host
+##
+## odbc_pool_size: 10
+
+##
+## Interval to make a dummy SQL request to keep the connections to the
+## database alive. Specify in seconds: for example 28800 means 8 hours
+##
+## odbc_keepalive_interval: undefined
+
+###   ===============
+###   TRAFFIC SHAPERS
+
+shaper:
+  ##
+  ## The "normal" shaper limits traffic speed to 1000 B/s
+  ##
+  normal: 1000
+
+  ##
+  ## The "fast" shaper limits traffic speed to 50000 B/s
+  ##
+  fast: 50000
+
+##
+## This option specifies the maximum number of elements in the queue
+## of the FSM. Refer to the documentation for details.
+##
+max_fsm_queue: 1000
+
+###.   ====================
+###'   ACCESS CONTROL LISTS
+acl:
+  ##
+  ## The 'admin' ACL grants administrative privileges to XMPP accounts.
+  ## You can put here as many accounts as you want.
+  ##
+  ## admin:
+  ##   user:
+  ##     - "aleksey": "localhost"
+  ##     - "ermine": "example.org"
+  ##
+  ## Blocked users
+  ##
+  ## blocked:
+  ##   user:
+  ##     - "baduser": "example.org"
+  ##     - "test"
+
+  ## Local users: don't modify this.
+  ##
+  local:
+    user_regexp: ""
+
+  ##
+  ## More examples of ACLs
+  ##
+  ## jabberorg:
+  ##   server:
+  ##     - "jabber.org"
+  ## aleksey:
+  ##   user:
+  ##     - "aleksey": "jabber.ru"
+  ## test:
+  ##   user_regexp: "^test"
+  ##   user_glob: "test*"
+
+  ##
+  ## Loopback network
+  ##
+  loopback:
+    ip:
+      - "127.0.0.0/8"
+
+  ##
+  ## Bad XMPP servers
+  ##
+  ## bad_servers:
+  ##   server:
+  ##     - "xmpp.zombie.org"
+  ##     - "xmpp.spam.com"
+
+##
+## Define specific ACLs in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     acl:
+##       admin:
+##         user:
+##           - "bob-local": "localhost"
+
+###   ============
+###   ACCESS RULES
+access:
+  ## Maximum number of simultaneous sessions allowed for a single user:
+  max_user_sessions:
+    all: 10
+  ## Maximum number of offline messages that users can have:
+  max_user_offline_messages:
+    admin: 5000
+    all: 100
+  ## This rule allows access only for local users:
+  local:
+    local: allow
+  ## Only non-blocked users can use c2s connections:
+  c2s:
+    blocked: deny
+    all: allow
+  ## For C2S connections, all users except admins use the "normal" shaper
+  c2s_shaper:
+    admin: none
+    all: normal
+  ## All S2S connections use the "fast" shaper
+  s2s_shaper:
+    all: fast
+  ## Only admins can send announcement messages:
+  announce:
+    admin: allow
+  ## Only admins can use the configuration interface:
+  configure:
+    admin: allow
+  ## Admins of this server are also admins of the MUC service:
+  muc_admin:
+    admin: allow
+  ## Only accounts of the local ejabberd server can create rooms:
+  muc_create:
+    local: allow
+  ## All users are allowed to use the MUC service:
+  muc:
+    all: allow
+  ## Only accounts on the local ejabberd server can create Pubsub nodes:
+  pubsub_createnode:
+    local: allow
+  ## In-band registration allows registration of any possible username.
+  ## To disable in-band registration, replace 'allow' with 'deny'.
+  register:
+    all: allow
+  ## Only allow to register from localhost
+  trusted_network:
+    loopback: allow
+  ## Do not establish S2S connections with bad servers
+  ## s2s:
+  ##   bad_servers: deny
+  ##   all: allow
+
+## By default the frequency of account registrations from the same IP
+## is limited to 1 account every 10 minutes. To disable, specify: infinity
+## registration_timeout: 600
+
+##
+## Define specific Access Rules in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     access:
+##       c2s:
+##         admin: allow
+##         all: deny
+##       register:
+##         all: deny
+
+###   ================
+###   DEFAULT LANGUAGE
+
+##
+## language: Default language used for server messages.
+##
+language: "en"
+
+##
+## Set a different default language in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     language: "ru"
+
+###   =======
+###   CAPTCHA
+
+##
+## Full path to a script that generates the image.
+##
+## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
+
+##
+## Host for the URL and port where ejabberd listens for CAPTCHA requests.
+##
+## captcha_host: "example.org:5280"
+
+##
+## Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
+##
+## captcha_limit: 5
+
+###   =======
+###   MODULES
+
+##
+## Modules enabled in all ejabberd virtual hosts.
+##
+modules:
+  mod_adhoc: {}
+  ## mod_admin_extra: {}
+  mod_announce: # recommends mod_adhoc
+    access: announce
+  mod_blocking: {} # requires mod_privacy
+  mod_caps: {}
+  mod_carboncopy: {}
+  mod_client_state:
+    drop_chat_states: true
+    queue_presence: false
+  mod_configure: {} # requires mod_adhoc
+  mod_disco: {}
+  ## mod_echo: {}
+  mod_irc: {}
+  mod_http_bind: {}
+  ## mod_http_fileserver:
+  ##   docroot: "/var/www"
+  ##   accesslog: "/var/log/ejabberd/access.log"
+  mod_last: {}
+  mod_muc:
+    ## host: "conference.@HOST@"
+    access: muc
+    access_create: muc_create
+    access_persistent: muc_create
+    access_admin: muc_admin
+  ## mod_muc_log: {}
+  mod_offline:
+    access_max_user_messages: max_user_offline_messages
+  mod_ping: {}
+  ## mod_pres_counter:
+  ##   count: 5
+  ##   interval: 60
+  mod_privacy: {}
+  mod_private: {}
+  ## mod_proxy65: {}
+  mod_pubsub:
+    access_createnode: pubsub_createnode
+    ## reduces resource comsumption, but XEP incompliant
+    ignore_pep_from_offline: true
+    ## XEP compliant, but increases resource comsumption
+    ## ignore_pep_from_offline: false
+    last_item_cache: false
+    plugins:
+      - "flat"
+      - "hometree"
+      - "pep" # pep requires mod_caps
+  mod_register:
+    ##
+    ## Protect In-Band account registrations with CAPTCHA.
+    ##
+    ## captcha_protected: true
+
+    ##
+    ## Set the minimum informational entropy for passwords.
+    ##
+    ## password_strength: 32
+
+    ##
+    ## After successful registration, the user receives
+    ## a message with this subject and body.
+    ##
+    welcome_message:
+      subject: "Welcome!"
+      body: |-
+        Hi.
+        Welcome to this XMPP server.
+
+    ##
+    ## When a user registers, send a notification to
+    ## these XMPP accounts.
+    ##
+    ## registration_watchers:
+    ##   - "admin1@example.org"
+
+    ##
+    ## Only clients in the server machine can register accounts
+    ##
+    ip_access: trusted_network
+
+    ##
+    ## Local c2s or remote s2s users cannot register accounts
+    ##
+    ## access_from: deny
+
+    access: register
+  mod_roster: {}
+  mod_shared_roster: {}
+  mod_stats: {}
+  mod_time: {}
+  mod_vcard: {}
+  mod_version: {}
+
+##
+## Enable modules with custom options in a specific virtual host
+##
+## host_config:
+##   "localhost":
+##     modules:
+##       mod_echo:
+##         host: "mirror.localhost"
+
+##
+## Enable modules management via ejabberdctl for installation and
+## uninstallation of public/private contributed modules
+## (enabled by default)
+##
+
+allow_contrib_modules: true
+
+### Local Variables:
+### mode: yaml
+### End:
+### vim: set filetype=yaml tabstop=8

configure.ac

@@ -3,9 +3,11 @@
 
 AC_PREREQ(2.53)
 AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
-REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)"
+REQUIRE_ERLANG_MIN="6.1 (Erlang/OTP 17.1)"
 REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
 
+AC_CONFIG_MACRO_DIR([m4])
+
 # Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -28,6 +30,7 @@ fi
 
 AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
 
 AC_ERLANG_NEED_ERL
 AC_ERLANG_NEED_ERLC
@@ -81,14 +84,6 @@ AC_ARG_ENABLE(roster_gateway_workaround,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
 esac],[roster_gateway_workaround=false])
 
-AC_ARG_ENABLE(transient_supervisors,
-[AC_HELP_STRING([--disable-transient-supervisors], [disable Erlang supervision for transient processes (default: no)])],
-[case "${enableval}" in
-  yes) transient_supervisors=true ;;
-  no)  transient_supervisors=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-transient_supervisors) ;;
-esac],[transient_supervisors=true])
-
 AC_ARG_ENABLE(full_xml,
 [AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
 [case "${enableval}" in
@@ -106,10 +101,10 @@ AC_ARG_ENABLE(mssql,
 esac],[db_type=generic])
 
 AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-json --enable-elixir --enable-iconv --enable-debug --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-elixir --enable-iconv --enable-debug --enable-tools (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
-  yes) nif=true odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true json=true elixir=true iconv=true debug=true lager=true tools=true ;;
-  no) nif=false odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false json=false elixir=false iconv=false debug=false lager=false tools=false ;;
+  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true debug=true tools=true ;;
+  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false elixir=false iconv=false debug=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -121,14 +116,6 @@ AC_ARG_ENABLE(tools,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
 esac],[if test "x$tools" = "x"; then tools=false; fi])
 
-AC_ARG_ENABLE(nif,
-[AC_HELP_STRING([--enable-nif], [replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no)])],
-[case "${enableval}" in
-  yes) nif=true ;;
-  no)  nif=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-nif) ;;
-esac],[if test "x$nif" = "x"; then nif=false; fi])
-
 AC_ARG_ENABLE(odbc,
 [AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
 [case "${enableval}" in
@@ -193,14 +180,6 @@ AC_ARG_ENABLE(redis,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
 esac],[if test "x$redis" = "x"; then redis=false; fi])
 
-AC_ARG_ENABLE(json,
-[AC_HELP_STRING([--enable-json], [enable JSON support for mod_bosh (default: no)])],
-[case "${enableval}" in
-  yes) json=true ;;
-  no)  json=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-json) ;;
-esac],[if test "x$json" = "x"; then json=false; fi])
-
 AC_ARG_ENABLE(elixir,
 [AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
 [case "${enableval}" in
@@ -225,13 +204,13 @@ AC_ARG_ENABLE(debug,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
 esac],[if test "x$debug" = "x"; then debug=true; fi])
 
-AC_ARG_ENABLE(lager,
-[AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])],
+AC_ARG_ENABLE(latest_deps,
+[AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependences instead of tagged versions (default: no)])],
 [case "${enableval}" in
-  yes) lager=true ;;
-  no)  lager=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
-esac],[if test "x$lager" = "x"; then lager=true; fi])
+  yes) latest_deps=true ;;
+  no)  latest_deps=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-latest-deps) ;;
+esac],[if test "x$latest_deps" = "x"; then latest_deps=false; fi])
 
 AC_CONFIG_FILES([Makefile
 		 vars.config
@@ -262,9 +241,7 @@ fi
 
 AC_SUBST(hipe)
 AC_SUBST(roster_gateway_workaround)
-AC_SUBST(transient_supervisors)
 AC_SUBST(full_xml)
-AC_SUBST(nif)
 AC_SUBST(db_type)
 AC_SUBST(odbc)
 AC_SUBST(mysql)
@@ -274,11 +251,13 @@ AC_SUBST(pam)
 AC_SUBST(zlib)
 AC_SUBST(riak)
 AC_SUBST(redis)
-AC_SUBST(json)
 AC_SUBST(elixir)
 AC_SUBST(iconv)
 AC_SUBST(debug)
-AC_SUBST(lager)
 AC_SUBST(tools)
+AC_SUBST(latest_deps)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
 AC_OUTPUT

contrib/extract_translations/extract_translations.erl

@@ -115,6 +115,12 @@ parse_form(Dir, File, Form, Used) ->
 	 {string, Line, Value}
 	} ->
 	    ets:insert(vars, {Name, Value, Line});
+        {match,
+         _,
+         {var, _, Name},
+         {bin,Line,[{bin_element,_,{string,_,Value},_,_}]}
+        } ->
+            ets:insert(vars, {Name, Value, Line});
 	L when is_list(L) ->
 	    lists:foreach(
 	      fun(F) ->
@@ -236,9 +242,7 @@ print_usage() ->
 print_po_header(File) ->
     MsgProps = get_msg_header_props(File),
     {Language, [LastT | AddT]} = prepare_props(MsgProps),
-    application:load(ejabberd),
-    {ok, Version} = application:get_key(ejabberd, vsn),
-    print_po_header(Version, Language, LastT, AddT).
+    print_po_header(Language, LastT, AddT).
 
 get_msg_header_props(File) ->
     {ok, F} = file:open(File, [read]),
@@ -268,12 +272,11 @@ prepare_props(MsgProps) ->
     Authors = proplists:get_all_values("Author:", MsgProps),
     {Language, Authors}.
 
-print_po_header(Version, Language, LastTranslator, AdditionalTranslatorsList) ->
+print_po_header(Language, LastTranslator, AdditionalTranslatorsList) ->
     AdditionalTranslatorsString = build_additional_translators(AdditionalTranslatorsList),
     HeaderString =
 	"msgid \"\"\n"
 	"msgstr \"\"\n"
-	"\"Project-Id-Version: " ++ Version ++ "\\n\"\n"
 	++ "\"X-Language: " ++ Language ++ "\\n\"\n"
 	"\"Last-Translator: " ++ LastTranslator ++ "\\n\"\n"
 	++ AdditionalTranslatorsString ++

contrib/extract_translations/prepare-translation.sh

@@ -157,7 +157,7 @@ extract_lang_srcmsg2po ()
 	echo $MSGS_PATH
 
 	cd $SRC_DIR
-	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$PO_PATH.1
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa ../include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$PO_PATH.1
 	sed -e 's/ \[\]$/ \"\"/g;' $PO_PATH.1 > $PO_PATH.2
 	msguniq --sort-by-file $PO_PATH.2 --output-file=$PO_PATH
 	
@@ -176,7 +176,7 @@ extract_lang_src2pot ()
 	echo "" >>$MSGS_PATH
 
 	cd $SRC_DIR
-	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$POT_PATH.1
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa ../include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$POT_PATH.1
 	sed -e 's/ \[\]$/ \"\"/g;' $POT_PATH.1 > $POT_PATH.2
 
 	#msguniq --sort-by-file $POT_PATH.2 $EJA_MSGS_DIR --output-file=$POT_PATH

cover.spec

@@ -0,0 +1,5 @@
+{level, details}.
+{incl_dirs, ["src", "ebin"]}.
+{excl_mods, [eldap, 'ELDAPv3']}.
+{export, "logs/all.coverdata"}.
+

doc/Makefile

@@ -1,62 +0,0 @@
-# $Id$
-
-SHELL = /bin/sh
-
-CONTRIBUTED_MODULES = ""
-#ifeq ($(shell ls mod_http_bind.tex),mod_http_bind.tex)
-#	CONTRIBUTED_MODULES += "\\n\\setboolean{modhttpbind}{true}"
-#endif
-
-
-all:	release pdf html
-
-release:
-	@printf '%s\n' "Notes for the releaser:"
-	@printf '%s\n' "* Do not forget to add a link to the release notes in guide.tex"
-	@printf '%s\n' "* Do not forget to update the version number in ebin/ejabberd.app!"
-	@printf '%s\n' "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)."
-	@printf '%s\n' "Press any key to continue"
-	##@read foo
-	@printf '%s\n' "% ejabberd version (automatically generated)." > version.tex
-	@printf '%s\n' "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex
-	@printf '%s'   "% Contributed modules (automatically generated)." > contributed_modules.tex
-	@printf '%b\n' "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex
-
-html:	guide.html dev.html features.html
-
-pdf:	guide.pdf features.pdf
-
-clean:
-	rm -f *.aux
-	rm -f *.haux
-	rm -f *.htoc
-	rm -f *.idx
-	rm -f *.ilg
-	rm -f *.ind
-	rm -f *.log
-	rm -f *.out
-	rm -f *.pdf
-	rm -f *.toc
-	[ ! -f contributed_modules.tex ] || rm contributed_modules.tex
-
-distclean: clean
-	rm -f *.html
-
-guide.html:	guide.tex
-		hevea -fix -pedantic guide.tex
-
-dev.html:	dev.tex
-		hevea -fix -pedantic dev.tex
-
-features.html:	features.tex
-		hevea -fix -pedantic features.tex
-
-guide.pdf:	guide.tex
-		pdflatex guide.tex
-		pdflatex guide.tex
-		pdflatex guide.tex
-		makeindex guide.idx
-		pdflatex guide.tex
-
-features.pdf:	features.tex
-		pdflatex features.tex

doc/api/Makefile

@@ -1,18 +0,0 @@
-APPNAME = ejabberd
-VSN = $(shell sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../../src/ejabberd.app)
-
-DOCDIR=.
-SRCDIR=../../src
-
-.PHONY = all
-
-all: docs
-
-clean:
-	rm -f *.html
-	rm edoc-info
-	rm erlang.png
-
-docs:
-	erl -noshell -run edoc_run application \
-	"'$(APPNAME)'" '"$(SRCDIR)"' '[{dir,"$(DOCDIR)"},{packages, false},{todo,true},{private,true},{def,{vsn,"$(VSN)"}},{stylesheet,"process-one.css"},{overview,"$(DOCDIR)/overview.edoc"}]' -s init stop

doc/api/overview.edoc

@@ -1,10 +0,0 @@
-@author Mickael Remond <mickael.remond@process-one.net>
-  [http://www.process-one.net/]
-@copyright 2013 ProcessOne
-@version {@vsn}, {@date} {@time}
-@title ejabberd Development API Documentation
-
-@doc
-== Introduction ==
-
-TODO: Insert content from Jerome documentation.

doc/api/process-one.css

@@ -1,92 +0,0 @@
-html, body {
-  font-family: Verdana, sans-serif;
-  color: #000;
-  background-color: #fff;
-}
-
-h1 {
-  color: #4a5389;
-  border-bottom: solid 1px #000;
-}
-
-h2 {
-  font-size: 24px;
-  text-align: right;
-  color: #4a5389;
-  border-bottom: 1px solid #000;
-}
-
-h3 {
-  font-size: 18px;
-  color: #900;
-}
-
-h4 {
-  font-size: 14px;
-  color: #000;
-}
-
-a[href] {
-  color: #4a5389;
-}
-
-a[href]:hover {
-  background-color: #ecefff;
-}
-
-p, li, dd {
-  text-align: justify;
-}
-
-li {
-  margin-top: 0.3em;
-}
-
-li:first-child {
-  margin-top: 0px;
-}
-
-blockquote {
-  color: #555;
-}
-
-caption {
-  font-style: italic;
-  color: #009;
-  text-align: left;
-  margin-left: 20px;
-}
-
-table[border="1"] {
-  border-collapse: collapse;
-  margin-bottom: 1em;
-}
-
-table[border="1"] td {
-  border: 1px solid #ddd;
-}
-
-pre, tt, code {
-  color: #461b7e;
-}
-
-pre {
-  margin:1ex 2ex;
-  border:1px dashed lightgrey;
-  background-color:#f9f9f9;
-  padding:0.5ex;
-}
-
-pre em {
-  font-style: normal;
-  font-weight: bold;
-}
-
-dt {
-  margin:0ex 2ex;
-  font-weight:bold;
-}
-
-dd {
-  margin:0ex 0ex 1ex 4ex;
-}

doc/dev.html

@@ -1,437 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="generator" content="hevea 2.09">
-<style type="text/css">
-.li-itemize{margin:1ex 0ex;}
-.li-enumerate{margin:1ex 0ex;}
-.dd-description{margin:0ex 0ex 1ex 4ex;}
-.dt-description{margin:0ex;}
-.toc{list-style:none;}
-.footnotetext{margin:0ex; padding:0ex;}
-div.footnotetext P{margin:0px; text-indent:1em;}
-.thefootnotes{text-align:left;margin:0ex;}
-.dt-thefootnotes{margin:0em;}
-.dd-thefootnotes{margin:0em 0em 0em 2em;}
-.footnoterule{margin:1em auto 1em 0px;width:50%;}
-.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
-.title{margin:2ex auto;text-align:center}
-.titlemain{margin:1ex 2ex 2ex 1ex;}
-.titlerest{margin:0ex 2ex;}
-.center{text-align:center;margin-left:auto;margin-right:auto;}
-.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
-.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
-div table{margin-left:inherit;margin-right:inherit;margin-bottom:2px;margin-top:2px}
-td table{margin:auto;}
-table{border-collapse:collapse;}
-td{padding:0;}
-.cellpadding0 tr td{padding:0;}
-.cellpadding1 tr td{padding:1px;}
-pre{text-align:left;margin-left:0ex;margin-right:auto;}
-blockquote{margin-left:4ex;margin-right:4ex;text-align:left;}
-td p{margin:0px;}
-.boxed{border:1px solid black}
-.textboxed{border:1px solid black}
-.vbar{border:none;width:2px;background-color:black;}
-.hbar{border:none;height:2px;width:100%;background-color:black;}
-.hfill{border:none;height:1px;width:200%;background-color:black;}
-.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
-.vdcell{white-space:nowrap;padding:0px; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px; border:none;}
-.dcenter{margin:0ex auto;}
-.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
-.minipage{text-align:left; margin-left:0em; margin-right:auto;}
-.marginpar{border:solid thin black; width:20%; text-align:left;}
-.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
-.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
-.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
-.part{margin:2ex auto;text-align:center}
-</style>
-<title>Ejabberd community 14.05-120-gedfb5fc Developers Guide
-</title>
-</head>
-<body >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
-<!--CUT STYLE article--><!--CUT DEF section 1 --><p><a id="titlepage"></a>
-
-</p><table class="title"><tr><td style="padding:1ex"><h1 class="titlemain">Ejabberd community 14.05-120-gedfb5fc Developers Guide</h1><h3 class="titlerest">Alexey Shchepin <br>
- <a href="mailto:alexey@sevcom.net"><span style="font-family:monospace">mailto:alexey@sevcom.net</span></a> <br>
- <a href="xmpp:aleksey@jabber.ru"><span style="font-family:monospace">xmpp:aleksey@jabber.ru</span></a></h3></td></tr>
-</table><div class="center">
-
-<img src="logo.png" alt="logo.png">
-
-
-</div><blockquote class="quotation"><span style="font-style:italic">I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</span></blockquote><!--TOC section id="intro" Contents-->
-<h2 id="intro" class="section">Contents</h2><!--SEC END --><ul class="toc"><li class="li-toc">
-<a href="#sec2">1&#XA0;&#XA0;Key Features</a>
-</li><li class="li-toc"><a href="#sec3">2&#XA0;&#XA0;Additional Features</a>
-</li><li class="li-toc"><a href="#sec4">3&#XA0;&#XA0;How it Works</a>
-<ul class="toc"><li class="li-toc">
-<a href="#sec5">3.1&#XA0;&#XA0;Router</a>
-</li><li class="li-toc"><a href="#sec6">3.2&#XA0;&#XA0;Local Router</a>
-</li><li class="li-toc"><a href="#sec7">3.3&#XA0;&#XA0;Session Manager</a>
-</li><li class="li-toc"><a href="#sec8">3.4&#XA0;&#XA0;S2S Manager</a>
-</li></ul>
-</li><li class="li-toc"><a href="#sec9">4&#XA0;&#XA0;Authentication</a>
-<ul class="toc">
-<ul class="toc"><li class="li-toc">
-<a href="#sec10">4.0.1&#XA0;&#XA0;External</a>
-</li></ul>
-</ul>
-</li><li class="li-toc"><a href="#sec11">5&#XA0;&#XA0;XML Representation</a>
-</li><li class="li-toc"><a href="#sec12">6&#XA0;&#XA0;Module <span style="font-family:monospace">xml</span></a>
-</li><li class="li-toc"><a href="#sec13">7&#XA0;&#XA0;Module <span style="font-family:monospace">xml_stream</span></a>
-</li><li class="li-toc"><a href="#sec14">8&#XA0;&#XA0;Modules</a>
-<ul class="toc"><li class="li-toc">
-<a href="#sec15">8.1&#XA0;&#XA0;Module gen_iq_handler</a>
-</li><li class="li-toc"><a href="#sec16">8.2&#XA0;&#XA0;Services</a>
-</li></ul>
-</li></ul><p>Introduction
-</p><p><span style="font-family:monospace">ejabberd</span> is a free and open source instant messaging server written in <a href="http://www.erlang.org/">Erlang/OTP</a>.</p><p><span style="font-family:monospace">ejabberd</span> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</p><p><span style="font-family:monospace">ejabberd</span> is designed to be a rock-solid and feature rich XMPP server.</p><p><span style="font-family:monospace">ejabberd</span> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.</p>
-<!--TOC section id="sec2" Key Features-->
-<h2 id="sec2" class="section">1&#XA0;&#XA0;Key Features</h2><!--SEC END --><p>
-<a id="keyfeatures"></a>
-</p><p><span style="font-family:monospace">ejabberd</span> is:
-</p><ul class="itemize"><li class="li-itemize">
-Cross-platform: <span style="font-family:monospace">ejabberd</span> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</li><li class="li-itemize">Distributed: You can run <span style="font-family:monospace">ejabberd</span> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</li><li class="li-itemize">Fault-tolerant: You can deploy an <span style="font-family:monospace">ejabberd</span> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</li><li class="li-itemize">Administrator Friendly: <span style="font-family:monospace">ejabberd</span> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-<ul class="itemize"><li class="li-itemize">
-Comprehensive documentation.
-</li><li class="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </li><li class="li-itemize">Web Administration.
-</li><li class="li-itemize">Shared Roster Groups.
-</li><li class="li-itemize">Command line administration tool. </li><li class="li-itemize">Can integrate with existing authentication mechanisms.
-</li><li class="li-itemize">Capability to send announce messages.
-</li></ul></li><li class="li-itemize">Internationalized: <span style="font-family:monospace">ejabberd</span> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<ul class="itemize"><li class="li-itemize">
-Translated to 25 languages. </li><li class="li-itemize">Support for <a href="http://www.ietf.org/rfc/rfc3490.txt">IDNA</a>.
-</li></ul></li><li class="li-itemize">Open Standards: <span style="font-family:monospace">ejabberd</span> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<ul class="itemize"><li class="li-itemize">
-Fully XMPP compliant.
-</li><li class="li-itemize">XML-based protocol.
-</li><li class="li-itemize"><a href="http://www.ejabberd.im/protocols">Many protocols supported</a>.
-</li></ul></li></ul>
-<!--TOC section id="sec3" Additional Features-->
-<h2 id="sec3" class="section">2&#XA0;&#XA0;Additional Features</h2><!--SEC END --><p>
-<a id="addfeatures"></a>
-</p><p>Moreover, <span style="font-family:monospace">ejabberd</span> comes with a wide range of other state-of-the-art features:
-</p><ul class="itemize"><li class="li-itemize">
-Modular
-<ul class="itemize"><li class="li-itemize">
-Load only the modules you want.
-</li><li class="li-itemize">Extend <span style="font-family:monospace">ejabberd</span> with your own custom modules.
-</li></ul>
-</li><li class="li-itemize">Security
-<ul class="itemize"><li class="li-itemize">
-SASL and STARTTLS for c2s and s2s connections.
-</li><li class="li-itemize">STARTTLS and Dialback s2s connections.
-</li><li class="li-itemize">Web Admin accessible via HTTPS secure access.
-</li></ul>
-</li><li class="li-itemize">Databases
-<ul class="itemize"><li class="li-itemize">
-Internal database for fast deployment (Mnesia).
-</li><li class="li-itemize">Native MySQL support.
-</li><li class="li-itemize">Native PostgreSQL support.
-</li><li class="li-itemize">ODBC data storage support.
-</li><li class="li-itemize">Microsoft SQL Server support. </li><li class="li-itemize">Riak NoSQL database support.
-</li></ul>
-</li><li class="li-itemize">Authentication
-<ul class="itemize"><li class="li-itemize">
-Internal Authentication.
-</li><li class="li-itemize">PAM, LDAP, ODBC and Riak. </li><li class="li-itemize">External Authentication script.
-</li></ul>
-</li><li class="li-itemize">Others
-<ul class="itemize"><li class="li-itemize">
-Support for virtual hosting.
-</li><li class="li-itemize">Compressing XML streams with Stream Compression (<a href="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</a>).
-</li><li class="li-itemize">Statistics via Statistics Gathering (<a href="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</a>).
-</li><li class="li-itemize">IPv6 support both for c2s and s2s connections.
-</li><li class="li-itemize"><a href="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</a> module with support for clustering and HTML logging. </li><li class="li-itemize">Users Directory based on users vCards.
-</li><li class="li-itemize"><a href="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</a> component with support for <a href="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</a>.
-</li><li class="li-itemize">Support for web clients: <a href="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</a> and <a href="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</a> services.
-</li><li class="li-itemize">IRC transport.
-</li><li class="li-itemize">SIP support.
-</li><li class="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-</li></ul>
-</li></ul>
-<!--TOC section id="sec4" How it Works-->
-<h2 id="sec4" class="section">3&#XA0;&#XA0;How it Works</h2><!--SEC END --><p>
-<a id="howitworks"></a></p><p>A XMPP domain is served by one or more <span style="font-family:monospace">ejabberd</span> nodes. These nodes can
-be run on different machines that are connected via a network. They all must
-have the ability to connect to port 4369 of all another nodes, and must have
-the same magic cookie (see Erlang/OTP documentation, in other words the file
-<span style="font-family:monospace">~ejabberd/.erlang.cookie</span> must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, S2S
-connections, registered services, etc&#X2026;</p><p>Each <span style="font-family:monospace">ejabberd</span> node have following modules:
-</p><ul class="itemize"><li class="li-itemize">
-router;
-</li><li class="li-itemize">local router.
-</li><li class="li-itemize">session manager;
-</li><li class="li-itemize">S2S manager;
-</li></ul>
-<!--TOC subsection id="sec5" Router-->
-<h3 id="sec5" class="subsection">3.1&#XA0;&#XA0;Router</h3><!--SEC END --><p>This module is the main router of XMPP packets on each node. It routes
-them based on their destinations domains. It has two tables: local and global
-routes. First, domain of packet destination searched in local table, and if it
-found, then the packet is routed to appropriate process. If no, then it
-searches in global table, and is routed to the appropriate <span style="font-family:monospace">ejabberd</span> node or
-process. If it does not exists in either tables, then it sent to the S2S
-manager.</p>
-<!--TOC subsection id="sec6" Local Router-->
-<h3 id="sec6" class="subsection">3.2&#XA0;&#XA0;Local Router</h3><!--SEC END --><p>This module routes packets which have a destination domain equal to this server
-name. If destination JID has a non-empty user part, then it routed to the
-session manager, else it is processed depending on it&#X2019;s content.</p>
-<!--TOC subsection id="sec7" Session Manager-->
-<h3 id="sec7" class="subsection">3.3&#XA0;&#XA0;Session Manager</h3><!--SEC END --><p>This module routes packets to local users. It searches for what user resource
-packet must be sent via presence table. If this resource is connected to
-this node, it is routed to C2S process, if it connected via another node, then
-the packet is sent to session manager on that node.</p>
-<!--TOC subsection id="sec8" S2S Manager-->
-<h3 id="sec8" class="subsection">3.4&#XA0;&#XA0;S2S Manager</h3><!--SEC END --><p>This module routes packets to other XMPP servers. First, it checks if an
-open S2S connection from the domain of the packet source to the domain of
-packet destination already exists. If it is open on another node, then it
-routes the packet to S2S manager on that node, if it is open on this node, then
-it is routed to the process that serves this connection, and if a connection
-does not exist, then it is opened and registered.</p>
-<!--TOC section id="sec9" Authentication-->
-<h2 id="sec9" class="section">4&#XA0;&#XA0;Authentication</h2><!--SEC END -->
-<!--TOC subsubsection id="sec10" External-->
-<h4 id="sec10" class="subsubsection">4.0.1&#XA0;&#XA0;External</h4><!--SEC END --><p>
-<a id="externalauth"></a>
-</p><p>The external authentication script follows
-<a href="http://www.erlang.org/doc/tutorial/c_portdriver.html">the erlang port driver API</a>.</p><p>That script is supposed to do theses actions, in an infinite loop:
-</p><ul class="itemize"><li class="li-itemize">
-read from stdin: AABBBBBBBBB.....
-<ul class="itemize"><li class="li-itemize">
-A: 2 bytes of length data (a short in network byte order)
-</li><li class="li-itemize">B: a string of length found in A that contains operation in plain text
-operation are as follows:
-<ul class="itemize"><li class="li-itemize">
-auth:User:Server:Password (check if a username/password pair is correct)
-</li><li class="li-itemize">isuser:User:Server (check if it&#X2019;s a valid user)
-</li><li class="li-itemize">setpass:User:Server:Password (set user&#X2019;s password)
-</li><li class="li-itemize">tryregister:User:Server:Password (try to register an account)
-</li><li class="li-itemize">removeuser:User:Server (remove this account)
-</li><li class="li-itemize">removeuser3:User:Server:Password (remove this account if the password is correct)
-</li></ul>
-</li></ul>
-</li><li class="li-itemize">write to stdout: AABB
-<ul class="itemize"><li class="li-itemize">
-A: the number 2 (coded as a short, which is bytes length of following result)
-</li><li class="li-itemize">B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
-</li></ul>
-</li></ul><p>Example python script
-</p><pre class="verbatim">#!/usr/bin/python
-
-import sys
-from struct import *
-
-def from_ejabberd():
-    input_length = sys.stdin.read(2)
-    (size,) = unpack('&gt;h', input_length)
-    return sys.stdin.read(size).split(':')
-
-def to_ejabberd(bool):
-    answer = 0
-    if bool:
-        answer = 1
-    token = pack('&gt;hh', 2, answer)
-    sys.stdout.write(token)
-    sys.stdout.flush()
-
-def auth(username, server, password):
-    return True
-
-def isuser(username, server):
-    return True
-
-def setpass(username, server, password):
-    return True
-
-while True:
-    data = from_ejabberd()
-    success = False
-    if data[0] == "auth":
-        success = auth(data[1], data[2], data[3])
-    elif data[0] == "isuser":
-        success = isuser(data[1], data[2])
-    elif data[0] == "setpass":
-        success = setpass(data[1], data[2], data[3])
-    to_ejabberd(success)
-</pre>
-<!--TOC section id="sec11" XML Representation-->
-<h2 id="sec11" class="section">5&#XA0;&#XA0;XML Representation</h2><!--SEC END --><p>
-<a id="xmlrepr"></a></p><p>Each XML stanza is represented as the following tuple:
-</p><pre class="verbatim">XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
-        Name = string()
-        Attrs = [Attr]
-        Attr = {Key, Val}
-        Key = string()
-        Val = string()
-        ElementOrCDATA = XMLElement | CDATA
-        CDATA = {xmlcdata, string()}
-</pre><p>E.&#XA0;g. this stanza:
-</p><pre class="verbatim">&lt;message to='test@conference.example.org' type='groupchat'&gt;
-  &lt;body&gt;test&lt;/body&gt;
-&lt;/message&gt;
-</pre><p>is represented as the following structure:
-</p><pre class="verbatim">{xmlelement, "message",
-    [{"to", "test@conference.example.org"},
-     {"type", "groupchat"}],
-    [{xmlelement, "body",
-         [],
-         [{xmlcdata, "test"}]}]}}
-</pre>
-<!--TOC section id="sec12" Module <span style="font-family:monospace">xml</span>-->
-<h2 id="sec12" class="section">6&#XA0;&#XA0;Module <span style="font-family:monospace">xml</span></h2><!--SEC END --><p>
-<a id="xmlmod"></a></p><dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>element_to_string(El) -&gt; string()</code>
-<pre class="verbatim">El = XMLElement
-</pre>Returns string representation of XML stanza <span style="font-family:monospace">El</span>.</dd><dt class="dt-description"></dt><dd class="dd-description"><code>crypt(S) -&gt; string()</code>
-<pre class="verbatim">S = string()
-</pre>Returns string which correspond to <span style="font-family:monospace">S</span> with encoded XML special
-characters.</dd><dt class="dt-description"></dt><dd class="dd-description"><code>remove_cdata(ECList) -&gt; EList</code>
-<pre class="verbatim">ECList = [ElementOrCDATA]
-EList = [XMLElement]
-</pre><span style="font-family:monospace">EList</span> is a list of all non-CDATA elements of ECList.</dd><dt class="dt-description"></dt><dd class="dd-description"><code>get_path_s(El, Path) -&gt; Res</code>
-<pre class="verbatim">El = XMLElement
-Path = [PathItem]
-PathItem = PathElem | PathAttr | PathCDATA
-PathElem = {elem, Name}
-PathAttr = {attr, Name}
-PathCDATA = cdata
-Name = string()
-Res = string() | XMLElement
-</pre>If <span style="font-family:monospace">Path</span> is empty, then returns <span style="font-family:monospace">El</span>. Else sequentially
-consider elements of <span style="font-family:monospace">Path</span>. Each element is one of:
-<dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>{elem, Name}</code> <span style="font-family:monospace">Name</span> is name of subelement of
-<span style="font-family:monospace">El</span>, if such element exists, then this element considered in
-following steps, else returns empty string.
-</dd><dt class="dt-description"></dt><dd class="dd-description"><code>{attr, Name}</code> If <span style="font-family:monospace">El</span> have attribute <span style="font-family:monospace">Name</span>, then
-returns value of this attribute, else returns empty string.
-</dd><dt class="dt-description"></dt><dd class="dd-description"><code>cdata</code> Returns CDATA of <span style="font-family:monospace">El</span>.
-</dd></dl></dd><dt class="dt-description"></dt><dd class="dd-description">TODO:
-<pre class="verbatim">         get_cdata/1, get_tag_cdata/1
-         get_attr/2, get_attr_s/2
-         get_tag_attr/2, get_tag_attr_s/2
-         get_subtag/2
-</pre></dd></dl>
-<!--TOC section id="sec13" Module <span style="font-family:monospace">xml_stream</span>-->
-<h2 id="sec13" class="section">7&#XA0;&#XA0;Module <span style="font-family:monospace">xml_stream</span></h2><!--SEC END --><p>
-<a id="xmlstreammod"></a></p><dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>parse_element(Str) -&gt; XMLElement | {error, Err}</code>
-<pre class="verbatim">Str = string()
-Err = term()
-</pre>Parses <span style="font-family:monospace">Str</span> using XML parser, returns either parsed element or error
-tuple.
-</dd></dl>
-<!--TOC section id="sec14" Modules-->
-<h2 id="sec14" class="section">8&#XA0;&#XA0;Modules</h2><!--SEC END --><p>
-<a id="emods"></a></p>
-<!--TOC subsection id="sec15" Module gen_iq_handler-->
-<h3 id="sec15" class="subsection">8.1&#XA0;&#XA0;Module gen_iq_handler</h3><!--SEC END --><p>
-<a id="geniqhandl"></a></p><p>The module <code>gen_iq_handler</code> allows to easily write handlers for IQ packets
-of particular XML namespaces that addressed to server or to users bare JIDs.</p><p>In this module the following functions are defined:
-</p><dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>add_iq_handler(Component, Host, NS, Module, Function, Type)</code>
-<pre class="verbatim">Component = Module = Function = atom()
-Host = NS = string()
-Type = no_queue | one_queue | parallel
-</pre>Registers function <code>Module:Function</code> as handler for IQ packets on
-virtual host <code>Host</code> that contain child of namespace <code>NS</code> in
-<code>Component</code>. Queueing discipline is <code>Type</code>. There are at least
-two components defined:
-<dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>ejabberd_local</code> Handles packets that addressed to server JID;
-</dd><dt class="dt-description"></dt><dd class="dd-description"><code>ejabberd_sm</code> Handles packets that addressed to users bare JIDs.
-</dd></dl>
-</dd><dt class="dt-description"></dt><dd class="dd-description"><code>remove_iq_handler(Component, Host, NS)</code>
-<pre class="verbatim">Component = atom()
-Host = NS = string()
-</pre>Removes IQ handler on virtual host <code>Host</code> for namespace <code>NS</code> from
-<code>Component</code>.
-</dd></dl><p>Handler function must have the following type:
-</p><dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>Module:Function(From, To, IQ)</code>
-<pre class="verbatim">From = To = jid()
-</pre></dd></dl><pre class="verbatim">-module(mod_cputime).
-
--behaviour(gen_mod).
-
--export([start/2,
-         stop/1,
-         process_local_iq/3]).
-
--include("ejabberd.hrl").
--include("jlib.hrl").
-
--define(NS_CPUTIME, "ejabberd:cputime").
-
-start(Host, Opts) -&gt;
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
-                                  ?MODULE, process_local_iq, IQDisc).
-
-stop(Host) -&gt;
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
-
-process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -&gt;
-    case Type of
-        set -&gt;
-            {iq, ID, error, XMLNS,
-             [SubEl, ?ERR_NOT_ALLOWED]};
-        get -&gt;
-            CPUTime = element(1, erlang:statistics(runtime))/1000,
-            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
-            {iq, ID, result, XMLNS,
-             [{xmlelement, "query",
-               [{"xmlns", ?NS_CPUTIME}],
-               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
-    end.
-</pre>
-<!--TOC subsection id="sec16" Services-->
-<h3 id="sec16" class="subsection">8.2&#XA0;&#XA0;Services</h3><!--SEC END --><p>
-<a id="services"></a></p><pre class="verbatim">-module(mod_echo).
-
--behaviour(gen_mod).
-
--export([start/2, init/1, stop/1]).
-
--include("ejabberd.hrl").
--include("jlib.hrl").
-
-start(Host, Opts) -&gt;
-    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
-    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-             spawn(?MODULE, init, [MyHost])).
-
-init(Host) -&gt;
-    ejabberd_router:register_local_route(Host),
-    loop(Host).
-
-loop(Host) -&gt;
-    receive
-        {route, From, To, Packet} -&gt;
-            ejabberd_router:route(To, From, Packet),
-            loop(Host);
-        stop -&gt;
-            ejabberd_router:unregister_route(Host),
-            ok;
-        _ -&gt;
-            loop(Host)
-    end.
-
-stop(Host) -&gt;
-    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-    Proc ! stop,
-    {wait, Proc}.
-</pre><!--CUT END -->
-<!--HTMLFOOT-->
-<!--ENDHTML-->
-<!--FOOTER-->
-<hr style="height:2"><blockquote class="quote"><em>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</em><a href="http://hevea.inria.fr/index.html"><em>H</em><em><span style="font-size:small"><sup>E</sup></span></em><em>V</em><em><span style="font-size:small"><sup>E</sup></span></em><em>A</em></a><em>.</em></blockquote></body>
-</html>

doc/dev.tex

@@ -1,470 +0,0 @@
-\documentclass[a4paper,10pt]{article}
-
-%% Packages
-\usepackage{graphics}
-\usepackage{hevea}
-\usepackage{makeidx}
-\usepackage{verbatim}
-
-%% Index
-\makeindex
-% Remove the index anchors from the HTML version to save size and bandwith.
-\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
-
-%% Images
-\newcommand{\logoscale}{0.7}
-\newcommand{\imgscale}{0.58}
-\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
-\newcommand{\insscaleimg}[2]{
-  \imgsrc{#2}{}
-  \begin{latexonly}
-    \scalebox{#1}{\includegraphics{#2}}
-  \end{latexonly}
-}
-
-%% Various
-\newcommand{\ns}[1]{\texttt{#1}}
-\newcommand{\ejabberd}{\texttt{ejabberd}}
-\newcommand{\Jabber}{Jabber}
-\newcommand{\XMPP}{XMPP}
-
-%% Modules
-\newcommand{\module}[1]{\texttt{#1}}
-\newcommand{\modadhoc}{\module{mod\_adhoc}}
-\newcommand{\modannounce}{\module{mod\_announce}}
-\newcommand{\modconfigure}{\module{mod\_configure}}
-\newcommand{\moddisco}{\module{mod\_disco}}
-\newcommand{\modecho}{\module{mod\_echo}}
-\newcommand{\modirc}{\module{mod\_irc}}
-\newcommand{\modlast}{\module{mod\_last}}
-\newcommand{\modlastodbc}{\module{mod\_last\_odbc}}
-\newcommand{\modmuc}{\module{mod\_muc}}
-\newcommand{\modmuclog}{\module{mod\_muc\_log}}
-\newcommand{\modoffline}{\module{mod\_offline}}
-\newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}}
-\newcommand{\modprivacy}{\module{mod\_privacy}}
-\newcommand{\modprivate}{\module{mod\_private}}
-\newcommand{\modpubsub}{\module{mod\_pubsub}}
-\newcommand{\modregister}{\module{mod\_register}}
-\newcommand{\modroster}{\module{mod\_roster}}
-\newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}}
-\newcommand{\modservicelog}{\module{mod\_service\_log}}
-\newcommand{\modsharedroster}{\module{mod\_shared\_roster}}
-\newcommand{\modstats}{\module{mod\_stats}}
-\newcommand{\modtime}{\module{mod\_time}}
-\newcommand{\modvcard}{\module{mod\_vcard}}
-\newcommand{\modvcardldap}{\module{mod\_vcard\_ldap}}
-\newcommand{\modvcardodbc}{\module{mod\_vcard\_odbc}}
-\newcommand{\modversion}{\module{mod\_version}}
-
-%% Title page
-\include{version}
-\title{Ejabberd \version\ Developers Guide}
-\author{Alexey Shchepin \\
-  \ahrefurl{mailto:alexey@sevcom.net} \\
-  \ahrefurl{xmpp:aleksey@jabber.ru}}
-
-%% Options
-\newcommand{\marking}[1]{#1} % Marking disabled
-\newcommand{\quoting}[2][yozhik]{} % Quotes disabled
-\newcommand{\new}{\begin{latexonly}\marginpar{\textsc{new}}\end{latexonly}} % Highlight new features
-\newcommand{\improved}{\begin{latexonly}\marginpar{\textsc{improved}}\end{latexonly}} % Highlight improved features
-\newcommand{\moreinfo}[1]{} % Hide details
-
-%% Footnotes
-\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
-\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
-
-\begin{document}
-
-\label{titlepage}
-\begin{titlepage}
-  \maketitle{}
-
-  \begin{center}
-  {\insscaleimg{\logoscale}{logo.png}
-    \par
-  }
-  \end{center}
-
-  \begin{quotation}\textit{I can thoroughly recommend ejabberd for ease of setup --
-  Kevin Smith, Current maintainer of the Psi project}\end{quotation}
-
-\end{titlepage}
-
-\tableofcontents{}
-
-% Input introduction.tex
-\input{introduction}
-
-\section{How it Works}
-\label{howitworks}
-
-
-A \XMPP{} domain is served by one or more \ejabberd{} nodes.  These nodes can
-be run on different machines that are connected via a network.  They all must
-have the ability to connect to port 4369 of all another nodes, and must have
-the same magic cookie (see Erlang/OTP documentation, in other words the file
-\texttt{\~{}ejabberd/.erlang.cookie} must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, S2S
-connections, registered services, etc\ldots
-
-
-
-Each \ejabberd{} node have following modules:
-\begin{itemize}
-\item router;
-\item local router.
-\item session manager;
-\item S2S manager;
-\end{itemize}
-
-
-\subsection{Router}
-
-This module is the main router of \XMPP{} packets on each node.  It routes
-them based on their destinations domains.  It has two tables: local and global
-routes.  First, domain of packet destination searched in local table, and if it
-found, then the packet is routed to appropriate process.  If no, then it
-searches in global table, and is routed to the appropriate \ejabberd{} node or
-process.  If it does not exists in either tables, then it sent to the S2S
-manager.
-
-
-\subsection{Local Router}
-
-This module routes packets which have a destination domain equal to this server
-name.  If destination JID has a non-empty user part, then it routed to the
-session manager, else it is processed depending on it's content.
-
-
-\subsection{Session Manager}
-
-This module routes packets to local users.  It searches for what user resource
-packet must be sent via presence table.  If this resource is connected to
-this node, it is routed to C2S process, if it connected via another node, then
-the packet is sent to session manager on that node.
-
-
-\subsection{S2S Manager}
-
-This module routes packets to other \XMPP{} servers.  First, it checks if an
-open S2S connection from the domain of the packet source to the domain of
-packet destination already exists. If it is open on another node, then it
-routes the packet to S2S manager on that node, if it is open on this node, then
-it is routed to the process that serves this connection, and if a connection
-does not exist, then it is opened and registered.
-
-
-\section{Authentication}
-
-\subsubsection{External}
-\label{externalauth}
-\ind{external authentication}
-
-The external authentication script follows
-\footahref{http://www.erlang.org/doc/tutorial/c_portdriver.html}{the erlang port driver API}.
-
-That script is supposed to do theses actions, in an infinite loop:
-\begin{itemize}
-\item read from stdin: AABBBBBBBBB.....
-    \begin{itemize}
-    \item A: 2 bytes of length data (a short in network byte order)
-    \item B: a string of length found in A that contains operation in plain text
-    operation are as follows:
-    \begin{itemize}
-    \item auth:User:Server:Password (check if a username/password pair is correct)
-    \item isuser:User:Server (check if it's a valid user)
-    \item setpass:User:Server:Password (set user's password)
-    \item tryregister:User:Server:Password (try to register an account)
-    \item removeuser:User:Server (remove this account)
-    \item removeuser3:User:Server:Password (remove this account if the password is correct)
-    \end{itemize}
-    \end{itemize}
-\item write to stdout: AABB
-    \begin{itemize}
-    \item A: the number 2 (coded as a short, which is bytes length of following result)
-    \item B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
-    \end{itemize}
-\end{itemize}
-
-Example python script
-\begin{verbatim}
-#!/usr/bin/python
-
-import sys
-from struct import *
-
-def from_ejabberd():
-    input_length = sys.stdin.read(2)
-    (size,) = unpack('>h', input_length)
-    return sys.stdin.read(size).split(':')
-
-def to_ejabberd(bool):
-    answer = 0
-    if bool:
-        answer = 1
-    token = pack('>hh', 2, answer)
-    sys.stdout.write(token)
-    sys.stdout.flush()
-
-def auth(username, server, password):
-    return True
-
-def isuser(username, server):
-    return True
-
-def setpass(username, server, password):
-    return True
-
-while True:
-    data = from_ejabberd()
-    success = False
-    if data[0] == "auth":
-        success = auth(data[1], data[2], data[3])
-    elif data[0] == "isuser":
-        success = isuser(data[1], data[2])
-    elif data[0] == "setpass":
-        success = setpass(data[1], data[2], data[3])
-    to_ejabberd(success)
-\end{verbatim}
-
-\section{XML Representation}
-\label{xmlrepr}
-
-Each XML stanza is represented as the following tuple:
-\begin{verbatim}
-XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
-        Name = string()
-        Attrs = [Attr]
-        Attr = {Key, Val}
-        Key = string()
-        Val = string()
-        ElementOrCDATA = XMLElement | CDATA
-        CDATA = {xmlcdata, string()}
-\end{verbatim}
-E.\,g. this stanza:
-\begin{verbatim}
-<message to='test@conference.example.org' type='groupchat'>
-  <body>test</body>
-</message>
-\end{verbatim}
-is represented as the following structure:
-\begin{verbatim}
-{xmlelement, "message",
-    [{"to", "test@conference.example.org"},
-     {"type", "groupchat"}],
-    [{xmlelement, "body",
-         [],
-         [{xmlcdata, "test"}]}]}}
-\end{verbatim}
-
-
-
-\section{Module \texttt{xml}}
-\label{xmlmod}
-
-\begin{description}
-\item{\verb|element_to_string(El) -> string()|}
-\begin{verbatim}
-El = XMLElement
-\end{verbatim}
-  Returns string representation of XML stanza \texttt{El}.
-
-\item{\verb|crypt(S) -> string()|}
-\begin{verbatim}
-S = string()
-\end{verbatim}
-  Returns string which correspond to \texttt{S} with encoded XML special
-  characters.
-
-\item{\verb|remove_cdata(ECList) -> EList|}
-\begin{verbatim}
-ECList = [ElementOrCDATA]
-EList = [XMLElement]
-\end{verbatim}
-  \texttt{EList} is a list of all non-CDATA elements of ECList.
-
-
-
-\item{\verb|get_path_s(El, Path) -> Res|}
-\begin{verbatim}
-El = XMLElement
-Path = [PathItem]
-PathItem = PathElem | PathAttr | PathCDATA
-PathElem = {elem, Name}
-PathAttr = {attr, Name}
-PathCDATA = cdata
-Name = string()
-Res = string() | XMLElement
-\end{verbatim}
-  If \texttt{Path} is empty, then returns \texttt{El}.  Else sequentially
-  consider elements of \texttt{Path}.  Each element is one of:
-  \begin{description}
-  \item{\verb|{elem, Name}|} \texttt{Name} is name of subelement of
-    \texttt{El}, if such element exists, then this element considered in
-    following steps, else returns empty string.
-  \item{\verb|{attr, Name}|} If \texttt{El} have attribute \texttt{Name}, then
-    returns value of this attribute, else returns empty string.
-  \item{\verb|cdata|} Returns CDATA of \texttt{El}.
-  \end{description}
-
-\item{TODO:}
-\begin{verbatim}
-         get_cdata/1, get_tag_cdata/1
-         get_attr/2, get_attr_s/2
-         get_tag_attr/2, get_tag_attr_s/2
-         get_subtag/2
-\end{verbatim}
-\end{description}
-
-
-\section{Module \texttt{xml\_stream}}
-\label{xmlstreammod}
-
-\begin{description}
-\item{\verb!parse_element(Str) -> XMLElement | {error, Err}!}
-\begin{verbatim}
-Str = string()
-Err = term()
-\end{verbatim}
-  Parses \texttt{Str} using XML parser, returns either parsed element or error
-  tuple.
-\end{description}
-
-
-\section{Modules}
-\label{emods}
-
-
-%\subsection{gen\_mod behaviour}
-%\label{genmod}
-
-%TBD
-
-\subsection{Module gen\_iq\_handler}
-\label{geniqhandl}
-
-The module \verb|gen_iq_handler| allows to easily write handlers for IQ packets
-of particular XML namespaces that addressed to server or to users bare JIDs.
-
-In this module the following functions are defined:
-\begin{description}
-\item{\verb|add_iq_handler(Component, Host, NS, Module, Function, Type)|}
-\begin{verbatim}
-Component = Module = Function = atom()
-Host = NS = string()
-Type = no_queue | one_queue | parallel
-\end{verbatim}
-  Registers function \verb|Module:Function| as handler for IQ packets on
-  virtual host \verb|Host| that contain child of namespace \verb|NS| in
-  \verb|Component|.  Queueing discipline is \verb|Type|.  There are at least
-  two components defined:
-  \begin{description}
-  \item{\verb|ejabberd_local|} Handles packets that addressed to server JID;
-  \item{\verb|ejabberd_sm|} Handles packets that addressed to users bare JIDs.
-  \end{description}
-\item{\verb|remove_iq_handler(Component, Host, NS)|}
-\begin{verbatim}
-Component = atom()
-Host = NS = string()
-\end{verbatim}
-  Removes IQ handler on virtual host \verb|Host| for namespace \verb|NS| from
-  \verb|Component|.
-\end{description}
-
-Handler function must have the following type:
-\begin{description}
-\item{\verb|Module:Function(From, To, IQ)|}
-\begin{verbatim}
-From = To = jid()
-\end{verbatim}
-\end{description}
-
-
-
-\begin{verbatim}
--module(mod_cputime).
-
--behaviour(gen_mod).
-
--export([start/2,
-         stop/1,
-         process_local_iq/3]).
-
--include("ejabberd.hrl").
--include("jlib.hrl").
-
--define(NS_CPUTIME, "ejabberd:cputime").
-
-start(Host, Opts) ->
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
-                                  ?MODULE, process_local_iq, IQDisc).
-
-stop(Host) ->
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
-
-process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) ->
-    case Type of
-        set ->
-            {iq, ID, error, XMLNS,
-             [SubEl, ?ERR_NOT_ALLOWED]};
-        get ->
-            CPUTime = element(1, erlang:statistics(runtime))/1000,
-            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
-            {iq, ID, result, XMLNS,
-             [{xmlelement, "query",
-               [{"xmlns", ?NS_CPUTIME}],
-               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
-    end.
-\end{verbatim}
-
-
-\subsection{Services}
-\label{services}
-
-%TBD
-
-
-%TODO: use \verb|proc_lib|
-\begin{verbatim}
--module(mod_echo).
-
--behaviour(gen_mod).
-
--export([start/2, init/1, stop/1]).
-
--include("ejabberd.hrl").
--include("jlib.hrl").
-
-start(Host, Opts) ->
-    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
-    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-             spawn(?MODULE, init, [MyHost])).
-
-init(Host) ->
-    ejabberd_router:register_local_route(Host),
-    loop(Host).
-
-loop(Host) ->
-    receive
-        {route, From, To, Packet} ->
-            ejabberd_router:route(To, From, Packet),
-            loop(Host);
-        stop ->
-            ejabberd_router:unregister_route(Host),
-            ok;
-        _ ->
-            loop(Host)
-    end.
-
-stop(Host) ->
-    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-    Proc ! stop,
-    {wait, Proc}.
-\end{verbatim}
-
-
-
-\end{document}

doc/features.html

@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="generator" content="hevea 2.09">
-<style type="text/css">
-.li-itemize{margin:1ex 0ex;}
-.li-enumerate{margin:1ex 0ex;}
-.dd-description{margin:0ex 0ex 1ex 4ex;}
-.dt-description{margin:0ex;}
-.toc{list-style:none;}
-.footnotetext{margin:0ex; padding:0ex;}
-div.footnotetext P{margin:0px; text-indent:1em;}
-.thefootnotes{text-align:left;margin:0ex;}
-.dt-thefootnotes{margin:0em;}
-.dd-thefootnotes{margin:0em 0em 0em 2em;}
-.footnoterule{margin:1em auto 1em 0px;width:50%;}
-.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
-.title{margin:2ex auto;text-align:center}
-.titlemain{margin:1ex 2ex 2ex 1ex;}
-.titlerest{margin:0ex 2ex;}
-.center{text-align:center;margin-left:auto;margin-right:auto;}
-.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
-.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
-div table{margin-left:inherit;margin-right:inherit;margin-bottom:2px;margin-top:2px}
-td table{margin:auto;}
-table{border-collapse:collapse;}
-td{padding:0;}
-.cellpadding0 tr td{padding:0;}
-.cellpadding1 tr td{padding:1px;}
-pre{text-align:left;margin-left:0ex;margin-right:auto;}
-blockquote{margin-left:4ex;margin-right:4ex;text-align:left;}
-td p{margin:0px;}
-.boxed{border:1px solid black}
-.textboxed{border:1px solid black}
-.vbar{border:none;width:2px;background-color:black;}
-.hbar{border:none;height:2px;width:100%;background-color:black;}
-.hfill{border:none;height:1px;width:200%;background-color:black;}
-.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
-.vdcell{white-space:nowrap;padding:0px; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px; border:none;}
-.dcenter{margin:0ex auto;}
-.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
-.minipage{text-align:left; margin-left:0em; margin-right:auto;}
-.marginpar{border:solid thin black; width:20%; text-align:left;}
-.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
-.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
-.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
-.part{margin:2ex auto;text-align:center}
-SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
-</style>
-<title>Ejabberd community 14.05-120-gedfb5fc Feature Sheet
-</title>
-</head>
-<body >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
-<!--CUT STYLE article--><!--CUT DEF section 1 --><p><a id="titlepage"></a>
-
-</p><table class="title"><tr><td style="padding:1ex"><h1 class="titlemain">Ejabberd community 14.05-120-gedfb5fc Feature Sheet</h1><h3 class="titlerest">Sander Devrieze <br>
- <a href="mailto:s.devrieze@pandora.be"><span style="font-family:monospace">mailto:s.devrieze@pandora.be</span></a> <br>
- <a href="xmpp:sander@devrieze.dyndns.org"><span style="font-family:monospace">xmpp:sander@devrieze.dyndns.org</span></a></h3></td></tr>
-</table><div class="center">
-
-<img src="logo.png" alt="logo.png">
-
-
-</div><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</span></span></blockquote><p>Introduction
-<a id="intro"></a></p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &#X2014;
-Joeri</span></span></blockquote><p><span style="font-family:monospace">ejabberd</span> is a <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">free and open source</span></span></span> instant messaging server written in <a href="http://www.erlang.org/">Erlang/OTP</a>.</p><p><span style="font-family:monospace">ejabberd</span> is <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">cross-platform</span></span></span>, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</p><p><span style="font-family:monospace">ejabberd</span> is designed to be a <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">rock-solid and feature rich</span></span></span> XMPP server.</p><p><span style="font-family:monospace">ejabberd</span> is suitable for small deployments, whether they need to be <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">scalable</span></span></span> or not, as well as extremely big deployments.</p>
-<!--TOC section id="sec1" Key Features-->
-<h2 id="sec1" class="section">Key Features</h2><!--SEC END --><p>
-<a id="keyfeatures"></a>
-</p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">Erlang seems to be tailor-made for writing stable, robust servers. &#X2014;
-Peter Saint-Andr&#XE9;, Executive Director of the Jabber Software Foundation</span></span></blockquote><p><span style="font-family:monospace">ejabberd</span> is:
-</p><ul class="itemize"><li class="li-itemize">
-<span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Cross-platform:</span></span></span> <span style="font-family:monospace">ejabberd</span> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Distributed:</span></span></span> You can run <span style="font-family:monospace">ejabberd</span> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Fault-tolerant:</span></span></span> You can deploy an <span style="font-family:monospace">ejabberd</span> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Administrator Friendly:</span></span></span> <span style="font-family:monospace">ejabberd</span> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-<ul class="itemize"><li class="li-itemize">
-Comprehensive documentation.
-</li><li class="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </li><li class="li-itemize">Web Administration.
-</li><li class="li-itemize">Shared Roster Groups.
-</li><li class="li-itemize">Command line administration tool. </li><li class="li-itemize">Can integrate with existing authentication mechanisms.
-</li><li class="li-itemize">Capability to send announce messages.
-</li></ul></li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Internationalized:</span></span></span> <span style="font-family:monospace">ejabberd</span> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<ul class="itemize"><li class="li-itemize">
-Translated to 25 languages. </li><li class="li-itemize">Support for <a href="http://www.ietf.org/rfc/rfc3490.txt">IDNA</a>.
-</li></ul></li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Open Standards:</span></span></span> <span style="font-family:monospace">ejabberd</span> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<ul class="itemize"><li class="li-itemize">
-Fully XMPP compliant.
-</li><li class="li-itemize">XML-based protocol.
-</li><li class="li-itemize"><a href="http://www.ejabberd.im/protocols">Many protocols supported</a>.
-</li></ul></li></ul>
-<!--TOC section id="sec2" Additional Features-->
-<h2 id="sec2" class="section">Additional Features</h2><!--SEC END --><p>
-<a id="addfeatures"></a>
-</p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">ejabberd is making inroads to solving the "buggy incomplete server" problem &#X2014;
-Justin Karneges, Founder of the Psi and the Delta projects</span></span></blockquote><p>Moreover, <span style="font-family:monospace">ejabberd</span> comes with a wide range of other state-of-the-art features:
-</p><ul class="itemize"><li class="li-itemize">
-Modular
-<ul class="itemize"><li class="li-itemize">
-Load only the modules you want.
-</li><li class="li-itemize">Extend <span style="font-family:monospace">ejabberd</span> with your own custom modules.
-</li></ul>
-</li><li class="li-itemize">Security
-<ul class="itemize"><li class="li-itemize">
-SASL and STARTTLS for c2s and s2s connections.
-</li><li class="li-itemize">STARTTLS and Dialback s2s connections.
-</li><li class="li-itemize">Web Admin accessible via HTTPS secure access.
-</li></ul>
-</li><li class="li-itemize">Databases
-<ul class="itemize"><li class="li-itemize">
-Internal database for fast deployment (Mnesia).
-</li><li class="li-itemize">Native MySQL support.
-</li><li class="li-itemize">Native PostgreSQL support.
-</li><li class="li-itemize">ODBC data storage support.
-</li><li class="li-itemize">Microsoft SQL Server support. </li><li class="li-itemize">Riak NoSQL database support.
-</li></ul>
-</li><li class="li-itemize">Authentication
-<ul class="itemize"><li class="li-itemize">
-Internal Authentication.
-</li><li class="li-itemize">PAM, LDAP, ODBC and Riak. </li><li class="li-itemize">External Authentication script.
-</li></ul>
-</li><li class="li-itemize">Others
-<ul class="itemize"><li class="li-itemize">
-Support for virtual hosting.
-</li><li class="li-itemize">Compressing XML streams with Stream Compression (<a href="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</a>).
-</li><li class="li-itemize">Statistics via Statistics Gathering (<a href="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</a>).
-</li><li class="li-itemize">IPv6 support both for c2s and s2s connections.
-</li><li class="li-itemize"><a href="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</a> module with support for clustering and HTML logging. </li><li class="li-itemize">Users Directory based on users vCards.
-</li><li class="li-itemize"><a href="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</a> component with support for <a href="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</a>.
-</li><li class="li-itemize">Support for web clients: <a href="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</a> and <a href="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</a> services.
-</li><li class="li-itemize">IRC transport.
-</li><li class="li-itemize">SIP support.
-</li><li class="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-</li></ul>
-</li></ul><!--CUT END -->
-<!--HTMLFOOT-->
-<!--ENDHTML-->
-<!--FOOTER-->
-<hr style="height:2"><blockquote class="quote"><em>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</em><a href="http://hevea.inria.fr/index.html"><em>H</em><em><span style="font-size:small"><sup>E</sup></span></em><em>V</em><em><span style="font-size:small"><sup>E</sup></span></em><em>A</em></a><em>.</em></blockquote></body>
-</html>

doc/features.tex

@@ -1,136 +0,0 @@
-\documentclass[a4paper,10pt]{article}
-
-%% Packages
-\usepackage{epsfig}
-\usepackage{fancyhdr}
-\usepackage{graphics}
-\usepackage{hevea}
-\usepackage[pdftex,colorlinks,unicode,urlcolor=blue,linkcolor=blue,pdftitle=Ejabberd\
-        Feature\ Sheet,pdfauthor=Sander\
-        Devrieze,pdfsubject=ejabberd,pdfkeywords=ejabberd]{hyperref}
-\usepackage{verbatim}
-\usepackage{color}
-
-%% Index
-% Remove the index anchors from the HTML version to save size and bandwith.
-\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
-
-%% Images
-\newcommand{\logoscale}{0.7}
-\newcommand{\imgscale}{0.58}
-\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
-\newcommand{\insscaleimg}[2]{
-  \imgsrc{#2}{}
-  \begin{latexonly}
-    \scalebox{#1}{\includegraphics{#2}}
-  \end{latexonly}
-}
-
-%% Various
-\newcommand{\bracehack}{\def\{{\char"7B}\def\}{\char"7D}}
-\newcommand{\titem}[1]{\item[\bracehack\texttt{#1}]}
-\newcommand{\ns}[1]{\texttt{#1}}
-\newcommand{\jid}[1]{\texttt{#1}}
-\newcommand{\option}[1]{\texttt{#1}}
-\newcommand{\poption}[1]{{\bracehack\texttt{#1}}}
-\newcommand{\node}[1]{\texttt{#1}}
-\newcommand{\term}[1]{\texttt{#1}}
-\newcommand{\shell}[1]{\texttt{#1}}
-\newcommand{\ejabberd}{\texttt{ejabberd}}
-\newcommand{\Jabber}{Jabber}
-
-%% Title page
-\include{version}
-\title{Ejabberd \version\ Feature Sheet}
-\author{Sander Devrieze \\
-  \ahrefurl{mailto:s.devrieze@pandora.be} \\
-  \ahrefurl{xmpp:sander@devrieze.dyndns.org}}
-
-% Options
-\newcommand{\marking}[1]{\textbf{\begin{large}\textcolor{ejblue}{#1}\end{large}}} % Marking enabled
-\newcommand{\quoting}[2][yozhik]{\begin{quotation}\textcolor{#1}{\textit{#2}}\end{quotation}} % Quotes enabled
-\newcommand{\new}{\marginpar{\textcolor{red}{\textsc{new}}}} % Highlight new features
-\newcommand{\improved}{\marginpar{\textcolor{orange}{\textsc{improved}}}} % Highlight improved features
-\setcounter{secnumdepth}{-1} % Disable section numbering
-
-%% To by-pass errors in the HTML version.
-\newstyle{SPAN}{width:20\%; float:right; text-align:left; margin-left:auto;}
-\definecolor{orange}       {cmyk}{0.000,0.333,1.000,0.000}
-
-%% Footnotes
-\begin{latexonly}
-\global\parskip=9pt plus 3pt minus 1pt
-\global\parindent=0pt
-\gdef\ahrefurl#1{\href{#1}{\texttt{#1}}}
-\gdef\footahref#1#2{#2\footnote{\href{#1}{\texttt{#1}}}}
-\end{latexonly}
-\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
-\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
-
-%% Fancy header
-\fancyhf{}
-\pagestyle{fancy}
-\rhead{\textcolor{ejblue}{The Expandable Jabber/XMPP Daemon.}}
-\renewcommand{\headrule}{{\color{ejblue}%
-\hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
-\lhead{\setlength{\unitlength}{-6mm}
-  \begin{picture}(0,0)
-    \put(5.8,3.25){\includegraphics[width=1.3\textwidth]{yozhikheader.png}}
-  \end{picture}}
-
-% Official ejabberd colours
-\definecolor{ejblue}       {cmyk}{1.000,0.831,0.000,0.537} %RGB: 0,0,118	HTML: 000076
-\definecolor{ejgreenyellow}{cmyk}{0.079,0.000,0.275,0.102} %RGB: 209,229,159	HTML: d1e59f
-\definecolor{ejgreendark}  {cmyk}{0.131,0.000,0.146,0.220} %RGB: 166,199,162	HTML: a6c7a2
-\definecolor{ejgreen}      {cmyk}{0.077,0.000,0.081,0.078} %RGB: 216,236,215	HTML: d8ecd7
-\definecolor{ejgreenwhite} {cmyk}{0.044,0.000,0.048,0.020} %RGB: 239,250,238	HTML: effaee
-\definecolor{yozhik}       {cmyk}{0.000,0.837,1.000,0.424} %RGB: 147,0,0	HTML: 930000
-
-\begin{document}
-
-\label{titlepage}
-\begin{titlepage}
-  \maketitle{}
-
-  \thispagestyle{empty}
-
-  \begin{center}
-  {\insscaleimg{\logoscale}{logo.png}
-    \par
-  }
-  \end{center}
-  \quoting{I can thoroughly recommend ejabberd for ease of setup --
-  Kevin Smith, Current maintainer of the Psi project}
-
-\end{titlepage}
-
-\newpage
-% Set the page counter to 2 so that the titlepage and the second page do not
-% have the same page number. This fixes the PDFLaTeX warning "destination with
-% the same identifier".
-\begin{latexonly}
-\setcounter{page}{2}
-\pagecolor{ejgreenwhite}
-\end{latexonly}
-
-% Input introduction.tex
-\input{introduction}
-
-\end{document}
-
-%% TODO
-% * illustrations (e.g. screenshot from web interface)
-% * commented parts
-% * slides, guide and html version
-% * cleaning and improving LaTeX code
-% * key features: something like this (shorter)? (more focussed on Erlang now): "To reach the goal of high
-%   availability, performance and clustering, ejabberd is written in Erlang, a programming language perfectly
-%   suited for this. Besides that, some parts are written in C to also incude the advantages of this language. In
-%   short, ejabberd is a perfect mix of mainly Erlang code, peppered with some C code to get the final touch!"
-%   <picture of a cocktail>
-% * key features: saying that ejabberd the only XMPP server is that can do real clustering:
-%   http://www.jivesoftware.org/forums/thread.jspa?threadID=14602
-%   "What I find interesting is that *no* XMPP servers truly provide clustering. This includes all the commercial
-%   servers. The one partial exception appears to be ejabberd, which can cluster certain data such as sessions,
-%   but not all services such as MUC."
-% * try it today: links to migration tutorials

doc/flow.dot

@@ -1,105 +0,0 @@
-digraph messages {
-	//concentrate=true;
-	subgraph clusterclients {
-		client1 [shape = box];
-		client2 [shape = box];
-		client3 [shape = box];
-
-		style = dashed;
-		label = "Clients";
-	}
-
-	subgraph clusternode1 {
-		subgraph clusterc2s1 {
-			c2s11;
-			c2s12;
-			style = invis;
-		}
-		subgraph clusterservices1 {
-			service11;
-			service12;
-			service13;
-			style = invis;
-		}
-		//subgraph clusters2s1 {
-			//s2s11;
-			//s2s12;
-			//style = invis;
-		//}
-		c2s11     -> auth1;
-		c2s12     -> auth1;
-		auth1     -> c2s11;
-		auth1     -> c2s12;
-		c2s11     -> sm1;
-		c2s11     -> router1;
-		c2s12     -> sm1;
-		c2s12     -> router1;
-		router1   -> local1;
-		router1   -> service11;
-		router1   -> service12;
-		router1   -> service13;
-		router1   -> s2s11;
-		router1   -> s2s12;
-		service11 -> router1;
-		service12 -> router1;
-		service13 -> router1;
-		s2s11     -> router1;
-		s2s12     -> router1;
-		local1    -> sm1;
-		sm1       -> c2s11;
-		sm1       -> c2s12;
-
-		style = dashed;
-		label = "Node1";
-	}
-
-	subgraph clusternode2 {
-		c2s2      -> auth2;
-		auth2     -> c2s2;
-		c2s2      -> sm2;
-		c2s2      -> router2;
-		router2   -> local2;
-		router2   -> service21;
-		router2   -> s2s21;
-		service21 -> router2;
-		s2s21     -> router2;
-		local2    -> sm2;
-		sm2       -> c2s2;
-
-		style = dashed;
-		label = "Node2";
-	}
-
-
-
-	subgraph clusterservers {
-		server1 [shape = box];
-		server2 [shape = box];
-		server3 [shape = box];
-
-		style = dashed;
-		label = "Servers";
-	}
-
-
-	client1 -> c2s11;
-	client2 -> c2s12;
-	client3 -> c2s2;
-	c2s11 -> client1 [constraint=false];
-	c2s12 -> client2 [constraint=false];
-	c2s2  -> client3 [constraint=false];
-
-	s2s11 -> server1 [minlen = 2];
-	s2s12 -> server2 [minlen = 2];
-	s2s21 -> server3 [minlen = 2];
-	server1 -> s2s11 [constraint=false];
-	server2 -> s2s12 [constraint=false];
-	server3 -> s2s21 [constraint=false];
-
-	router1 -> router2;
-	router2 -> router1;
-	sm1     -> sm2;
-	sm2     -> sm1;
-
-	label = "Data Flows";
-}

doc/introduction.tex

@@ -1,135 +0,0 @@
-\chapter{Introduction}
-\label{intro}
-
-%% TODO: improve the feature sheet with a nice table to highlight new features.
-
-\quoting{I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. ---
-Joeri} 
-
-%ejabberd is a free and open source instant messaging server written in Erlang. ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication (Jabber/XMPP).
-
-\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang/OTP}.
-
-\ejabberd{} is \marking{cross-platform}, distributed, fault-tolerant, and based on open standards to achieve real-time communication.
-
-\ejabberd{} is designed to be a \marking{rock-solid and feature rich} XMPP server.
-
-\ejabberd{} is suitable for small deployments, whether they need to be \marking{scalable} or not, as well as extremely big deployments.
-
-%\subsection{Layout with example deployment (title needs a better name)}
-%\label{layout}
-
-%In this section there will be a graphical overview like these:\\
-%\verb|http://www.tipic.com/var/timp/timp_dep.gif| \\
-%\verb|http://www.jabber.com/images/jabber_Com_Platform.jpg| \\
-%\verb|http://www.antepo.com/files/OPN45systemdatasheet.pdf| \\
-
-%A page full with names of Jabber client that are known to work with ejabberd. \begin{tiny}tiny font\end{tiny}
-
-%\subsection{Try It Today}
-%\label{trytoday}
-
-%(Not sure if I will include/finish this section for the next version.)
-
-%\begin{itemize}
-%\item Erlang REPOS
-%\item Packages in distributions
-%\item Windows binary
-%\item source tar.gz
-%\item Migration from Jabberd14 (and so also Jabberd2 because you can migrate from version 2 back to 14) and Jabber Inc. XCP possible.
-%\end{itemize}
-
-\newpage
-\section{Key Features}
-\label{keyfeatures}
-\ind{features!key features}
-
-\quoting{Erlang seems to be tailor-made for writing stable, robust servers. ---
-Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
-
-\ejabberd{} is:
-\begin{itemize}
-\item \marking{Cross-platform:} \ejabberd{} runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
-
-\item \marking{Distributed:} You can run \ejabberd{} on a cluster of machines and all of them will serve the same \Jabber{} domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.
-
-\item \marking{Fault-tolerant:} You can deploy an \ejabberd{} cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced `on the fly'.
-
-\item \marking{Administrator Friendly:} \ejabberd{} is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-\begin{itemize}
-\item Comprehensive documentation.
-\item Straightforward installers for Linux, Mac OS X, and Windows. %%\improved{}
-\item Web Administration.
-\item Shared Roster Groups.
-\item Command line administration tool. %%\improved{}
-\item Can integrate with existing authentication mechanisms.
-\item Capability to send announce messages.
-\end{itemize}
-
-\item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-\begin{itemize}
-\item Translated to 25 languages. %%\improved{}
-\item Support for \footahref{http://tools.ietf.org/html/rfc3490}{IDNA}.
-\end{itemize}
-
-\item \marking{Open Standards:} \ejabberd{} is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-\begin{itemize}
-\item Fully XMPP compliant.
-\item XML-based protocol.
-\item \footahref{http://www.ejabberd.im/protocols}{Many protocols supported}.
-\end{itemize}
-
-\end{itemize}
-
-\newpage
-
-\section{Additional Features}
-\label{addfeatures}
-\ind{features!additional features}
-
-\quoting{ejabberd is making inroads to solving the "buggy incomplete server" problem ---
-Justin Karneges, Founder of the Psi and the Delta projects}
-
-Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features:
-\begin{itemize}
-\item Modular
-\begin{itemize}
-\item Load only the modules you want.
-\item Extend \ejabberd{} with your own custom modules.
-\end{itemize}
-\item Security
-\begin{itemize}
-\item SASL and STARTTLS for c2s and s2s connections.
-\item STARTTLS and Dialback s2s connections.
-\item Web Admin accessible via HTTPS secure access.
-\end{itemize}
-\item Databases
-\begin{itemize}
-\item Internal database for fast deployment (Mnesia).
-\item Native MySQL support.
-\item Native PostgreSQL support.
-\item ODBC data storage support.
-\item Microsoft SQL Server support. %%\new{}
-\item Riak NoSQL database support.
-\end{itemize}
-\item Authentication
-\begin{itemize}
-\item Internal Authentication.
-\item PAM, LDAP, ODBC and Riak.  %%\improved{}
-\item External Authentication script.
-\end{itemize}
-\item Others
-\begin{itemize}
-\item Support for virtual hosting.
-\item Compressing XML streams with Stream Compression (\xepref{0138}).
-\item Statistics via Statistics Gathering (\xepref{0039}).
-\item IPv6 support both for c2s and s2s connections.
-\item \txepref{0045}{Multi-User Chat} module with support for clustering and HTML logging. %%\improved{}
-\item Users Directory based on users vCards.
-\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}.
-\item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services.
-\item IRC transport.
-\item SIP support.
-\item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-\end{itemize}
-\end{itemize}

ejabberd.service.template

@@ -7,11 +7,18 @@ User=ejabberd
 Group=ejabberd
 LimitNOFILE=16000
 RestartSec=5
-ExecStart=/bin/sh @ctlscriptpath@/ejabberdctl start
+ExecStart=@ctlscriptpath@/ejabberdctl start
 ExecStop=@ctlscriptpath@/ejabberdctl stop
 ExecReload=@ctlscriptpath@/ejabberdctl reload_config
 Type=oneshot
 RemainAfterExit=yes
+# The CAP_DAC_OVERRIDE capability is required for pam authentication to work
+CapabilityBoundingSet=CAP_DAC_OVERRIDE
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=full
+NoNewPrivileges=true
 
 [Install]
 WantedBy=multi-user.target

ejabberd.yml.example

@@ -1,5 +1,5 @@
 ###
-###               ejabberd configuration file
+###'              ejabberd configuration file
 ###
 ###
 
@@ -24,8 +24,8 @@
 ###   > Art thou not Romeo,
 ###     and a Montague?
 
-###   =======
-###   LOGGING
+###.  =======
+###'  LOGGING
 
 ##
 ## loglevel: Verbosity of log files generated by ejabberd.
@@ -72,9 +72,18 @@ log_rate_limit: 100
 ## watchdog_admins:
 ##   - "bob@example.com"
 
+###.  ===============
+###'  NODE PARAMETERS
 
-###   ================
-###   SERVED HOSTNAMES
+##
+## net_ticktime: Specifies net_kernel tick time in seconds. This options must have
+## identical value on all nodes, and in most cases shouldn't be changed at all from
+## default value.
+##
+## net_ticktime: 60
+
+###.  ================
+###'  SERVED HOSTNAMES
 
 ##
 ## hosts: Domains served by ejabberd.
@@ -94,8 +103,8 @@ hosts:
 ##
 ## route_subdomains: s2s
 
-###   ===============
-###   LISTENING PORTS
+###.  ===============
+###'  LISTENING PORTS
 
 ##
 ## listen: The ports ejabberd will listen on, which service each is handled
@@ -138,6 +147,15 @@ listen:
   ##   access: all
   ##   shaper_rule: fast
   ##   ip: "127.0.0.1"
+  ##   privilege_access: 
+  ##      roster: "both"
+  ##      message: "outgoing"
+  ##      presence: "roster"
+  ##   delegations:
+  ##      "urn:xmpp:mam:1":
+  ##        filtering: ["node"]
+  ##      "http://jabber.org/protocol/pubsub":
+  ##        filtering: []
   ##   hosts:
   ##     "icq.example.org":
   ##       password: "secret"
@@ -158,6 +176,7 @@ listen:
   ## - 
   ##   port: 4560
   ##   module: ejabberd_xmlrpc
+  ##   access_commands: {}
   - 
     port: 5280
     module: ejabberd_http
@@ -169,6 +188,9 @@ listen:
     ## register: true
     captcha: true
 
+###.  ==================
+###'  S2S GLOBAL OPTIONS
+
 ##
 ## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
 ## Allowed values are: false optional required required_trusted
@@ -214,8 +236,8 @@ listen:
 ##   - ipv6
 ## outgoing_s2s_timeout: 10000
 
-###   ==============
-###   AUTHENTICATION
+###.  ==============
+###'  AUTHENTICATION
 
 ##
 ## auth_method: Method used to authenticate the users.
@@ -241,10 +263,10 @@ auth_method: internal
 ## extauth_program: "/path/to/authentication/script"
 
 ##
-## Authentication using ODBC
+## Authentication using SQL
 ## Remember to setup a database in the next section.
 ##
-## auth_method: odbc
+## auth_method: sql
 
 ##
 ## Authentication using PAM
@@ -305,8 +327,8 @@ auth_method: internal
 ##       - internal
 ##       - anonymous
 
-###   ==============
-###   DATABASE SETUP
+###.  ==============
+###'  DATABASE SETUP
 
 ## ejabberd by default uses the internal Mnesia database,
 ## so you do not necessarily need this section.
@@ -317,26 +339,26 @@ auth_method: internal
 ##
 ## MySQL server:
 ##
-## odbc_type: mysql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
+## sql_type: mysql
+## sql_server: "server"
+## sql_database: "database"
+## sql_username: "username"
+## sql_password: "password"
 ##
 ## If you want to specify the port:
-## odbc_port: 1234
+## sql_port: 1234
 
 ##
 ## PostgreSQL server:
 ##
-## odbc_type: pgsql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
+## sql_type: pgsql
+## sql_server: "server"
+## sql_database: "database"
+## sql_username: "username"
+## sql_password: "password"
 ##
 ## If you want to specify the port:
-## odbc_port: 1234
+## sql_port: 1234
 ##
 ## If you use PostgreSQL, have a large database, and need a
 ## faster but inexact replacement for "select count(*) from users"
@@ -346,28 +368,28 @@ auth_method: internal
 ##
 ## SQLite:
 ##
-## odbc_type: sqlite
-## odbc_database: "/path/to/database.db"
+## sql_type: sqlite
+## sql_database: "/path/to/database.db"
 
 ##
 ## ODBC compatible or MSSQL server:
 ##
-## odbc_type: odbc
-## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
+## sql_type: odbc
+## sql_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
 
 ##
 ## Number of connections to open to the database for each virtual host
 ##
-## odbc_pool_size: 10
+## sql_pool_size: 10
 
 ##
 ## Interval to make a dummy SQL request to keep the connections to the
 ## database alive. Specify in seconds: for example 28800 means 8 hours
 ##
-## odbc_keepalive_interval: undefined
+## sql_keepalive_interval: undefined
 
-###   ===============
-###   TRAFFIC SHAPERS
+###.  ===============
+###'  TRAFFIC SHAPERS
 
 shaper:
   ##
@@ -395,14 +417,14 @@ acl:
   ##
   ## admin:
   ##   user:
-  ##     - "aleksey": "localhost"
-  ##     - "ermine": "example.org"
+  ##     - "aleksey@localhost"
+  ##     - "ermine@example.org"
   ##
   ## Blocked users
   ##
   ## blocked:
   ##   user:
-  ##     - "baduser": "example.org"
+  ##     - "baduser@example.org"
   ##     - "test"
 
   ## Local users: don't modify this.
@@ -418,7 +440,7 @@ acl:
   ##     - "jabber.org"
   ## aleksey:
   ##   user:
-  ##     - "aleksey": "jabber.ru"
+  ##     - "aleksey@jabber.ru"
   ## test:
   ##   user_regexp: "^test"
   ##   user_glob: "test*"
@@ -446,61 +468,61 @@ acl:
 ##     acl:
 ##       admin:
 ##         user:
-##           - "bob-local": "localhost"
+##           - "bob-local@localhost"
 
-###   ============
-###   ACCESS RULES
-access:
+###.  ============
+###'  SHAPER RULES
+
+shaper_rules:
   ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions: 
-    all: 10
+  max_user_sessions: 10
   ## Maximum number of offline messages that users can have:
-  max_user_offline_messages: 
-    admin: 5000
-    all: 100
-  ## This rule allows access only for local users:
-  local: 
-    local: allow
-  ## Only non-blocked users can use c2s connections:
-  c2s: 
-    blocked: deny
-    all: allow
+  max_user_offline_messages:
+    - 5000: admin
+    - 100
   ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper: 
-    admin: none
-    all: normal
+  c2s_shaper:
+    - none: admin
+    - normal
   ## All S2S connections use the "fast" shaper
-  s2s_shaper: 
-    all: fast
+  s2s_shaper: fast
+
+###.  ============
+###'  ACCESS RULES
+access_rules:
+  ## This rule allows access only for local users:
+  local:
+    - allow: local
+  ## Only non-blocked users can use c2s connections:
+  c2s:
+    - deny: blocked
+    - allow
   ## Only admins can send announcement messages:
-  announce: 
-    admin: allow
+  announce:
+    - allow: admin
   ## Only admins can use the configuration interface:
   configure: 
-    admin: allow
-  ## Admins of this server are also admins of the MUC service:
-  muc_admin: 
-    admin: allow
+    - allow: admin
   ## Only accounts of the local ejabberd server can create rooms:
   muc_create: 
-    local: allow
-  ## All users are allowed to use the MUC service:
-  muc: 
-    all: allow
+    - allow: local
   ## Only accounts on the local ejabberd server can create Pubsub nodes:
   pubsub_createnode: 
-    local: allow
+    - allow: local
   ## In-band registration allows registration of any possible username.
   ## To disable in-band registration, replace 'allow' with 'deny'.
   register: 
-    all: allow
+    - allow
   ## Only allow to register from localhost
   trusted_network: 
-    loopback: allow
+    - allow: loopback
   ## Do not establish S2S connections with bad servers
   ## s2s: 
-  ##   bad_servers: deny
-  ##   all: allow
+  ##   - deny:
+  ##     - ip: "XXX.XXX.XXX.XXX/32"
+  ##   - deny:
+  ##     - ip: "XXX.XXX.XXX.XXX/32"
+  ##   - allow
 
 ## By default the frequency of account registrations from the same IP
 ## is limited to 1 account every 10 minutes. To disable, specify: infinity
@@ -513,13 +535,13 @@ access:
 ##   "localhost":
 ##     access:
 ##       c2s:
-##         admin: allow
-##         all: deny
+##         - allow: admin
+##         - deny
 ##       register:
-##         all: deny
+##         - deny
 
-###   ================
-###   DEFAULT LANGUAGE
+###.  ================
+###'  DEFAULT LANGUAGE
 
 ##
 ## language: Default language used for server messages.
@@ -533,8 +555,8 @@ language: "en"
 ##   "localhost":
 ##     language: "ru"
 
-###   =======
-###   CAPTCHA
+###.  =======
+###'  CAPTCHA
 
 ##
 ## Full path to a script that generates the image.
@@ -551,8 +573,8 @@ language: "en"
 ##
 ## captcha_limit: 5
 
-###   =======
-###   MODULES
+###.  =======
+###'  MODULES
 
 ##
 ## Modules enabled in all ejabberd virtual hosts.
@@ -565,10 +587,9 @@ modules:
   mod_blocking: {} # requires mod_privacy
   mod_caps: {}
   mod_carboncopy: {}
-  mod_client_state:
-    drop_chat_states: true
-    queue_presence: false
+  mod_client_state: {}
   mod_configure: {} # requires mod_adhoc
+  ##mod_delegation: {} # for xep0356
   mod_disco: {}
   ## mod_echo: {}
   mod_irc: {}
@@ -579,10 +600,12 @@ modules:
   mod_last: {}
   mod_muc: 
     ## host: "conference.@HOST@"
-    access: muc
+    access:
+      - allow
+    access_admin:
+      - allow: admin
     access_create: muc_create
     access_persistent: muc_create
-    access_admin: muc_admin
   ## mod_muc_log: {}
   ## mod_multicast: {}
   mod_offline: 
@@ -605,50 +628,45 @@ modules:
       - "flat"
       - "hometree"
       - "pep" # pep requires mod_caps
-  mod_register: 
+  ## mod_register:
     ##
     ## Protect In-Band account registrations with CAPTCHA.
     ##
-    ## captcha_protected: true
-
+    ##   captcha_protected: true
     ##
     ## Set the minimum informational entropy for passwords.
     ##
-    ## password_strength: 32
-
+    ##   password_strength: 32
     ##
     ## After successful registration, the user receives
     ## a message with this subject and body.
     ##
-    welcome_message: 
-      subject: "Welcome!"
-      body: |-
-        Hi.
-        Welcome to this XMPP server.
-
+    ##   welcome_message:
+    ##     subject: "Welcome!"
+    ##     body: |-
+    ##       Hi.
+    ##       Welcome to this XMPP server.
     ##
     ## When a user registers, send a notification to
     ## these XMPP accounts.
     ##
-    ## registration_watchers:
-    ##   - "admin1@example.org"
-
+    ##   registration_watchers:
+    ##     - "admin1@example.org"
     ##
     ## Only clients in the server machine can register accounts
     ##
-    ip_access: trusted_network
-
+    ##   ip_access: trusted_network
     ##
     ## Local c2s or remote s2s users cannot register accounts
     ##
-    ## access_from: deny
-
-    access: register
+    ##   access_from: deny
+    ##   access: register
   mod_roster: {}
   mod_shared_roster: {}
   mod_stats: {}
   mod_time: {}
-  mod_vcard: {}
+  mod_vcard:
+    search: false
   mod_version: {}
 
 ##
@@ -668,7 +686,9 @@ modules:
 
 allow_contrib_modules: true
 
+###.
+###'
 ### Local Variables:
 ### mode: yaml
 ### End:
-### vim: set filetype=yaml tabstop=8
+### vim: set filetype=yaml tabstop=8 foldmarker=###',###. foldmethod=marker:

ejabberdctl.cfg.example

@@ -169,6 +169,18 @@
 #
 #CONTRIB_MODULES_PATH=/opt/ejabberd-modules
 
+#.
+#' CONTRIB_MODULES_CONF_DIR: configuration directory for contributed modules
+#
+# Specify the full path to the configuration directory for contributed ejabberd
+# modules. In order to configure a module named mod_foo, a mod_foo.yml file can
+# be created in this directory. This file will then be used instead of the
+# default configuration file provided with the module.
+#
+# Default: $CONTRIB_MODULES_PATH/conf
+#
+#CONTRIB_MODULES_CONF_DIR=/etc/ejabberd/modules
+
 #.
 #'
 # vim: foldmarker=#',#. foldmethod=marker:

ejabberdctl.template

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # define default configuration
 POLL=true
@@ -13,11 +13,9 @@ ERLANG_NODE=ejabberd@localhost
 SCRIPT_DIR=`cd ${0%/*} && pwd`
 ERL={{erl}}
 IEX={{bindir}}/iex
-EPMD={{bindir}}/epmd
+EPMD={{epmd}}
 INSTALLUSER={{installuser}}
-
-# Compatibility in ZSH
-#setopt shwordsplit 2>/dev/null
+ERL_LIBS={{libdir}}
 
 # check the proper system user is used if defined
 if [ "$INSTALLUSER" != "" ] ; then
@@ -33,30 +31,31 @@ if [ "$INSTALLUSER" != "" ] ; then
         fi
     done
     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-        EXEC_CMD="sh -c"
+        EXEC_CMD="bash -c"
     fi
     if [ "$EXEC_CMD" = "false" ] ; then
         echo "This command can only be run by root or the user $INSTALLUSER" >&2
         exit 4
     fi
 else
-    EXEC_CMD="sh -c"
+    EXEC_CMD="bash -c"
 fi
 
 # parse command line parameters
-ARGS=""
+declare -a ARGS=()
 while [ $# -ne 0 ] ; do
-    PARAM=$1
+    PARAM="$1"
     shift
     case $PARAM in
         --) break ;;
+        --no-timeout) EJABBERD_NO_TIMEOUT="--no-timeout" ;;
         --node) ERLANG_NODE_ARG=$1 ; shift ;;
         --config-dir) ETC_DIR="$1" ; shift ;;
         --config) EJABBERD_CONFIG_PATH="$1" ; shift ;;
         --ctl-config) EJABBERDCTL_CONFIG_PATH="$1" ; shift ;;
         --logs) LOGS_DIR="$1" ; shift ;;
         --spool) SPOOL_DIR="$1" ; shift ;;
-        *) ARGS="$ARGS $PARAM" ;;
+        *) ARGS=("${ARGS[@]}" "$PARAM") ;;
     esac
 done
 
@@ -84,36 +83,18 @@ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
 fi
 if [ "$ERLANG_NODE_ARG" != "" ] ; then
     ERLANG_NODE=$ERLANG_NODE_ARG
-    NODE=${ERLANG_NODE%@*}
 fi
-if [ "{{release}}" != "true" ] ; then
-    if [ "$EJABBERDDIR" = "" ] ; then
-        EJABBERDDIR={{libdir}}/ejabberd
-    fi
-    if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
-        EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-    fi
-    if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
-        EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-    fi
-    if [ "$EJABBERD_BIN_PATH" = "" ] ; then
-        EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
-    fi
-    if [ "$EJABBERD_SO_PATH" = "" ] ; then
-        EJABBERD_SO_PATH=$EJABBERD_PRIV_PATH/lib
-    fi
-    if [ "$EJABBERD_MSGS_PATH" = "" ] ; then
-        EJABBERD_MSGS_PATH=$EJABBERD_PRIV_PATH/msgs
-    fi
+if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then
+    EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin
 fi
 EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
-SASL_LOG_PATH=$LOGS_DIR/erlang.log
 DATETIME=`date "+%Y%m%d-%H%M%S"`
 ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
 ERL_INETRC=$ETC_DIR/inetrc
 
+# define mnesia options
+MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
 # define erl parameters
-ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
 ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
 KERNEL_OPTS=""
 if [ "$FIREWALL_WINDOW" != "" ] ; then
@@ -151,14 +132,12 @@ fi
 [ -z "$date" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_date '$date'"
 [ -z "$EJABBERD_OPTS" ] || EJABBERD_OPTS="-ejabberd ${EJABBERD_OPTS}"
 
-[ -d $SPOOL_DIR ] || $EXEC_CMD "mkdir -p $SPOOL_DIR"
-cd $SPOOL_DIR
+[ -d "$SPOOL_DIR" ] || $EXEC_CMD "mkdir -p $SPOOL_DIR"
+cd "$SPOOL_DIR"
 
 # export global variables
 export EJABBERD_CONFIG_PATH
-export EJABBERD_MSGS_PATH
 export EJABBERD_LOG_PATH
-export EJABBERD_SO_PATH
 export EJABBERD_BIN_PATH
 export EJABBERD_DOC_PATH
 export EJABBERD_PID_PATH
@@ -168,85 +147,119 @@ export ERL_INETRC
 export ERL_MAX_PORTS
 export ERL_MAX_ETS_TABLES
 export CONTRIB_MODULES_PATH
+export CONTRIB_MODULES_CONF_DIR
+export ERL_LIBS
+
+shell_escape_str()
+{
+    if test $# -eq 0; then
+        printf '"" '
+    else
+        shell_escape "$@"
+    fi
+}
+
+shell_escape()
+{
+    local RES=()
+    for i in "$@"; do
+        if test -z "$i"; then
+            printf '"" '
+        else
+            printf '%q ' "$i"
+        fi
+    done
+}
 
 # start server
 start()
 {
     check_start
-    $EXEC_CMD "$ERL \
-      $NAME $ERLANG_NODE \
-      -noinput -detached \
-      -pa $EJABBERD_EBIN_PATH \
-      -mnesia dir \"\\\"$SPOOL_DIR\\\"\" \
-      $KERNEL_OPTS \
-      $EJABBERD_OPTS \
-      -s ejabberd \
-      -sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \
-      $ERLANG_OPTS $ARGS \"$@\""
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$ERLANG_NODE\"` \
+         -noinput -detached \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # attach to server
 debug()
 {
     debugwarning
-    TTY=`tty | sed -e  's/.*\///g'`
-    $EXEC_CMD "$ERL \
-      $NAME debug-${TTY}-${ERLANG_NODE} \
-      -remsh $ERLANG_NODE \
-      -hidden \
-      $KERNEL_OPTS \
-      $ERLANG_OPTS $ARGS \"$@\""
+    NID=$(uid debug)
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$NID\"` \
+         -remsh $ERLANG_NODE \
+         -hidden \
+         $KERNEL_OPTS \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # attach to server using Elixir
 iexdebug()
 {
     debugwarning
-    TTY=`tty | sed -e  's/.*\///g'`
     # Elixir shell is hidden as default
-    $EXEC_CMD "$IEX \
-      $IEXNAME debug-${TTY}-${ERLANG_NODE} \
-      --remsh $ERLANG_NODE \
-      --erl \"$KERNEL_OPTS\" \
-      --erl \"$ERLANG_OPTS\" --erl \"$ARGS\" --erl \"$@\""
+    NID=$(uid debug)
+    CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"$NID\"` \
+         -remsh $ERLANG_NODE \
+         --erl `shell_escape \"$KERNEL_OPTS\"` \
+         --erl `shell_escape \"$ERLANG_OPTS\"` \
+         --erl `shell_escape \"${ARGS[@]}\"` \
+         --erl `shell_escape_str \"$@\"`"
+    $EXEC_CMD "ERL_PATH=\"$ERL\" $CMD"
 }
 
 # start interactive server
 live()
 {
     livewarning
-    $EXEC_CMD "$ERL \
-      $NAME $ERLANG_NODE \
-      -pa $EJABBERD_EBIN_PATH \
-      -mnesia dir \"\\\"$SPOOL_DIR\\\"\" \
-      $KERNEL_OPTS \
-      $EJABBERD_OPTS \
-      -s ejabberd \
-      $ERLANG_OPTS $ARGS \"$@\""
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"${ERLANG_NODE}\"` \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # start interactive server with Elixir
 iexlive()
 {
     livewarning
-    $EXEC_CMD "$IEX \
-      $IEXNAME $ERLANG_NODE \
-      -pa $EJABBERD_EBIN_PATH \
-      --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
-      --erl \"$KERNEL_OPTS\" \
-      --erl \"$EJABBERD_OPTS\" \
-      --app ejabberd \
-      --erl \"$ERLANG_OPTS\" --erl $ARGS --erl \"$@\""
+    echo $@
+    CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"${ERLANG_NODE}\"` \
+         --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
+         --erl \"`shell_escape \"$KERNEL_OPTS\"`\" \
+         --erl \"`shell_escape \"$EJABBERD_OPTS\"`\" \
+         --app ejabberd \
+         --erl `shell_escape \"$ERLANG_OPTS\"` \
+         --erl `shell_escape \"${ARGS[@]}\"` \
+         --erl `shell_escape_str \"$@\"`"
+    $EXEC_CMD "ERL_PATH=\"$ERL\" $CMD"
 }
 
-etop()
+# start server in the foreground
+foreground()
 {
-    $EXEC_CMD "$ERL \
-      $NAME debug-${TTY}-${ERLANG_NODE} \
-      -hidden -s etop -s erlang halt -output text -node $ERLANG_NODE"
+    check_start
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$ERLANG_NODE\"` \
+         -noinput \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
-# TODO: refactor debug warning and livewarning
 debugwarning()
 {
     if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
@@ -268,7 +281,7 @@ debugwarning()
         echo "Press return to continue"
         read foo
         echo ""
-    fi    
+    fi
 }
 
 livewarning()
@@ -295,16 +308,42 @@ livewarning()
     fi
 }
 
-# TODO: Make iex command display only if ejabberd Elixir support has been enabled
+etop()
+{
+    NID=$(uid top)
+    $EXEC_CMD "$ERL \
+      $NAME $NID \
+      -hidden -s etop -s erlang halt -output text -node $ERLANG_NODE"
+}
+
+ping()
+{
+    [ -z "$1" ] && PEER=${ERLANG_NODE} || PEER=$1
+    if [ "$PEER" = "${PEER%.*}" ] ; then
+        PING_NAME="-sname"
+        PING_NODE=$(hostname -s)
+    else
+        PING_NAME="-name"
+        PING_NODE=$(hostname)
+    fi
+    NID=$(uid ping ${PING_NODE})
+    $EXEC_CMD "$ERL \
+      $PING_NAME $NID \
+      -hidden $KERNEL_OPTS $ERLANG_OPTS \
+      -eval 'io:format(\"~p~n\",[net_adm:ping('\"'\"'$PEER'\"'\"')])' \
+      -s erlang halt -output text -noinput"
+}
+
 help()
 {
     echo ""
     echo "Commands to start an ejabberd node:"
-    echo "  start    Start an ejabberd node in server mode"
-    echo "  debug    Attach an interactive Erlang shell to a running ejabberd node"
-    echo "  iexdebug Attach an interactive Elixir shell to a running ejabberd node"
-    echo "  live     Start an ejabberd node in live (interactive) mode"
-    echo "  iexlive  Start an ejabberd node in live (interactive) mode, within an Elixir shell"
+    echo "  start      Start an ejabberd node in server mode"
+    echo "  debug      Attach an interactive Erlang shell to a running ejabberd node"
+    echo "  iexdebug   Attach an interactive Elixir shell to a running ejabberd node"
+    echo "  live       Start an ejabberd node in live (interactive) mode"
+    echo "  iexlive    Start an ejabberd node in live (interactive) mode, within an Elixir shell"
+    echo "  foreground Start an ejabberd node in server mode (attached)"
     echo ""
     echo "Optional parameters when starting an ejabberd node:"
     echo "  --config-dir dir   Config ejabberd:    $ETC_DIR"
@@ -319,102 +358,42 @@ help()
 # common control function
 ctl()
 {
-    COMMAND=$@
-
-    # Control number of connections identifiers
-    # using flock if available. Expects a linux-style
-    # flock that can lock a file descriptor.
-    MAXCONNID=100
-    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
-    FLOCK='/usr/bin/flock'
-    if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
-        JOT='/usr/bin/jot'
-        if [ ! -x "$JOT" ] ; then
-            # no flock or jot, simply invoke ctlexec()
-            CTL_CONN="ctl-${ERLANG_NODE}"
-            ctlexec $CTL_CONN $COMMAND
-            result=$?
-        else
-            # no flock, but at least there is jot
-            RAND=`jot -r 1 0 $MAXCONNID`
-            CTL_CONN="ctl-${RAND}-${ERLANG_NODE}"
-            ctlexec $CTL_CONN $COMMAND
-            result=$?
-        fi
-    else
-        # we have flock so we get a lock
-        # on one of a limited number of
-        # conn names -- this allows
-        # concurrent invocations using a bound
-        # number of atoms
-        for N in `seq 1 $MAXCONNID`; do
-            CTL_CONN="ejabberdctl-$N"
-            CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
-            (
-                exec 8>"$CTL_LOCKFILE"
-                if flock --nb 8; then
-                    ctlexec $CTL_CONN $COMMAND
-                    ssresult=$?
-                    # segregate from possible flock exit(1)
-                    ssresult=`expr $ssresult \* 10`
-                    exit $ssresult
-                else
-                    exit 1
-                fi
-            )
-            result=$?
-            if [ $result -eq 1 ] ; then
-                # means we errored out in flock
-                # rather than in the exec - stay in the loop
-                # trying other conn names...
-                badlock=1
-            else
-                badlock=""
-                break;
-            fi
-        done
-        result=`expr $result / 10`
-    fi
-
-    if [ "$badlock" ] ;then
-        echo "Ran out of connections to try. Your ejabberd processes" >&2
-        echo "may be stuck or this is a very busy server. For very"   >&2
-        echo "busy servers, consider raising MAXCONNID in ejabberdctl">&2
-        exit 1;
-    fi
-
+    NID=$(uid ctl)
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$NID\"` \
+         -noinput -hidden $KERNEL_OPTS -s ejabberd_ctl \
+         -extra `shell_escape \"$ERLANG_NODE\"` $EJABBERD_NO_TIMEOUT \
+         `shell_escape \"$@\"`"
+    $EXEC_CMD "$CMD"
+    result=$?
     case $result in
-        0) :;;
-        1) :;;
         2) help;;
         3) help;;
+        *) :;;
     esac
     return $result
 }
 
-ctlexec()
+uid()
 {
-    CONN_NAME=$1; shift
-    COMMAND=$@
-    $EXEC_CMD "$ERL \
-      $NAME ${CONN_NAME} \
-      -noinput \
-      -hidden \
-      -pa $EJABBERD_EBIN_PATH \
-      $KERNEL_OPTS \
-      -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
+    uuid=$(uuidgen 2>/dev/null)
+    [ -z "$uuid" -a -f /proc/sys/kernel/random/uuid ] && uuid=$(</proc/sys/kernel/random/uuid)
+    [ -z "$uuid" ] && uuid=$(printf "%X" $RANDOM$(date +%M%S)$$)
+    uuid=${uuid%%-*}
+    [ $# -eq 0 ] && echo ${uuid}-${ERLANG_NODE}
+    [ $# -eq 1 ] && echo ${uuid}-${1}-${ERLANG_NODE}
+    [ $# -eq 2 ] && echo ${uuid}-${1}@${2}
 }
 
 # stop epmd if there is no other running node
 stop_epmd()
 {
-    $EPMD -names 2>/dev/null | grep -q name || epmd -kill >/dev/null
+    "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
 }
 
 # make sure node not already running and node name unregistered
 check_start()
 {
-    $EPMD -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
+    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
         ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {
             echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
             exit 4
@@ -425,22 +404,12 @@ check_start()
                 echo "Shutdown all other erlang nodes, and call 'epmd -kill'."
                 exit 5
             } || {
-                $EPMD -kill >/dev/null
+                "$EPMD" -kill >/dev/null
             }
         }
     }
 }
 
-# cluster setup
-join_cluster()
-{
-    $EJABBERD_BIN_PATH/joincluster $*
-}
-leave_cluster()
-{
-    $EJABBERD_BIN_PATH/leavecluster $*
-}
-
 # allow sync calls
 wait_for_status()
 {
@@ -462,16 +431,16 @@ wait_for_status()
 }
 
 # main handler
-case $ARGS in
-    ' start') start;;
-    ' debug') debug;;
-    ' iexdebug') iexdebug;;
-    ' live') live;;
-    ' iexlive') iexlive;;
-    ' etop') etop;;
-    ' started') wait_for_status 0 30 2;; # wait 30x2s before timeout
-    ' stopped') wait_for_status 3 15 2 && stop_epmd;; # wait 15x2s before timeout
-    ' join_cluster'*) join_cluster ${ARGS# join_cluster};;
-    ' leave_cluster'*) leave_cluster ${ARGS# leave_cluster};;
-    *) ctl $ARGS;;
+case "${ARGS[0]}" in
+    'start') start;;
+    'debug') debug;;
+    'iexdebug') iexdebug;;
+    'live') live;;
+    'iexlive') iexlive;;
+    'foreground') foreground;;
+    'ping'*) ping ${ARGS[1]};;
+    'etop') etop;;
+    'started') wait_for_status 0 30 2;; # wait 30x2s before timeout
+    'stopped') wait_for_status 3 30 2 && stop_epmd;; # wait 30x2s before timeout
+    *) ctl "${ARGS[@]}";;
 esac

include/adhoc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_commands.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -26,23 +26,54 @@
                  {tuple, [rterm()]} | {list, rterm()} |
                  rescode | restuple.
 
+-type oauth_scope() :: atom().
+
+%% ejabberd_commands OAuth ReST ACL definition:
+%% Two fields exist that are used to control access on a command from ReST API:
+%% 1. Policy
+%% If policy is:
+%%  - restricted: command is not exposed as OAuth Rest API.
+%%  - admin: Command is allowed for user that have Admin Rest command enabled by access rule: commands_admin_access
+%%  - user: Command might be called by any server user.
+%%  - open: Command can be called by anyone.
+%%
+%% Policy is just used to control who can call the command. A specific additional access rules can be performed, as
+%% defined by access option.
+%% Access option can be a list of:
+%% - {Module, accessName, DefaultValue}: Reference and existing module access to limit who can use the command.
+%% - AccessRule name: direct name of the access rule to check in config file.
+%% TODO: Access option could be atom command (not a list). In the case, User performing the command, will be added as first parameter
+%% to command, so that the command can perform additional check.
+
 -record(ejabberd_commands,
 	{name                    :: atom(),
          tags = []               :: [atom()] | '_' | '$2',
          desc = ""               :: string() | '_' | '$3',
          longdesc = ""           :: string() | '_',
-	 module                  :: atom(),
-         function                :: atom(),
+	 version = 0             :: integer(),
+	 module                  :: atom() | '_',
+         function                :: atom() | '_',
          args = []               :: [aterm()] | '_' | '$1' | '$2',
-         result = {res, rescode} :: rterm() | '_' | '$2'}).
+         policy = restricted     :: open | restricted | admin | user,
+        %% access is: [accessRuleName] or [{Module, AccessOption, DefaultAccessRuleName}]
+         access = []             :: [{atom(),atom(),atom()}|atom()],
+         result = {res, rescode} :: rterm() | '_' | '$2',
+         args_desc = none        :: none | [string()] | '_',
+         result_desc = none      :: none | string() | '_',
+         args_example = none     :: none | [any()] | '_',
+         result_example = none   :: any()}).
 
+%% TODO Fix me: Type is not up to date
 -type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
                                                 tags :: [atom()],
                                                 desc :: string(),
                                                 longdesc :: string(),
+                                                version :: integer(),
                                                 module :: atom(),
                                                 function :: atom(),
                                                 args :: [aterm()],
+                                                policy :: open | restricted | admin | user,
+                                                access :: [{atom(),atom(),atom()}|atom()],
                                                 result :: rterm()}.
 
 %% @type ejabberd_commands() = #ejabberd_commands{
@@ -71,4 +102,3 @@
 
 %% @type rterm() = {Name::atom(), Type::rtype()}.
 %% A result term is a tuple with the term name and the term type.
-

include/ejabberd_config.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_ctl.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_http.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,25 +19,23 @@
 %%%----------------------------------------------------------------------
 
 -record(request,
-	{method, %            :: method(),
+	{method            :: method(),
 	 path = []         :: [binary()],
 	 q = []            :: [{binary() | nokey, binary()}],
 	 us = {<<>>, <<>>} :: {binary(), binary()},
-	 auth              :: {binary(), binary()} |
-	 {auth_jid, {binary(), binary()}, jlib:jid()},
+	 auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined,
 	 lang = <<"">>     :: binary(),
 	 data = <<"">>     :: binary(),
 	 ip                :: {inet:ip_address(), inet:port_number()},
 	 host = <<"">>     :: binary(),
 	 port = 5280       :: inet:port_number(),
-	 tp = http, %         :: protocol(),
 	 opts = []         :: list(),
+	 tp = http         :: protocol(),
 	 headers = []      :: [{atom() | binary(), binary()}]}).
 
-
 -record(ws,
-	{socket                  :: inet:socket() | p1_tls:tls_socket(),
-	 sockmod = gen_tcp       :: gen_tcp | p1_tls,
+	{socket                  :: inet:socket() | fast_tls:tls_socket(),
+	 sockmod = gen_tcp       :: gen_tcp | fast_tls,
 	 ip                      :: {inet:ip_address(), inet:port_number()},
 	 host = <<"">>           :: binary(),
 	 port = 5280             :: inet:port_number(),
@@ -45,4 +43,9 @@
 	 headers = []            :: [{atom() | binary(), binary()}],
 	 local_path = []         :: [binary()],
 	 q = []                  :: [{binary() | nokey, binary()}],
-	 buf                     :: binary()}).
+	 buf                     :: binary(),
+         http_opts = []          :: list()}).
+
+-type method() :: 'GET' | 'HEAD' | 'DELETE' | 'OPTIONS' | 'PUT' | 'POST' | 'TRACE'.
+-type protocol() :: http | https.
+-type http_request() :: #request{}.

include/ejabberd_oauth.hrl

@@ -0,0 +1,26 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(oauth_token, {
+          token = <<"">>           :: binary() | '_',
+          us = {<<"">>, <<"">>}    :: {binary(), binary()} | '_',
+          scope = []               :: [binary()] | '_',
+          expire                   :: integer() | '$1'
+         }).

include/ejabberd_service.hrl

@@ -0,0 +1,20 @@
+-include("ejabberd.hrl").
+-include("logger.hrl").
+-include("jlib.hrl").
+
+-type filter_attr() :: {binary(), [binary()]}.
+
+-record(state,
+        {socket                    :: ejabberd_socket:socket_state(),
+         sockmod = ejabberd_socket :: ejabberd_socket | ejabberd_frontend_socket,
+         streamid = <<"">>         :: binary(),
+         host_opts = dict:new()    :: ?TDICT,
+         host = <<"">>             :: binary(),
+         access                    :: atom(),
+         check_from = true         :: boolean(),
+         server_hosts = ?MYHOSTS   :: [binary()],
+         privilege_access          :: [attr()],
+         delegations               :: [filter_attr()],
+         last_pres = dict:new()    :: ?TDICT}).
+
+-type(state() :: #state{} ).

include/ejabberd_sm.hrl

@@ -1,7 +1,13 @@
--record(session, {sid, usr, us, priority, info}).
+-ifndef(EJABBERD_SM_HRL).
+-define(EJABBERD_SM_HRL, true).
+
+-record(session, {sid, usr, us, priority, info = []}).
 -record(session_counter, {vhost, count}).
 -type sid() :: {erlang:timestamp(), pid()}.
 -type ip() :: {inet:ip_address(), inet:port_number()} | undefined.
 -type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
-                 | {oor, boolean()} | {auth_module, atom()}].
+                 | {oor, boolean()} | {auth_module, atom()}
+                 | {num_stanzas_in, non_neg_integer()}].
 -type prio() :: undefined | integer().
+
+-endif.

include/ejabberd_sql_pt.hrl

@@ -0,0 +1,33 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-define(SQL_MARK, sql__mark_).
+-define(SQL(SQL), ?SQL_MARK(SQL)).
+
+-define(SQL_UPSERT_MARK, sql_upsert__mark_).
+-define(SQL_UPSERT(Host, Table, Fields),
+        ejabberd_sql:sql_query(Host, ?SQL_UPSERT_MARK(Table, Fields))).
+-define(SQL_UPSERT_T(Table, Fields),
+        ejabberd_sql:sql_query_t(?SQL_UPSERT_MARK(Table, Fields))).
+
+-record(sql_query, {hash, format_query, format_res, args, loc}).
+
+-record(sql_escape, {string, integer, boolean}).
+

include/ejabberd_web_admin.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/eldap.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/http_bind.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -38,9 +38,12 @@
 -define(AC_MAX_AGE,
 	{<<"Access-Control-Max-Age">>, <<"86400">>}).
 
+-define(NO_CACHE,
+        {<<"Cache-Control">>, <<"max-age=0, no-cache, no-store">>}).
+
 -define(OPTIONS_HEADER,
 	[?CT_PLAIN, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_METHODS,
 	 ?AC_ALLOW_HEADERS, ?AC_MAX_AGE]).
 
 -define(HEADER,
-	[?CT_XML, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_HEADERS]).
+	[?CT_XML, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_HEADERS, ?NO_CACHE]).

include/jlib.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -20,9 +20,9 @@
 
 -include("ns.hrl").
 -ifdef(NO_EXT_LIB).
--include("xml.hrl").
+-include("fxml.hrl").
 -else.
--include_lib("p1_xml/include/xml.hrl").
+-include_lib("fast_xml/include/fxml.hrl").
 -endif.
 
 -define(STANZA_ERROR(Code, Type, Condition),

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,8 +18,6 @@
 %%%
 %%%----------------------------------------------------------------------
 -define(PRINT(Format, Args), io:format(Format, Args)).
-
--ifdef(LAGER).
 -compile([{parse_transform, lager_transform}]).
 
 -define(DEBUG(Format, Args),
@@ -37,20 +35,9 @@
 -define(CRITICAL_MSG(Format, Args),
 	lager:critical(Format, Args)).
 
--else.
-
--define(DEBUG(Format, Args),
-	p1_logger:debug_msg(?MODULE, ?LINE, Format, Args)).
-
--define(INFO_MSG(Format, Args),
-	p1_logger:info_msg(?MODULE, ?LINE, Format, Args)).
-
--define(WARNING_MSG(Format, Args),
-	p1_logger:warning_msg(?MODULE, ?LINE, Format, Args)).
-
--define(ERROR_MSG(Format, Args),
-	p1_logger:error_msg(?MODULE, ?LINE, Format, Args)).
-
--define(CRITICAL_MSG(Format, Args),
-	p1_logger:critical_msg(?MODULE, ?LINE, Format, Args)).
--endif.
+%% Use only when trying to troubleshoot test problem with ExUnit
+-define(EXUNIT_LOG(Format, Args),
+        case lists:keyfind(logger, 1, application:loaded_applications()) of
+            false -> ok;
+            _ -> 'Elixir.Logger':bare_log(error, io_lib:format(Format, Args), [?MODULE])
+        end).

include/mod_announce.hrl

@@ -0,0 +1,5 @@
+-record(motd, {server = <<"">> :: binary(),
+               packet = #xmlel{} :: xmlel()}).
+
+-record(motd_users, {us = {<<"">>, <<"">>} :: {binary(), binary()} | '$1',
+                     dummy = [] :: [] | '_'}).

include/mod_caps.hrl

@@ -0,0 +1,4 @@
+-record(caps_features,
+	{node_pair = {<<"">>, <<"">>} :: {binary(), binary()},
+	 features  = []               :: [binary()] | pos_integer()
+	}).

include/mod_carboncopy.hrl

@@ -0,0 +1,4 @@
+-type matchspec_atom() :: '_' | '$1' | '$2' | '$3'.
+-record(carboncopy, {us       :: {binary(), binary()} | matchspec_atom(), 
+		     resource :: binary() | matchspec_atom(),
+		     version  :: binary() | matchspec_atom()}).

include/mod_irc.hrl

@@ -0,0 +1,15 @@
+-type conn_param() :: {binary(), binary(), inet:port_number(), binary()} |
+                      {binary(), binary(), inet:port_number()} |
+                      {binary(), binary()} |
+                      {binary()}.
+
+-type irc_data() :: [{username, binary()} | {connections_params, [conn_param()]}].
+
+-record(irc_connection,
+        {jid_server_host = {#jid{}, <<"">>, <<"">>} :: {jid(), binary(), binary()},
+         pid = self()                               :: pid()}).
+
+-record(irc_custom,
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()},
+                                                  binary()},
+         data = [] :: irc_data()}).

include/mod_last.hrl

@@ -0,0 +1,3 @@
+-record(last_activity, {us = {<<"">>, <<"">>} :: {binary(), binary()},
+                        timestamp = 0 :: non_neg_integer(),
+                        status = <<"">> :: binary()}).

include/mod_mam.hrl

@@ -0,0 +1,15 @@
+-record(archive_msg,
+	{us = {<<"">>, <<"">>}                :: {binary(), binary()} | '$2',
+	 id = <<>>                            :: binary() | '_',
+	 timestamp = p1_time_compat:timestamp() :: erlang:timestamp() | '_' | '$1',
+	 peer = {<<"">>, <<"">>, <<"">>}      :: ljid() | '_' | '$3' | undefined,
+	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid() | '_' | '$3',
+	 packet = #xmlel{}                    :: xmlel() | '_',
+	 nick = <<"">>                        :: binary(),
+	 type = chat                          :: chat | groupchat}).
+
+-record(archive_prefs,
+	{us = {<<"">>, <<"">>} :: {binary(), binary()},
+	 default = never       :: never | always | roster,
+	 always = []           :: [ljid()],
+	 never = []            :: [ljid()]}).

include/mod_muc.hrl

@@ -0,0 +1,33 @@
+%%%----------------------------------------------------------------------
+%%% File    : mod_muc.hrl
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(muc_room, {name_host = {<<"">>, <<"">>} :: {binary(), binary()} |
+                                                   {'_', binary()},
+                   opts = [] :: list() | '_'}).
+
+-record(muc_online_room,
+        {name_host = {<<"">>, <<"">>} :: {binary(), binary()} | '$1' |
+                                         {'_', binary()} | '_',
+         pid = self() :: pid() | '$2' | '_' | '$1'}).
+
+-record(muc_registered,
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
+         nick = <<"">> :: binary()}).

include/mod_muc_room.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -53,15 +53,19 @@
     members_by_default                   = true :: boolean(),
     members_only                         = false :: boolean(),
     allow_user_invites                   = false :: boolean(),
+    allow_subscription                   = false :: boolean(),
     password_protected                   = false :: boolean(),
     password                             = <<"">> :: binary(),
     anonymous                            = true :: boolean(),
+    presence_broadcast                   = [moderator, participant, visitor] ::
+          [moderator | participant | visitor],
     allow_voice_requests                 = true :: boolean(),
     voice_request_min_interval           = 1800 :: non_neg_integer(),
     max_users                            = ?MAX_USERS_DEFAULT :: non_neg_integer() | none,
     logging                              = false :: boolean(),
     vcard                                = <<"">> :: binary(),
-    captcha_whitelist                    = (?SETS):empty() :: ?TGB_SET
+    captcha_whitelist                    = (?SETS):empty() :: ?TGB_SET,
+    mam                                  = false :: boolean()
 }).
 
 -type config() :: #config{}.
@@ -73,9 +77,15 @@
     jid :: jid(),
     nick :: binary(),
     role :: role(),
+    %%is_subscriber = false :: boolean(),
+    %%subscriptions = [] :: [binary()],
     last_presence :: xmlel()
 }).
 
+-record(subscriber, {jid :: jid(),
+		     nick = <<>> :: binary(),
+		     nodes = [] :: [binary()]}).
+
 -record(activity,
 {
     message_time    = 0 :: integer(),
@@ -95,6 +105,8 @@
     jid                     = #jid{} :: jid(),
     config                  = #config{} :: config(),
     users                   = (?DICT):new() :: ?TDICT,
+    subscribers             = (?DICT):new() :: ?TDICT,
+    subscriber_nicks        = (?DICT):new() :: ?TDICT,
     last_voice_request_time = treap:empty() :: treap:treap(),
     robots                  = (?DICT):new() :: ?TDICT,
     nicks                   = (?DICT):new() :: ?TDICT,
@@ -110,8 +122,8 @@
 
 -record(muc_online_users, {us = {<<>>, <<>>} :: {binary(), binary()},
                            resource = <<>> :: binary() | '_',
-                           room = <<>> :: binary() | '_',
-                           host = <<>> :: binary() | '_'}).
+                           room = <<>> :: binary() | '_' | '$1',
+                           host = <<>> :: binary() | '_' | '$2'}).
 
 -type muc_online_users() :: #muc_online_users{}.
 

include/mod_offline.hrl

@@ -0,0 +1,11 @@
+-record(offline_msg,
+	{us = {<<"">>, <<"">>} :: {binary(), binary()},
+	 timestamp = now()     :: erlang:timestamp() | '_',
+	 expire = now()        :: erlang:timestamp() | never | '_',
+	 from = #jid{}         :: jid() | '_',
+	 to = #jid{}           :: jid() | '_',
+	 packet = #xmlel{}     :: xmlel() | '_'}).
+
+-record(state,
+	{host = <<"">> :: binary(),
+	 access_max_offline_messages}).

include/mod_privacy.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_private.hrl

@@ -0,0 +1,4 @@
+-record(private_storage,
+        {usns = {<<"">>, <<"">>, <<"">>} :: {binary(), binary(), binary() |
+                                             '$1' | '_'},
+         xml = #xmlel{} :: xmlel() | '_' | '$1'}).

include/mod_proxy65.hrl

@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_shared_roster.hrl

@@ -0,0 +1,5 @@
+-record(sr_group, {group_host = {<<"">>, <<"">>} :: {'$1' | binary(), '$2' | binary()},
+                   opts = [] :: list() | '_' | '$2'}).
+
+-record(sr_user, {us = {<<"">>, <<"">>} :: {binary(), binary()},
+                  group_host = {<<"">>, <<"">>} :: {binary(), binary()}}).

include/mod_vcard.hrl

@@ -0,0 +1,8 @@
+-record(vcard_search,
+	{us, user, luser, fn, lfn, family, lfamily, given,
+	 lgiven, middle, lmiddle, nickname, lnickname, bday,
+	 lbday, ctry, lctry, locality, llocality, email, lemail,
+	 orgname, lorgname, orgunit, lorgunit}).
+
+-record(vcard, {us = {<<"">>, <<"">>} :: {binary(), binary()} | binary(),
+                vcard = #xmlel{} :: xmlel()}).

include/mod_vcard_xupdate.hrl

@@ -0,0 +1,2 @@
+-record(vcard_xupdate, {us = {<<>>, <<>>} :: {binary(), binary()},
+                        hash = <<>>       :: binary()}).

include/ns.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -35,12 +35,10 @@
 -define(NS_BLOCKING, <<"urn:xmpp:blocking">>).
 -define(NS_PRIVATE, <<"jabber:iq:private">>).
 -define(NS_VERSION, <<"jabber:iq:version">>).
--define(NS_TIME90, <<"jabber:iq:time">>).
 -define(NS_TIME, <<"urn:xmpp:time">>).
 -define(NS_LAST, <<"jabber:iq:last">>).
 -define(NS_XDATA, <<"jabber:x:data">>).
 -define(NS_IQDATA, <<"jabber:iq:data">>).
--define(NS_DELAY91, <<"jabber:x:delay">>).
 -define(NS_DELAY, <<"urn:xmpp:delay">>).
 -define(NS_HINTS, <<"urn:xmpp:hints">>).
 -define(NS_EXPIRE, <<"jabber:x:expire">>).
@@ -133,6 +131,7 @@
 -define(NS_FEATURE_COMPRESS,
 	<<"http://jabber.org/features/compress">>).
 -define(NS_FEATURE_MSGOFFLINE, <<"msgoffline">>).
+-define(NS_FLEX_OFFLINE, <<"http://jabber.org/protocol/offline">>).
 -define(NS_COMPRESS,
 	<<"http://jabber.org/protocol/compress">>).
 -define(NS_CAPS, <<"http://jabber.org/protocol/caps">>).
@@ -143,6 +142,10 @@
 -define(NS_CAPTCHA, <<"urn:xmpp:captcha">>).
 -define(NS_MEDIA, <<"urn:xmpp:media-element">>).
 -define(NS_BOB, <<"urn:xmpp:bob">>).
+-define(NS_MAM_TMP, <<"urn:xmpp:mam:tmp">>).
+-define(NS_MAM_0, <<"urn:xmpp:mam:0">>).
+-define(NS_MAM_1, <<"urn:xmpp:mam:1">>).
+-define(NS_SID_0, <<"urn:xmpp:sid:0">>).
 -define(NS_PING, <<"urn:xmpp:ping">>).
 -define(NS_CARBONS_2, <<"urn:xmpp:carbons:2">>).
 -define(NS_CARBONS_1, <<"urn:xmpp:carbons:1">>).
@@ -150,3 +153,24 @@
 -define(NS_CLIENT_STATE,  <<"urn:xmpp:csi:0">>).
 -define(NS_STREAM_MGMT_2,  <<"urn:xmpp:sm:2">>).
 -define(NS_STREAM_MGMT_3,  <<"urn:xmpp:sm:3">>).
+-define(NS_HTTP_UPLOAD, <<"urn:xmpp:http:upload">>).
+-define(NS_HTTP_UPLOAD_OLD, <<"eu:siacs:conversations:http:upload">>).
+-define(NS_THUMBS_1, <<"urn:xmpp:thumbs:1">>).
+-define(NS_NICK,  <<"http://jabber.org/protocol/nick">>).
+-define(NS_MIX_0, <<"urn:xmpp:mix:0">>).
+-define(NS_MIX_SERVICEINFO_0, <<"urn:xmpp:mix:0#serviceinfo">>).
+-define(NS_MIX_NODES_MESSAGES, <<"urn:xmpp:mix:nodes:messages">>).
+-define(NS_MIX_NODES_PRESENCE, <<"urn:xmpp:mix:nodes:presence">>).
+-define(NS_MIX_NODES_PARTICIPANTS, <<"urn:xmpp:mix:nodes:participants">>).
+-define(NS_MIX_NODES_SUBJECT, <<"urn:xmpp:mix:nodes:subject">>).
+-define(NS_MIX_NODES_CONFIG, <<"urn:xmpp:mix:nodes:config">>).
+-define(NS_PRIVILEGE, <<"urn:xmpp:privilege:1">>).
+-define(NS_DELEGATION, <<"urn:xmpp:delegation:1">>).
+-define(NS_MUCSUB, <<"urn:xmpp:mucsub:0">>).
+-define(NS_MUCSUB_NODES_PRESENCE, <<"urn:xmpp:mucsub:nodes:presence">>).
+-define(NS_MUCSUB_NODES_MESSAGES, <<"urn:xmpp:mucsub:nodes:messages">>).
+-define(NS_MUCSUB_NODES_PARTICIPANTS, <<"urn:xmpp:mucsub:nodes:participants">>).
+-define(NS_MUCSUB_NODES_AFFILIATIONS, <<"urn:xmpp:mucsub:nodes:affiliations">>).
+-define(NS_MUCSUB_NODES_SUBJECT, <<"urn:xmpp:mucsub:nodes:subject">>).
+-define(NS_MUCSUB_NODES_CONFIG, <<"urn:xmpp:mucsub:nodes:config">>).
+-define(NS_MUCSUB_NODES_SYSTEM, <<"urn:xmpp:mucsub:nodes:system">>).

include/pubsub.hrl

@@ -13,12 +13,12 @@
 %%% 
 %%%
 %%% The Initial Developer of the Original Code is ProcessOne.
-%%% Portions created by ProcessOne are Copyright 2006-2015, ProcessOne
+%%% Portions created by ProcessOne are Copyright 2006-2016, ProcessOne
 %%% All Rights Reserved.''
-%%% This software is copyright 2006-2015, ProcessOne.
+%%% This software is copyright 2006-2016, ProcessOne.
 %%%
 %%%
-%%% copyright 2006-2015 ProcessOne
+%%% copyright 2006-2016 ProcessOne
 %%%
 %%% This file contains pubsub types definition.
 %%% ====================================================================
@@ -65,7 +65,7 @@
 %% note: pos_integer() should always be used, but we allow anything else coded
 %% as binary, so one can have a custom implementation of nodetree with custom
 %% indexing (see nodetree_virtual). this also allows to use any kind of key for
-%% indexing nodes, as this can be usefull with external backends such as odbc.
+%% indexing nodes, as this can be usefull with external backends such as sql.
 
 -type(itemId() :: binary()).
 %% @type itemId() = string().
@@ -93,7 +93,12 @@
 
 -type(subOptions() :: [mod_pubsub:subOption(),...]).
 
+-type(pubOption() ::
+    {Option::binary(),
+     Values::[binary()]
+}).
 
+-type(pubOptions() :: [mod_pubsub:pubOption()]).
 
 -type(affiliation() :: 'none'
                      | 'owner'

lib/ct_formatter.ex

@@ -0,0 +1,130 @@
+defmodule ExUnit.CTFormatter do
+  @moduledoc false
+
+  use GenEvent
+
+  import ExUnit.Formatter, only: [format_time: 2, format_test_failure: 5,
+                                  format_test_case_failure: 5]
+
+  def init(opts) do
+    file = File.open! "exunit.log", [:append]
+    # We do not print filter in log file as exclusion of test with tag
+    # pending: true is always done
+    config = %{
+      file: file,
+      seed: opts[:seed],
+      trace: opts[:trace],
+      colors: Keyword.put_new(opts[:colors], :enabled, false),
+      width: 80,
+      tests_counter: 0,
+      failures_counter: 0,
+      skipped_counter: 0,
+      invalids_counter: 0
+    }
+    {:ok, config}
+  end
+
+  def handle_event({:suite_started, _opts}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:suite_finished, run_us, load_us}, config) do
+    print_suite(config, run_us, load_us)
+    File.close config[:file]
+    :remove_handler
+  end
+
+  def handle_event({:test_started, %ExUnit.Test{} = test}, config) do
+    if config.tests_counter == 0, do: IO.binwrite config[:file], "== Running #{test.case} ==\n\n"
+    {:ok, config}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: nil} = _test}, config) do
+    IO.binwrite config[:file], "."
+    {:ok, %{config | tests_counter: config.tests_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:skip, _}} = _test}, config) do
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     skipped_counter: config.skipped_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:invalid, _}} = _test}, config) do
+    IO.binwrite config[:file], "?"
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     invalids_counter: config.invalids_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:failed, failures}} = test}, config) do
+    formatted = format_test_failure(test, failures, config.failures_counter + 1,
+                                    config.width, &formatter(&1, &2, config))
+    print_failure(formatted, config)
+    print_logs(test.logs)
+
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     failures_counter: config.failures_counter + 1}}
+  end
+
+  def handle_event({:case_started, %ExUnit.TestCase{}}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:case_finished, %ExUnit.TestCase{state: nil}}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:case_finished, %ExUnit.TestCase{state: {:failed, failures}} = test_case}, config) do
+    formatted = format_test_case_failure(test_case, failures, config.failures_counter + 1,
+                                         config.width, &formatter(&1, &2, config))
+    print_failure(formatted, config)
+    {:ok, %{config | failures_counter: config.failures_counter + 1}}
+  end
+
+  ## Printing
+
+  defp print_suite(config, run_us, load_us) do
+    IO.binwrite config[:file], "\n\n"
+    IO.binwrite config[:file], format_time(run_us, load_us)
+    IO.binwrite config[:file], "\n\n"
+
+    # singular/plural
+    test_pl = pluralize(config.tests_counter, "test", "tests")
+    failure_pl = pluralize(config.failures_counter, "failure", "failures")
+
+    message =
+      "#{config.tests_counter} #{test_pl}, #{config.failures_counter} #{failure_pl}"
+      |> if_true(config.skipped_counter > 0, & &1 <> ", #{config.skipped_counter} skipped")
+      |> if_true(config.invalids_counter > 0, & &1 <> ", #{config.invalids_counter} invalid")
+
+    cond do
+      config.failures_counter > 0 -> IO.binwrite config[:file], message
+      config.invalids_counter > 0 -> IO.binwrite config[:file], message
+      true                        -> IO.binwrite config[:file], message
+    end
+
+    IO.binwrite config[:file], "\nRandomized with seed #{config.seed}\n\n\n\n"
+  end
+
+  defp if_true(value, false, _fun), do: value
+  defp if_true(value, true, fun), do: fun.(value)
+
+  defp print_failure(formatted, config) do
+    IO.binwrite config[:file], "\n"
+    IO.binwrite config[:file], formatted
+    IO.binwrite config[:file], "\n"
+  end
+
+  defp formatter(_,  msg, _config),
+    do: msg
+
+  defp pluralize(1, singular, _plural), do: singular
+  defp pluralize(_, _singular, plural), do: plural
+
+  defp print_logs(""), do: nil
+
+  defp print_logs(output) do
+    indent = "\n     "
+    output = String.replace(output, "\n", indent)
+    IO.puts(["     The following output was logged:", indent | output])
+  end
+end

lib/ejabberd.ex

@@ -1,2 +0,0 @@
-defmodule Ejabberd do
-end

lib/ejabberd/config/attr.ex

@@ -0,0 +1,119 @@
+defmodule Ejabberd.Config.Attr do
+  @moduledoc """
+  Module used to work with the attributes parsed from
+  an elixir block (do...end).
+
+  Contains functions for extracting attrs from a block
+  and validation.
+  """
+
+  @type attr :: {atom(), any()}
+
+  @attr_supported [
+    active:
+      [type: :boolean, default: true],
+    git:
+      [type: :string, default: ""],
+    name:
+      [type: :string, default: ""],
+    opts:
+      [type: :list, default: []],
+    dependency:
+      [type: :list, default: []]
+  ]
+
+  @doc """
+  Takes a block with annotations and extracts the list
+  of attributes.
+  """
+  @spec extract_attrs_from_block_with_defaults(any()) :: [attr]
+  def extract_attrs_from_block_with_defaults(block) do
+    block
+    |> extract_attrs_from_block
+    |> put_into_list_if_not_already
+    |> insert_default_attrs_if_missing
+  end
+
+  @doc """
+  Takes an attribute or a list of attrs and validate them.
+
+  Returns a {:ok, attr} or {:error, attr, cause} for each of the attributes.
+  """
+  @spec validate([attr]) :: [{:ok, attr}] | [{:error, attr, atom()}]
+  def validate(attrs) when is_list(attrs), do: Enum.map(attrs, &valid_attr?/1)
+  def validate(attr), do: validate([attr]) |> List.first
+
+  @doc """
+  Returns the type of an attribute, given its name.
+  """
+  @spec get_type_for_attr(atom()) :: atom()
+  def get_type_for_attr(attr_name) do
+    @attr_supported
+    |> Keyword.get(attr_name)
+    |> Keyword.get(:type)
+  end
+
+  @doc """
+  Returns the default value for an attribute, given its name.
+  """
+  @spec get_default_for_attr(atom()) :: any()
+  def get_default_for_attr(attr_name) do
+    @attr_supported
+    |> Keyword.get(attr_name)
+    |> Keyword.get(:default)
+  end
+
+  # Private API
+
+  # Given an elixir block (do...end) returns a list with the annotations
+  # or a single annotation.
+  @spec extract_attrs_from_block(any()) :: [attr] | attr
+  defp extract_attrs_from_block({:__block__, [], attrs}), do: Enum.map(attrs, &extract_attrs_from_block/1)
+  defp extract_attrs_from_block({:@, _, [attrs]}), do: extract_attrs_from_block(attrs)
+  defp extract_attrs_from_block({attr_name, _, [value]}), do: {attr_name, value}
+  defp extract_attrs_from_block(nil), do: []
+
+  # In case extract_attrs_from_block returns a single attribute,
+  # then put it into a list. (Ensures attrs are always into a list).
+  @spec put_into_list_if_not_already([attr] | attr) :: [attr]
+  defp put_into_list_if_not_already(attrs) when is_list(attrs), do: attrs
+  defp put_into_list_if_not_already(attr), do: [attr]
+
+  # Given a list of attributes, it inserts the missing attribute with their
+  # default value.
+  @spec insert_default_attrs_if_missing([attr]) :: [attr]
+  defp insert_default_attrs_if_missing(attrs) do
+    Enum.reduce @attr_supported, attrs, fn({attr_name, _}, acc) ->
+      case Keyword.has_key?(acc, attr_name) do
+        true -> acc
+        false -> Keyword.put(acc, attr_name, get_default_for_attr(attr_name))
+      end
+    end
+  end
+
+  # Given an attribute, validates it and return a tuple with
+  # {:ok, attr} or {:error, attr, cause}
+  @spec valid_attr?(attr) :: {:ok, attr} | {:error, attr, atom()}
+  defp valid_attr?({attr_name, param} = attr) do
+    case Keyword.get(@attr_supported, attr_name) do
+      nil -> {:error, attr, :attr_not_supported}
+      [{:type, param_type} | _] -> case is_of_type?(param, param_type) do
+        true -> {:ok, attr}
+        false -> {:error, attr, :type_not_supported}
+      end
+    end
+  end
+
+  # Given an attribute value and a type, it returns a true
+  # if the value its of the type specified, false otherwise.
+
+  # Usefoul for checking if an attr value respects the type
+  # specified for the annotation.
+  @spec is_of_type?(any(), atom()) :: boolean()
+  defp is_of_type?(param, type) when type == :boolean and is_boolean(param), do: true
+  defp is_of_type?(param, type) when type == :string and is_bitstring(param), do: true
+  defp is_of_type?(param, type) when type == :list and is_list(param), do: true
+  defp is_of_type?(param, type) when type == :atom and is_atom(param), do: true
+  defp is_of_type?(_param, type) when type == :any, do: true
+  defp is_of_type?(_, _), do: false
+end

lib/ejabberd/config/config.ex

@@ -0,0 +1,145 @@
+defmodule Ejabberd.Config do
+  @moduledoc """
+  Base module for configuration file.
+
+  Imports macros for the config DSL and contains functions
+  for working/starting the configuration parsed.
+  """
+
+  alias Ejabberd.Config.EjabberdModule
+  alias Ejabberd.Config.Attr
+  alias Ejabberd.Config.EjabberdLogger
+
+  defmacro __using__(_opts) do
+    quote do
+      import Ejabberd.Config, only: :macros
+      import Ejabberd.Logger
+
+      @before_compile Ejabberd.Config
+    end
+  end
+
+  # Validate the modules parsed and log validation errors at compile time.
+  # Could be also possible to interrupt the compilation&execution by throwing
+  # an exception if necessary.
+  def __before_compile__(_env) do
+    get_modules_parsed_in_order
+    |> EjabberdModule.validate
+    |> EjabberdLogger.log_errors
+  end
+
+  @doc """
+  Given the path of the config file, it evaluates it.
+  """
+  def init(file_path, force \\ false) do
+    init_already_executed = Ejabberd.Config.Store.get(:module_name) != []
+
+    case force do
+      true ->
+        Ejabberd.Config.Store.stop
+        Ejabberd.Config.Store.start_link
+        do_init(file_path)
+      false ->
+        if not init_already_executed, do: do_init(file_path)
+    end
+  end
+
+  @doc """
+  Returns a list with all the opts, formatted for ejabberd.
+  """
+  def get_ejabberd_opts do
+    get_general_opts
+    |> Dict.put(:modules, get_modules_parsed_in_order())
+    |> Dict.put(:listeners, get_listeners_parsed_in_order())
+    |> Ejabberd.Config.OptsFormatter.format_opts_for_ejabberd
+  end
+
+  @doc """
+  Register the hooks defined inside the elixir config file.
+  """
+  def start_hooks do
+    get_hooks_parsed_in_order()
+    |> Enum.each(&Ejabberd.Config.EjabberdHook.start/1)
+  end
+
+  ###
+  ### MACROS
+  ###
+
+  defmacro listen(module, do: block) do
+    attrs = Attr.extract_attrs_from_block_with_defaults(block)
+
+    quote do
+      Ejabberd.Config.Store.put(:listeners, %EjabberdModule{
+        module: unquote(module),
+        attrs: unquote(attrs)
+      })
+    end
+  end
+
+  defmacro module(module, do: block) do
+    attrs = Attr.extract_attrs_from_block_with_defaults(block)
+
+    quote do
+      Ejabberd.Config.Store.put(:modules, %EjabberdModule{
+        module: unquote(module),
+        attrs: unquote(attrs)
+      })
+    end
+  end
+
+  defmacro hook(hook_name, opts, fun) do
+    quote do
+      Ejabberd.Config.Store.put(:hooks, %Ejabberd.Config.EjabberdHook{
+        hook: unquote(hook_name),
+        opts: unquote(opts),
+        fun: unquote(fun)
+      })
+    end
+  end
+
+  # Private API
+
+  defp do_init(file_path) do
+    # File evaluation
+    Code.eval_file(file_path) |> extract_and_store_module_name()
+
+    # Getting start/0 config
+    Ejabberd.Config.Store.get(:module_name)
+    |> case do
+      nil -> IO.puts "[ ERR ] Configuration module not found."
+      [module] -> call_start_func_and_store_data(module)
+    end
+
+    # Fetching git modules and install them
+    get_modules_parsed_in_order()
+    |> EjabberdModule.fetch_git_repos
+  end
+
+  # Returns the modules from the store
+  defp get_modules_parsed_in_order,
+    do: Ejabberd.Config.Store.get(:modules) |> Enum.reverse
+
+  # Returns the listeners from the store
+  defp get_listeners_parsed_in_order,
+    do: Ejabberd.Config.Store.get(:listeners) |> Enum.reverse
+
+  defp get_hooks_parsed_in_order,
+    do: Ejabberd.Config.Store.get(:hooks) |> Enum.reverse
+
+  # Returns the general config options
+  defp get_general_opts,
+    do: Ejabberd.Config.Store.get(:general) |> List.first
+
+  # Gets the general ejabberd options calling
+  # the start/0 function and stores them.
+  defp call_start_func_and_store_data(module) do
+    opts = apply(module, :start, [])
+    Ejabberd.Config.Store.put(:general, opts)
+  end
+
+  # Stores the configuration module name
+  defp extract_and_store_module_name({{:module, mod, _bytes, _}, _}) do
+    Ejabberd.Config.Store.put(:module_name, mod)
+  end
+end

lib/ejabberd/config/ejabberd_hook.ex

@@ -0,0 +1,23 @@
+defmodule Ejabberd.Config.EjabberdHook do
+  @moduledoc """
+  Module containing functions for manipulating
+  ejabberd hooks.
+  """
+
+  defstruct hook: nil, opts: [], fun: nil
+
+  alias Ejabberd.Config.EjabberdHook
+
+  @type t :: %EjabberdHook{}
+
+  @doc """
+  Register a hook to ejabberd.
+  """
+  @spec start(EjabberdHook.t) :: none
+  def start(%EjabberdHook{hook: hook, opts: opts, fun: fun}) do
+    host = Keyword.get(opts, :host, :global)
+    priority = Keyword.get(opts, :priority, 50)
+
+    :ejabberd_hooks.add(hook, host, fun, priority)
+  end
+end

lib/ejabberd/config/ejabberd_module.ex

@@ -0,0 +1,70 @@
+defmodule Ejabberd.Config.EjabberdModule do
+  @moduledoc """
+  Module representing a module block in the configuration file.
+  It offers functions for validation and for starting the modules.
+
+  Warning: The name is EjabberdModule to not collide with
+  the already existing Elixir.Module.
+  """
+
+  @type t :: %{module: atom, attrs: [Attr.t]}
+
+  defstruct [:module, :attrs]
+
+  alias Ejabberd.Config.EjabberdModule
+  alias Ejabberd.Config.Attr
+  alias Ejabberd.Config.Validation
+
+  @doc """
+  Given a list of modules / single module
+  it runs different validators on them.
+
+  For each module, returns a {:ok, mod} or {:error, mod, errors}
+  """
+  def validate(modules) do
+    Validation.validate(modules)
+  end
+
+  @doc """
+  Given a list of modules, it takes only the ones with
+  a git attribute and tries to fetch the repo,
+  then, it install them through :ext_mod.install/1
+  """
+  @spec fetch_git_repos([EjabberdModule.t]) :: none()
+  def fetch_git_repos(modules) do
+    modules
+    |> Enum.filter(&is_git_module?/1)
+    |> Enum.each(&fetch_and_install_git_module/1)
+  end
+
+  # Private API
+
+  defp is_git_module?(%EjabberdModule{attrs: attrs}) do
+    case Keyword.get(attrs, :git) do
+      "" -> false
+      repo -> String.match?(repo, ~r/((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?)([\w\.@\:\/\-~]+)(\.git)(\/)?/)
+    end
+  end
+
+  defp fetch_and_install_git_module(%EjabberdModule{attrs: attrs}) do
+    repo = Keyword.get(attrs, :git)
+    mod_name = case Keyword.get(attrs, :name) do
+      "" -> infer_mod_name_from_git_url(repo)
+      name -> name
+    end
+
+    path = "#{:ext_mod.modules_dir()}/sources/ejabberd-contrib\/#{mod_name}"
+    fetch_and_store_repo_source_if_not_exists(path, repo)
+    :ext_mod.install(mod_name) # Have to check if overwrites an already present mod
+  end
+
+  defp fetch_and_store_repo_source_if_not_exists(path, repo) do
+    unless File.exists?(path) do
+      IO.puts "[info] Fetching: #{repo}"
+      :os.cmd('git clone #{repo} #{path}')
+    end
+  end
+
+  defp infer_mod_name_from_git_url(repo),
+    do: String.split(repo, "/") |> List.last |> String.replace(".git", "")
+end

lib/ejabberd/config/logger/ejabberd_logger.ex

@@ -0,0 +1,32 @@
+defmodule Ejabberd.Config.EjabberdLogger do
+  @moduledoc """
+  Module used to log validation errors given validated modules
+  given validated modules.
+  """
+
+  alias Ejabberd.Config.EjabberdModule
+
+  @doc """
+  Given a list of modules validated, in the form of {:ok, mod} or
+  {:error, mod, errors}, it logs to the user the errors found.
+  """
+  @spec log_errors([EjabberdModule.t]) :: [EjabberdModule.t]
+  def log_errors(modules_validated) when is_list(modules_validated) do
+    Enum.each modules_validated, &do_log_errors/1
+    modules_validated
+  end
+
+  defp do_log_errors({:ok, _mod}), do: nil
+  defp do_log_errors({:error, _mod, errors}), do: Enum.each errors, &do_log_errors/1
+  defp do_log_errors({:attribute, errors}), do: Enum.each errors, &log_attribute_error/1
+  defp do_log_errors({:dependency, errors}), do: Enum.each errors, &log_dependency_error/1
+
+  defp log_attribute_error({{attr_name, val}, :attr_not_supported}), do:
+    IO.puts "[ WARN ] Annotation @#{attr_name} is not supported."
+
+  defp log_attribute_error({{attr_name, val}, :type_not_supported}), do:
+    IO.puts "[ WARN ] Annotation @#{attr_name} with value #{inspect val} is not supported (type mismatch)."
+
+  defp log_dependency_error({module, :not_found}), do:
+    IO.puts "[ WARN ] Module #{inspect module} was not found, but is required as a dependency."
+end

lib/ejabberd/config/opts_formatter.ex

@@ -0,0 +1,46 @@
+defmodule Ejabberd.Config.OptsFormatter do
+  @moduledoc """
+  Module for formatting options parsed into the format
+  ejabberd uses.
+  """
+
+  alias Ejabberd.Config.EjabberdModule
+
+  @doc """
+  Takes a keyword list with keys corresponding to
+  the keys requested by the ejabberd config (ex: modules: mods)
+  and formats them to be correctly evaluated by ejabberd.
+
+  Look at how Config.get_ejabberd_opts/0 is constructed for
+  more informations.
+  """
+  @spec format_opts_for_ejabberd([{atom(), any()}]) :: list()
+  def format_opts_for_ejabberd(opts) do
+    opts
+    |> format_attrs_for_ejabberd
+  end
+
+  defp format_attrs_for_ejabberd(opts) when is_list(opts),
+    do: Enum.map opts, &format_attrs_for_ejabberd/1
+
+  defp format_attrs_for_ejabberd({:listeners, mods}),
+    do: {:listen, format_listeners_for_ejabberd(mods)}
+
+  defp format_attrs_for_ejabberd({:modules, mods}),
+    do: {:modules, format_mods_for_ejabberd(mods)}
+
+  defp format_attrs_for_ejabberd({key, opts}) when is_atom(key),
+    do: {key, opts}
+
+  defp format_mods_for_ejabberd(mods) do
+    Enum.map mods, fn %EjabberdModule{module: mod, attrs: attrs} ->
+      {mod, attrs[:opts]}
+    end
+  end
+
+  defp format_listeners_for_ejabberd(mods) do
+    Enum.map mods, fn %EjabberdModule{module: mod, attrs: attrs} ->
+      Keyword.put(attrs[:opts], :module, mod)
+    end
+  end
+end

lib/ejabberd/config/store.ex

@@ -0,0 +1,55 @@
+defmodule Ejabberd.Config.Store do
+  @moduledoc """
+    Module used for storing the modules parsed from
+    the configuration file.
+
+    Example:
+      - Store.put(:modules, mod1)
+      - Store.put(:modules, mod2)
+
+      - Store.get(:modules) :: [mod1, mod2]
+
+    Be carefoul: when retrieving data you get them
+    in the order inserted into the store, which normally
+    is the reversed order of how the modules are specified
+    inside the configuration file. To resolve this just use
+    a Enum.reverse/1.
+  """
+
+  @name __MODULE__
+
+  def start_link do
+    Agent.start_link(fn -> %{} end, name: @name)
+  end
+
+  @doc """
+  Stores a value based on the key. If the key already exists,
+  then it inserts the new element, maintaining all the others.
+  It uses a list for this.
+  """
+  @spec put(atom, any) :: :ok
+  def put(key, val) do
+    Agent.update @name, &Map.update(&1, key, [val], fn coll ->
+      [val | coll]
+    end)
+  end
+
+  @doc """
+  Gets a value based on the key passed.
+  Returns always a list.
+  """
+  @spec get(atom) :: [any]
+  def get(key) do
+    Agent.get @name, &Map.get(&1, key, [])
+  end
+
+  @doc """
+  Stops the store.
+  It uses Agent.stop underneath, so be aware that exit
+  could be called.
+  """
+  @spec stop() :: :ok
+  def stop do
+    Agent.stop @name
+  end
+end

lib/ejabberd/config/validator/validation.ex

@@ -0,0 +1,40 @@
+defmodule Ejabberd.Config.Validation do
+  @moduledoc """
+  Module used to validate a list of modules.
+  """
+
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
+  @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
+
+  alias Ejabberd.Config.EjabberdModule
+  alias Ejabberd.Config.Attr
+  alias Ejabberd.Config.Validator
+  alias Ejabberd.Config.ValidatorUtility
+
+  @doc """
+  Given a module or a list of modules it runs validators on them
+  and returns {:ok, mod} or {:error, mod, errors}, for each
+  of them.
+  """
+  @spec validate([EjabberdModule.t] | EjabberdModule.t) :: [mod_validation_result]
+  def validate(modules) when is_list(modules), do: Enum.map(modules, &do_validate(modules, &1))
+  def validate(module), do: validate([module])
+
+  # Private API
+
+  @spec do_validate([EjabberdModule.t], EjabberdModule.t) :: mod_validation_result
+  defp do_validate(modules, mod) do
+    {modules, mod, %{}}
+    |> Validator.Attrs.validate
+    |> Validator.Dependencies.validate
+    |> resolve_validation_result
+  end
+
+  @spec resolve_validation_result(mod_validation) :: mod_validation_result
+  defp resolve_validation_result({_modules, mod, errors}) do
+    case errors do
+      err when err == %{} -> {:ok, mod}
+      err -> {:error, mod, err}
+    end
+  end
+end

lib/ejabberd/config/validator/validator_attrs.ex

@@ -0,0 +1,28 @@
+defmodule Ejabberd.Config.Validator.Attrs do
+  @moduledoc """
+  Validator module used to validate attributes.
+  """
+
+  # TODO: Duplicated from validator.ex !!!
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
+
+  import Ejabberd.Config.ValidatorUtility
+  alias Ejabberd.Config.Attr
+
+  @doc """
+  Given a module (with the form used for validation)
+  it runs Attr.validate/1 on each attribute and
+  returns the validation tuple with the errors updated, if found.
+  """
+  @spec validate(mod_validation) :: mod_validation
+  def validate({modules, mod, errors}) do
+    errors = Enum.reduce mod.attrs, errors, fn(attr, err) ->
+      case Attr.validate(attr) do
+        {:ok, attr} -> err
+        {:error, attr, cause} -> put_error(err, :attribute, {attr, cause})
+      end
+    end
+
+    {modules, mod, errors}
+  end
+end

lib/ejabberd/config/validator/validator_dependencies.ex

@@ -0,0 +1,30 @@
+defmodule Ejabberd.Config.Validator.Dependencies do
+  @moduledoc """
+  Validator module used to validate dependencies specified
+  with the @dependency annotation.
+  """
+
+  # TODO: Duplicated from validator.ex !!!
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
+  import Ejabberd.Config.ValidatorUtility
+
+  @doc """
+  Given a module (with the form used for validation)
+  it checks if the @dependency annotation is respected and
+  returns the validation tuple with the errors updated, if found.
+  """
+  @spec validate(mod_validation) :: mod_validation
+  def validate({modules, mod, errors}) do
+    module_names = extract_module_names(modules)
+    dependencies = mod.attrs[:dependency]
+
+    errors = Enum.reduce dependencies, errors, fn(req_module, err) ->
+      case req_module in module_names do
+        true -> err
+        false -> put_error(err, :dependency, {req_module, :not_found})
+      end
+    end
+
+    {modules, mod, errors}
+  end
+end

lib/ejabberd/config/validator/validator_utility.ex

@@ -0,0 +1,30 @@
+defmodule Ejabberd.Config.ValidatorUtility do
+  @moduledoc """
+  Module used as a base validator for validation modules.
+  Imports utility functions for working with validation structures.
+  """
+
+  alias Ejabberd.Config.EjabberdModule
+
+  @doc """
+  Inserts an error inside the errors collection, for the given key.
+  If the key doesn't exists then it creates an empty collection
+  and inserts the value passed.
+  """
+  @spec put_error(map, atom, any) :: map
+  def put_error(errors, key, val) do
+    Map.update errors, key, [val], fn coll ->
+      [val | coll]
+    end
+  end
+
+  @doc """
+  Given a list of modules it extracts and returns a list
+  of the module names (which are Elixir.Module).
+  """
+  @spec extract_module_names(EjabberdModule.t) :: [atom]
+  def extract_module_names(modules) when is_list(modules) do
+    modules
+    |> Enum.map(&Map.get(&1, :module))
+  end
+end

lib/ejabberd/config_util.ex

@@ -0,0 +1,18 @@
+defmodule Ejabberd.ConfigUtil do
+  @moduledoc """
+  Module containing utility functions for
+  the config file.
+  """
+
+  @doc """
+  Returns true when the config file is based on elixir.
+  """
+  @spec is_elixir_config(list) :: boolean
+  def is_elixir_config(filename) when is_list(filename) do
+    is_elixir_config(to_string(filename))
+  end
+
+  def is_elixir_config(filename) do
+    String.ends_with?(filename, "exs")
+  end
+end

lib/ejabberd/module.ex

@@ -0,0 +1,19 @@
+defmodule Ejabberd.Module do
+
+  defmacro __using__(opts) do
+    logger_enabled = Keyword.get(opts, :logger, true)
+
+    quote do
+      @behaviour :gen_mod
+      import Ejabberd.Module
+
+      unquote(if logger_enabled do
+        quote do: import Ejabberd.Logger
+      end)
+    end
+  end
+
+  # gen_mod callbacks
+  def depends(_host, _opts), do: []
+  def mod_opt_type(_), do: []
+end

lib/mix/tasks/deps.tree.ex

@@ -0,0 +1,94 @@
+defmodule Mix.Tasks.Ejabberd.Deps.Tree do
+  use Mix.Task
+
+  alias Ejabberd.Config.EjabberdModule
+
+  @shortdoc "Lists all ejabberd modules and their dependencies"
+
+  @moduledoc """
+  Lists all ejabberd modules and their dependencies.
+
+  The project must have ejabberd as a dependency.
+  """
+
+  def run(_argv) do
+    # First we need to start manually the store to be available
+    # during the compilation of the config file.
+    Ejabberd.Config.Store.start_link
+    Ejabberd.Config.init(:ejabberd_config.get_ejabberd_config_path())
+
+    Mix.shell.info "ejabberd modules"
+
+    Ejabberd.Config.Store.get(:modules)
+    |> Enum.reverse # Because of how mods are stored inside the store
+    |> format_mods
+    |> Mix.shell.info
+  end
+
+  defp format_mods(mods) when is_list(mods) do
+    deps_tree = build_dependency_tree(mods)
+    mods_used_as_dependency = get_mods_used_as_dependency(deps_tree)
+
+    keep_only_mods_not_used_as_dep(deps_tree, mods_used_as_dependency)
+    |> format_mods_into_string
+  end
+
+  defp build_dependency_tree(mods) do
+    Enum.map mods, fn %EjabberdModule{module: mod, attrs: attrs} ->
+      deps = attrs[:dependency]
+      build_dependency_tree(mods, mod, deps)
+    end
+  end
+
+  defp build_dependency_tree(mods, mod, []), do: %{module: mod, dependency: []}
+  defp build_dependency_tree(mods, mod, deps) when is_list(deps) do
+    dependencies = Enum.map deps, fn dep ->
+      dep_deps = get_dependencies_of_mod(mods, dep)
+      build_dependency_tree(mods, dep, dep_deps)
+    end
+
+    %{module: mod, dependency: dependencies}
+  end
+
+  defp get_mods_used_as_dependency(mods) when is_list(mods) do
+    Enum.reduce mods, [], fn(mod, acc) ->
+      case mod do
+        %{dependency: []} -> acc
+        %{dependency: deps} -> get_mod_names(deps) ++ acc
+      end
+    end
+  end
+
+  defp get_mod_names([]), do: []
+  defp get_mod_names(mods) when is_list(mods), do: Enum.map(mods, &get_mod_names/1) |> List.flatten
+  defp get_mod_names(%{module: mod, dependency: deps}), do: [mod | get_mod_names(deps)]
+
+  defp keep_only_mods_not_used_as_dep(mods, mods_used_as_dep) do
+    Enum.filter mods, fn %{module: mod} ->
+      not mod in mods_used_as_dep
+    end
+  end
+
+  defp get_dependencies_of_mod(deps, mod_name) do
+    Enum.find(deps, &(Map.get(&1, :module) == mod_name))
+    |> Map.get(:attrs)
+    |> Keyword.get(:dependency)
+  end
+
+  defp format_mods_into_string(mods), do: format_mods_into_string(mods, 0)
+  defp format_mods_into_string([], _indentation), do: ""
+  defp format_mods_into_string(mods, indentation) when is_list(mods) do
+    Enum.reduce mods, "", fn(mod, acc) ->
+      acc <> format_mods_into_string(mod, indentation)
+    end
+  end
+
+  defp format_mods_into_string(%{module: mod, dependency: deps}, 0) do
+    "\n├── #{mod}" <> format_mods_into_string(deps,  2)
+  end
+
+  defp format_mods_into_string(%{module: mod, dependency: deps}, indentation) do
+    spaces = Enum.reduce 0..indentation, "", fn(_, acc) -> " " <> acc end
+    "\n│#{spaces}└── #{mod}" <> format_mods_into_string(deps, indentation + 4)
+  end
+end

lib/mod_presence_demo.ex

@@ -1,21 +1,20 @@
 defmodule ModPresenceDemo do
-  import Ejabberd.Logger # this allow using info, error, etc for logging
-  @behaviour :gen_mod
+  use Ejabberd.Module
 
   def start(host, _opts) do
     info('Starting ejabberd module Presence Demo')
-    Ejabberd.Hooks.add(:set_presence_hook, host, __ENV__.module, :on_presence, 50)
+    Ejabberd.Hooks.add(:set_presence_hook, host, __MODULE__, :on_presence, 50)
     :ok
   end
-  
+
   def stop(host) do
     info('Stopping ejabberd module Presence Demo')
-    Ejabberd.Hooks.delete(:set_presence_hook, host, __ENV__.module, :on_presence, 50)
+    Ejabberd.Hooks.delete(:set_presence_hook, host, __MODULE__, :on_presence, 50)
     :ok
   end
-  
+
   def on_presence(user, _server, _resource, _packet) do
     info('Receive presence for #{user}')
     :none
-  end 
+  end
 end

mix.exs

@@ -3,44 +3,78 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "15.03.0",
-     elixir: "~> 1.0",
+     version: "16.08.0",
+     description: description,
+     elixir: "~> 1.2",
      elixirc_paths: ["lib"],
      compile_path: ".",
      compilers: [:asn1] ++ Mix.compilers,
      erlc_options: erlc_options,
      erlc_paths: ["asn1", "src"],
+     # Elixir tests are starting the part of ejabberd they need
+     aliases: [test: "test --no-start"],
+     package: package,
      deps: deps]
   end
 
+  defp description do
+    """
+    Robust, ubiquitous and massively scalable Jabber / XMPP Instant Messaging platform.
+    """
+  end
+
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:kernel, :stdlib]]
+     applications: [:ssl],
+     included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
+                             :fast_tls, :stringprep, :fast_xml,
+                             :stun, :fast_yaml, :ezlib, :iconv,
+                             :esip, :jiffy, :p1_oauth2, :eredis,
+                             :p1_mysql, :p1_pgsql, :sqlite3]]
   end
-  
+
   defp erlc_options do
-    includes = Path.wildcard(Path.join("..", "/*/include"))
-    [:debug_info, {:d, :NO_EXT_LIB}] ++ Enum.map(includes, fn(path) -> {:i, path} end)
+    # Use our own includes + includes from all dependencies
+    includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include"))
+    [:debug_info] ++ Enum.map(includes, fn(path) -> {:i, path} end)
   end
-  
+
   defp deps do
-    [
-        {:p1_xml, github: "processone/xml"},
-        {:p1_logger, github: "processone/p1_logger"},
-        {:p1_yaml, github: "processone/p1_yaml"},
-        {:p1_tls, github: "processone/tls"},
-        {:p1_stringprep, github: "processone/stringprep"},
-        {:p1_zlib, github: "processone/zlib"},
-        {:p1_cache_tab, github: "processone/cache_tab"},
-        {:p1_utils, github: "processone/p1_utils"},
-        {:p1_iconv, github: "processone/eiconv"},
-        {:esip, github: "processone/p1_sip"},
-        {:p1_stun, github: "processone/stun"},
-        {:ehyperloglog, github: "vaxelfel/eHyperLogLog"},
-        {:p1_mysql, github: "processone/mysql"},
-        {:p1_pgsql, github: "processone/pgsql"},
-        {:eredis, github: "wooga/eredis"}
-     ]
+    [{:lager, "~> 3.2"},
+     {:p1_utils, "~> 1.0"},
+     {:cache_tab, "~> 1.0"},
+     {:stringprep, "~> 1.0"},
+     {:fast_yaml, "~> 1.0"},
+     {:fast_tls, "~> 1.0"},
+     {:fast_xml, "~> 1.1"},
+     {:stun, "~> 1.0"},
+     {:esip, "~> 1.0"},
+     {:jiffy, "~> 0.14.7"},
+     {:p1_oauth2, "~> 0.6.1"},
+     {:p1_mysql, "~> 1.0"},
+     {:p1_pgsql, "~> 1.1"},
+     {:sqlite3, "~> 1.1"},
+     {:ezlib, "~> 1.0"},
+     {:iconv, "~> 1.0"},
+     {:eredis, "~> 1.0"},
+     {:exrm, "~> 1.0.0", only: :dev},
+     # relx is used by exrm. Lock version as for now, ejabberd doesn not compile fine with
+     # version 3.20:
+     {:relx, "~> 3.21", only: :dev},
+     {:ex_doc, ">= 0.0.0", only: :dev},
+     {:meck, "~> 0.8.4", only: :test},
+     {:moka, github: "processone/moka", tag: "1.0.5c", only: :test}]
+  end
+
+  defp package do
+    [# These are the default files included in the package
+      files: ["lib", "src", "priv", "mix.exs", "include", "README.md", "COPYING"],
+      maintainers: ["ProcessOne"],
+      licenses: ["GPLv2"],
+      links: %{"Site" => "https://www.ejabberd.im",
+               "Documentation" => "http://docs.ejabberd.im",
+               "Source" => "https://github.com/processone/ejabberd",
+               "ProcessOne" => "http://www.process-one.net/"}]
   end
 end
 
@@ -65,7 +99,7 @@ defmodule Mix.Tasks.Compile.Asn1 do
         options = options ++ [:noobj, outdir: Erlang.to_erl_file(Path.dirname(output))]
         case :asn1ct.compile(Erlang.to_erl_file(input), options) do
           :ok -> {:ok, :done}
-          error -> error       
+          error -> error
         end
     end)
   end

mix.lock

@@ -0,0 +1,30 @@
+%{"bbmustache": {:hex, :bbmustache, "1.0.4", "7ba94f971c5afd7b6617918a4bb74705e36cab36eb84b19b6a1b7ee06427aa38", [:rebar], []},
+  "cache_tab": {:hex, :cache_tab, "1.0.4", "3fd2b1ab40c36e7830a4e09e836c6b0fa89191cd4e5fd471873e4eb42f5cd37c", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
+  "earmark": {:hex, :earmark, "1.0.1", "2c2cd903bfdc3de3f189bd9a8d4569a075b88a8981ded9a0d95672f6e2b63141", [:mix], []},
+  "eredis": {:hex, :eredis, "1.0.8", "ab4fda1c4ba7fbe6c19c26c249dc13da916d762502c4b4fa2df401a8d51c5364", [:rebar], []},
+  "erlware_commons": {:hex, :erlware_commons, "0.21.0", "a04433071ad7d112edefc75ac77719dd3e6753e697ac09428fc83d7564b80b15", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},
+  "esip": {:hex, :esip, "1.0.8", "69885a6c07964aabc6c077fe1372aa810a848bd3d9a415b160dabdce9c7a79b5", [:rebar3], [{:fast_tls, "1.0.7", [hex: :fast_tls, optional: false]}, {:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}, {:stun, "1.0.7", [hex: :stun, optional: false]}]},
+  "ex_doc": {:hex, :ex_doc, "0.13.0", "aa2f8fe4c6136a2f7cfc0a7e06805f82530e91df00e2bff4b4362002b43ada65", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
+  "exrm": {:hex, :exrm, "1.0.8", "5aa8990cdfe300282828b02cefdc339e235f7916388ce99f9a1f926a9271a45d", [:mix], [{:relx, "~> 3.5", [hex: :relx, optional: false]}]},
+  "ezlib": {:hex, :ezlib, "1.0.1", "add8b2770a1a70c174aaea082b4a8668c0c7fdb03ee6cc81c6c68d3a6c3d767d", [:rebar3], []},
+  "fast_tls": {:hex, :fast_tls, "1.0.7", "9b72ecfcdcad195ab072c196fab8334f49d8fea76bf1a51f536d69e7527d902a", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "fast_xml": {:hex, :fast_xml, "1.1.15", "6d23eb7f874e1357cf80a48d75a7bd0c8f6318029dc4b70122e9f54911f57f83", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.6", "3fe6feb7935ae8028b337e53e1db29e73ad3bca8041108f6a8f73b7175ece75c", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "getopt": {:hex, :getopt, "0.8.2", "b17556db683000ba50370b16c0619df1337e7af7ecbf7d64fbf8d1d6bce3109b", [:rebar], []},
+  "goldrush": {:hex, :goldrush, "0.1.8", "2024ba375ceea47e27ea70e14d2c483b2d8610101b4e852ef7f89163cdb6e649", [:rebar3], []},
+  "iconv": {:hex, :iconv, "1.0.2", "a0792f06ab4b5ea1b5bb49789405739f1281a91c44cf3879cb70e4d777666217", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "jiffy": {:hex, :jiffy, "0.14.7", "9f33b893edd6041ceae03bc1e50b412e858cc80b46f3d7535a7a9940a79a1c37", [:rebar, :make], []},
+  "lager": {:hex, :lager, "3.2.1", "eef4e18b39e4195d37606d9088ea05bf1b745986cf8ec84f01d332456fe88d17", [:rebar3], [{:goldrush, "0.1.8", [hex: :goldrush, optional: false]}]},
+  "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:rebar, :make], []},
+  "moka": {:git, "https://github.com/processone/moka.git", "3eed3a6dd7dedb70a6cd18f86c7561a18626eb3b", [tag: "1.0.5c"]},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.1", "d2be1cfc71bb4f1391090b62b74c3f5cb8e7a45b0076b8cb290cd6b2856c581b", [:rebar3], []},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.1", "4e021250cc198c538b097393671a41e7cebf463c248980320e038fe0316eb56b", [:rebar3], []},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.0", "ca525c42878eac095e5feb19563acc9915c845648f48fdec7ba6266c625d4ac7", [:rebar3], []},
+  "p1_utils": {:hex, :p1_utils, "1.0.5", "3e698354fdc1fea5491d991457b0cb986c0a00a47d224feb841dc3ec82b9f721", [:rebar3], []},
+  "providers": {:hex, :providers, "1.6.0", "db0e2f9043ae60c0155205fcd238d68516331d0e5146155e33d1e79dc452964a", [:rebar3], [{:getopt, "0.8.2", [hex: :getopt, optional: false]}]},
+  "relx": {:hex, :relx, "3.21.0", "91e1ea9f09b4edfda8461901f4b5c5e0226e43ec161e147eeab29f7761df6eb5", [:rebar3], [{:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:erlware_commons, "0.21.0", [hex: :erlware_commons, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:providers, "1.6.0", [hex: :providers, optional: false]}]},
+  "samerlib": {:git, "https://github.com/processone/samerlib", "fbbba035b1548ac4e681df00d61bf609645333a0", [tag: "0.8.0c"]},
+  "sqlite3": {:hex, :sqlite3, "1.1.5", "794738b6d07b6d36ec6d42492cb9d629bad9cf3761617b8b8d728e765db19840", [:rebar3], []},
+  "stringprep": {:hex, :stringprep, "1.0.6", "1cf1c439eb038aa590da5456e019f86afbfbfeb5a2d37b6e5f873041624c6701", [:rebar3], [{:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]},
+  "stun": {:hex, :stun, "1.0.7", "904dc6f26a3c30c54881c4c3003699f2a4968067ee6b3aecdf9895aad02df75e", [:rebar3], [{:fast_tls, "1.0.7", [hex: :fast_tls, optional: false]}, {:p1_utils, "1.0.5", [hex: :p1_utils, optional: false]}]}}

plugins/deps_erl_opts.erl

@@ -0,0 +1,12 @@
+-module(deps_erl_opts).
+-export([preprocess/2]).
+
+preprocess(Config, Dirs) ->
+    ExtraOpts = rebar_config:get(Config, deps_erl_opts, []),
+    Opts = rebar_config:get(Config, erl_opts, []),
+    NewOpts = lists:foldl(fun(Opt, Acc) when is_tuple(Opt) ->
+                                  lists:keystore(element(1, Opt), 1, Acc, Opt);
+                             (Opt, Acc) ->
+                                  [Opt | lists:delete(Opt, Acc)]
+                          end, Opts, ExtraOpts),
+    {ok, rebar_config:set(Config, erl_opts, NewOpts), []}.

priv/msgs/ca.msg

@@ -1,8 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Acceptar"}.
 {"Access Configuration","Configuració d'accesos"}.
 {"Access Control List Configuration","Configuració de la Llista de Control d'Accés"}.
 {"Access Control Lists","Llista de Control d'Accés"}.
 {"Access control lists","Llistes de Control de Accés"}.
+{"Access denied by service policy","Accés denegat per la política del servei"}.
 {"Access rules","Regles d'accés"}.
 {"Access Rules","Regles d'Accés"}.
 {"Action on user","Acció en l'usuari"}.
@@ -11,6 +13,7 @@
 {"Add User","Afegir usuari"}.
 {"Administration","Administració"}.
 {"Administration of ","Administració de "}.
+{"Administrator privileges required","Es necessita tenir privilegis d'administrador"}.
 {"A friendly name for the node","Un nom per al node"}.
 {"All activity","Tota l'activitat"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Permetre que aquesta Jabber ID es puga subscriure a aquest node pubsub"}.
@@ -18,17 +21,19 @@
 {"Allow users to query other users","Permetre que els usuaris fagen peticions a altres usuaris"}.
 {"Allow users to send invites","Permetre que els usuaris envien invitacions"}.
 {"Allow users to send private messages","Permetre que els usuaris envien missatges privats"}.
-{"Allow visitors to change nickname","Permetre als visitants canviar el Nickname"}.
+{"Allow visitors to change nickname","Permetre als visitants canviar el sobrenom"}.
 {"Allow visitors to send private messages to","Permetre als visitants enviar missatges privats a"}.
 {"Allow visitors to send status text in presence updates","Permetre als visitants enviar text d'estat en les actualitzacions de presència"}.
 {"Allow visitors to send voice requests","Permetre als visitants enviar peticions de veu"}.
 {"All Users","Tots els usuaris"}.
 {"Announcements","Anuncis"}.
 {"anyone","qualsevol"}.
+{"A password is required to enter this room","Es necessita contrasenya per a entrar en aquesta sala"}.
 {"April","Abril"}.
 {"August","Agost"}.
 {"Backup","Guardar còpia de seguretat"}.
 {"Backup Management","Gestió de còpia de seguretat"}.
+{"Backup of ~p","Còpia de seguretat de ~p"}.
 {"Backup to File at ","Desar còpia de seguretat a fitxer en "}.
 {"Bad format","Format erroni"}.
 {"Birthday","Aniversari"}.
@@ -48,6 +53,7 @@
 {"Choose whether to approve this entity's subscription.","Tria si aprova aquesta entitat de subscripció"}.
 {"City","Ciutat"}.
 {"Commands","Comandaments"}.
+{"Conference room does not exist","La sala de conferències no existeix"}.
 {"Configuration","Configuració"}.
 {"Configuration of room ~s","Configuració de la sala ~s"}.
 {"Connected Resources:","Recursos connectats:"}.
@@ -55,10 +61,10 @@
 {"Country","Pais"}.
 {"CPU Time:","Temps de CPU"}.
 {"Database","Base de dades"}.
+{"Database Tables at ~p","Taules de la base de dades en ~p"}.
 {"Database Tables Configuration at ","Configuració de la base de dades en "}.
 {"December","Decembre"}.
 {"Default users as participants","Els usuaris són participants per defecte"}.
-{"Delete","Eliminar"}.
 {"Delete message of the day","Eliminar el missatge del dia"}.
 {"Delete message of the day on all hosts","Elimina el missatge del dis de tots els hosts"}.
 {"Delete Selected","Eliminar els seleccionats"}.
@@ -75,17 +81,20 @@
 {"Either approve or decline the voice request.","Aprova o denega la petició de veu"}.
 {"ejabberd IRC module","mòdul ejabberd IRC"}.
 {"ejabberd MUC module","mòdul ejabberd MUC"}.
+{"ejabberd Multicast service","Servei de Multicast d'ejabberd"}.
 {"ejabberd Publish-Subscribe module","Mòdul ejabberd Publicar-Subscriure"}.
 {"ejabberd SOCKS5 Bytestreams module","mòdul ejabberd SOCKS5 Bytestreams"}.
 {"ejabberd vCard module","Mòdul ejabberd vCard"}.
 {"ejabberd Web Admin","Web d'administració del ejabberd"}.
 {"Elements","Elements"}.
 {"Email","Email"}.
+{"Empty Rooms","Sales buides "}.
 {"Enable logging","Habilitar el registre de la conversa"}.
+{"Enable message archiving","Activar l'emmagatzematge de missatges"}.
 {"Encoding for server ~b","Codificació pel servidor ~b"}.
 {"End User Session","Finalitzar Sesió d'Usuari"}.
 {"Enter list of {Module, [Options]}","Introdueix llista de {mòdul, [opcions]}"}.
-{"Enter nickname you want to register","Introdueix el nickname que vols registrar"}.
+{"Enter nickname you want to register","Introdueix el sobrenom que vols registrar"}.
 {"Enter path to backup file","Introdueix ruta al fitxer de còpia de seguretat"}.
 {"Enter path to jabberd14 spool dir","Introdueix la ruta al directori de jabberd14 spools"}.
 {"Enter path to jabberd14 spool file","Introdueix ruta al fitxer jabberd14 spool"}.
@@ -97,8 +106,10 @@
 {"Error","Error"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Exemple: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Excloure Jabber IDs de la comprovació CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","Exporta totes les taules a un fitxer SQL:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportar dades de tots els usuaris del servidor a arxius PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportar dades d'usuaris d'un host a arxius PIEFXIS (XEP-0227):"}.
+{"Failed to extract JID from your voice request approval","No s'ha pogut extraure el JID de la teva aprovació de petició de veu"}.
 {"Family Name","Cognom"}.
 {"February","Febrer"}.
 {"Fill in fields to search for any matching Jabber User","Emplena camps per a buscar usuaris Jabber que concorden"}.
@@ -132,6 +143,9 @@
 {"Import users data from jabberd14 spool directory:","Importar dades d'usuaris del directori de spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuaris des del directori en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuaris de jabberd14"}.
+{"Improper message type","Tipus de missatge incorrecte"}.
+{"Incoming s2s Connections:","Connexions s2s d'entrada"}.
+{"Incorrect password","Contrasenya incorrecta"}.
 {"Invalid affiliation: ~s","Afiliació invàlida: ~s"}.
 {"Invalid role: ~s","Rol invàlid: ~s"}.
 {"IP addresses","Adreça IP"}.
@@ -143,6 +157,10 @@
 {"IRC username","Nom d'usuari al IRC"}.
 {"IRC Username","Nom d'usuari al IRC"}.
 {"is now known as","ara es conegut com"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No està permés enviar missatges d'error a la sala. El participant (~s) ha enviat un missatge d'error (~s) i ha sigut expulsat de la sala"}.
+{"It is not allowed to send private messages","No està permés enviar missatges privats"}.
+{"It is not allowed to send private messages of type \"groupchat\"","No està permés enviar missatges del tipus \"groupchat\""}.
+{"It is not allowed to send private messages to the conference","No està permès l'enviament de missatges privats a la sala"}.
 {"Jabber Account Registration","Registre de compte Jabber"}.
 {"Jabber ID","ID Jabber"}.
 {"Jabber ID ~s is invalid","El Jabber ID ~s no és vàlid"}.
@@ -161,6 +179,7 @@
 {"Listened Ports at ","Ports a la escolta en "}.
 {"Listened Ports","Ports a l'escolta"}.
 {"List of modules to start","Llista de mòduls a iniciar"}.
+{"List of rooms","Llista de sales"}.
 {"Low level update script","Script d'actualització de baix nivell"}.
 {"Make participants list public","Crear una llista de participants pública"}.
 {"Make room CAPTCHA protected","Crear una sala protegida per CAPTCHA"}.
@@ -174,29 +193,36 @@
 {"Max # of items to persist","Màxim # d'elements que persistixen"}.
 {"Max payload size in bytes","Màxim tamany del payload en bytes"}.
 {"May","Maig"}.
+{"Membership is required to enter this room","Necessites ser membre d'aquesta sala per a poder entrar"}.
 {"Members:","Membre:"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Memoritza la teva contrasenya, o escriu-la en un paper guardat a un lloc segur.A Jabber no hi ha una forma automatitzada de recuperar la teva contrasenya si la oblides."}.
 {"Memory","Memòria"}.
 {"Message body","Missatge"}.
 {"Middle Name","Segon nom"}.
 {"Minimum interval between voice requests (in seconds)","Interval mínim entre peticions de veu (en segons)"}.
+{"Moderator","Moderador"}.
+{"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
 {"moderators only","només moderadors"}.
 {"Modified modules","Mòduls modificats"}.
 {"Module","Mòdul"}.
+{"Modules at ~p","Mòduls en ~p"}.
 {"Modules","Mòduls"}.
 {"Monday","Dilluns"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Multi-Usuari Converses"}.
 {"Name:","Nom:"}.
 {"Name","Nom"}.
 {"Never","Mai"}.
 {"New Password:","Nova Contrasenya:"}.
-{"Nickname","Nickname"}.
-{"Nickname Registration at ","Registre del Nickname en "}.
-{"Nickname ~s does not exist in the room","El Nickname ~s no existeix a la sala"}.
+{"Nickname Registration at ","Registre del sobrenom en "}.
+{"Nickname ~s does not exist in the room","El sobrenom ~s no existeix a la sala"}.
+{"Nickname","Sobrenom"}.
 {"nobody","ningú"}.
 {"No body provided for announce message","No hi ha proveedor per al missatge anunci"}.
 {"No Data","No hi ha dades"}.
 {"Node ID","ID del Node"}.
 {"Node not found","Node no trobat"}.
+{"Node ~p","Node ~p"}.
 {"Nodes","Nodes"}.
 {"No limit","Sense Llímit"}.
 {"None","Cap"}.
@@ -218,15 +244,21 @@
 {"Online Users","Usuaris conectats"}.
 {"Online Users:","Usuaris en línia:"}.
 {"Only deliver notifications to available users","Sols enviar notificacions als usuaris disponibles"}.
+{"Only members may query archives of this room","Només membres poden consultar l'arxiu de missatges d'aquesta sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Només els moderadors i participants poden canviar l'assumpte d'aquesta sala"}.
 {"Only moderators are allowed to change the subject in this room","Només els moderadors poden canviar l'assumpte d'aquesta sala"}.
+{"Only moderators can approve voice requests","Només els moderadors poden aprovar les peticions de veu"}.
+{"Only occupants are allowed to send messages to the conference","Sols els ocupants poden enviar missatges a la sala"}.
+{"Only occupants are allowed to send queries to the conference","Sols els ocupants poden enviar sol·licituds a la sala"}.
+{"Only service administrators are allowed to send service messages","Sols els administradors del servei tenen permís per a enviar missatges de servei"}.
 {"Options","Opcions"}.
 {"Organization Name","Nom de la organizació"}.
 {"Organization Unit","Unitat de la organizació"}.
 {"Outgoing s2s Connections:","Connexions d'eixida s2s"}.
 {"Outgoing s2s Connections","Connexions s2s d'eixida"}.
-{"Outgoing s2s Servers:","Servidors d'eixida de s2s"}.
+{"Owner privileges required","Es requerixen privilegis de propietari de la sala"}.
 {"Packet","Paquet"}.
+{"Participant","Participant"}.
 {"Password ~b","Contrasenya ~b"}.
 {"Password:","Contrasenya:"}.
 {"Password","Contrasenya"}.
@@ -236,9 +268,13 @@
 {"Path to File","Ruta al fitxer"}.
 {"Pending","Pendent"}.
 {"Period: ","Període: "}.
+{"Permanent rooms","Sales permanents"}.
 {"Persist items to storage","Persistir elements al guardar"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Recorda que aquestes opcions només fan còpia de seguretat de la base de dades Mnesia. Si estàs utilitzant el mòdul d'ODBC també deus de fer una còpia de seguretat de la base de dades de SQL a part."}.
+{"Please specify file name.","Per favor especifica el nom del fitxer."}.
+{"Please specify file size.","Per favor especifica la mida del fitxer."}.
+{"Please, wait for a while before sending new voice request","Si us plau, espera una mica abans d'enviar una nova petició de veu"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,11 +284,14 @@
 {"Publish-Subscribe","Publicar-subscriure't"}.
 {"PubSub subscriber request","Petició de subscriptor PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Eliminar tots els elements quan el publicant relevant es desconnecti"}.
+{"Queries to the conference members are not allowed in this room"," En aquesta sala no es permeten sol·licituds als membres de la conferència"}.
 {"RAM and disc copy","Còpia en RAM i disc"}.
 {"RAM copy","Còpia en RAM"}.
 {"Raw","en format text"}.
 {"Really delete message of the day?","Segur que vols eliminar el missatge del dia?"}.
+{"Recipient is not in the conference room","El receptor no està en la sala de conferència"}.
 {"Register a Jabber account","Registrar un compte Jabber"}.
+{"Registered nicknames","Sobrenoms registrats"}.
 {"Registered Users:","Usuaris registrats:"}.
 {"Registered Users","Usuaris registrats"}.
 {"Register","Registrar"}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Restaurar una còpia de seguretat binària ara mateix."}.
 {"Restore plain text backup immediately:","Restaurar una còpia de seguretat en format de text pla ara mateix:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Rols per als que sí se difon la seua presencia"}.
 {"Room Configuration","Configuració de la sala"}.
+{"Room creation is denied by service policy","Se t'ha denegat el crear la sala per política del servei"}.
 {"Room description","Descripció de la sala:"}.
 {"Room Occupants","Nombre d'ocupants"}.
 {"Room title","Títol de la sala"}.
@@ -292,6 +333,7 @@
 {"September","Setembre"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Server","Servidor"}.
 {"Set message of the day and send to online users","Configurar el missatge del dia i enviar a tots els usuaris"}.
 {"Set message of the day on all hosts and send to online users","Escriure missatge del dia en tots els hosts i enviar-ho als usuaris connectats"}.
 {"Shared Roster Groups","Grups de contactes compartits"}.
@@ -299,7 +341,7 @@
 {"Show Ordinary Table","Mostrar Taula Ordinaria"}.
 {"Shut Down Service","Apager el Servei"}.
 {"~s invites you to the room ~s","~s et convida a la sala ~s"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Alguns clients Jabber poden emmagatzemar la teva contrasenya al teu ordinador. Fes servir aquesta característica només si saps que el teu ordinador és segur."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Alguns clients Jabber poden emmagatzemar la teva contrasenya al teu ordinador. Fes servir aquesta característica només si saps que el teu ordinador és segur."}.
 {"Specify the access model","Especificar el model d'accés"}.
 {"Specify the event message type","Especifica el tipus de missatge d'event"}.
 {"Specify the publisher model","Especificar el model del publicant"}.
@@ -322,33 +364,44 @@
 {"Subscriber Address","Adreça del Subscriptor"}.
 {"Subscription","Subscripció"}.
 {"Sunday","Diumenge"}.
+{"That nickname is already in use by another occupant","El Nickname està siguent utilitzat per una altra persona"}.
+{"That nickname is registered by another person","El nickname ja està registrat per una altra persona"}.
 {"The CAPTCHA is valid.","El CAPTCHA es vàlid."}.
+{"The CAPTCHA verification has failed","La verificació CAPTCHA ha fallat"}.
 {"The collections with which a node is affiliated","Les col.leccions amb les que un node està afiliat"}.
 {"the password is","la contrasenya és"}.
+{"The password is too weak","La contrasenya és massa simple"}.
 {"The password of your Jabber account was successfully changed.","La contrasenya del teu compte Jabber s'ha canviat correctament."}.
 {"There was an error changing the password: ","Hi ha hagut un error canviant la contrasenya: "}.
 {"There was an error creating the account: ","Hi ha hagut un error creant el compte: "}.
 {"There was an error deleting the account: ","Hi ha hagut un error esborrant el compte: "}.
+{"This IP address is blacklisted in ~s","Esta adreça IP està a la llista negra en ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Això no distingeix majúscules de minúscules: macbeth es el mateix que MacBeth i Macbeth."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Aquesta pàgina permet crear un compte Jabber en aquest servidor Jabber. El teu JID (Jabber IDentifier; Identificador Jabber) tindrà aquesta forma: usuari@servidor. Si us plau, llegeix amb cura les instruccions per emplenar correctament els camps."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Aquesta pàgina permet anul·lar el registre d'un compte Jabber en aquest servidor Jabber."}.
-{"This room is not anonymous","Aquesta sala no és anònima"}.
 {"Thursday","Dijous"}.
 {"Time","Data"}.
 {"Time delay","Temps de retard"}.
+{"Too many CAPTCHA requests","Massa peticions de CAPTCHA"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Massa autenticacions (~p) han fallat des d'aquesta adreça IP (~s). L'adreça serà desbloquejada en ~s UTC"}.
+{"Too many unacked stanzas","Massa missatges sense haver reconegut la seva recepció"}.
 {"To","Per a"}.
 {"To ~s","A ~s"}.
+{"Total rooms","Nombre total de sales"}.
+{"Traffic rate limit is exceeded","El llímit de tràfic ha sigut sobrepassat"}.
 {"Transactions Aborted:","Transaccions Avortades"}.
 {"Transactions Committed:","Transaccions Realitzades:"}.
 {"Transactions Logged:","Transaccions registrades"}.
 {"Transactions Restarted:","Transaccions reiniciades"}.
 {"Tuesday","Dimarts"}.
+{"Unable to generate a CAPTCHA","No s'ha pogut generar un CAPTCHA"}.
 {"Unauthorized","No autoritzat"}.
 {"Unregister a Jabber account","Anul·lar el registre d'un compte Jabber"}.
 {"Unregister","Anul·lar el registre"}.
 {"Update","Actualitzar"}.
 {"Update message of the day (don't send)","Actualitzar el missatge del dia (no enviar)"}.
 {"Update message of the day on all hosts (don't send)","Actualitza el missatge del dia en tots els hosts (no enviar)"}.
+{"Update ~p","Actualitzar ~p"}.
 {"Update plan","Pla d'actualització"}.
 {"Update script","Script d'actualització"}.
 {"Uptime:","Temps en marxa"}.
@@ -356,22 +409,32 @@
 {"User JID","JID del usuari "}.
 {"User Management","Gestió d'Usuaris"}.
 {"Username:","Nom d'usuari:"}.
+{"Users are not allowed to register accounts so quickly","Els usuaris no tenen permís per a crear comptes tan depresa"}.
 {"Users Last Activity","Última activitat d'usuari"}.
+{"User ~s","Usuari  ~s"}.
 {"Users","Usuaris"}.
 {"User","Usuari"}.
 {"Validate","Validar"}.
 {"vCard User Search","Recerca de vCard d'usuari"}.
 {"Virtual Hosts","Hosts virtuals"}.
+{"Visitors are not allowed to change their nicknames in this room","Els visitants no tenen permés canviar el seus Nicknames en esta sala"}.
+{"Visitors are not allowed to send messages to all occupants","Els visitants no poden enviar missatges a tots els ocupants"}.
+{"Visitor","Visitant"}.
 {"Voice request","Petició de veu"}.
+{"Voice requests are disabled in this conference","Les peticions de veu es troben desactivades en aquesta conferència"}.
 {"Wednesday","Dimecres"}.
 {"When to send the last published item","Quan s'ha enviat l'última publicació"}.
 {"Whether to allow subscriptions","Permetre subscripcions"}.
 {"You can later change your password using a Jabber client.","Podràs canviar la teva contrasenya més endavant utilitzant un client Jabber."}.
+{"You have been banned from this room","Has sigut bloquejat en aquesta sala"}.
+{"You must fill in field \"Nickname\" in the form","Deus d'omplir el camp \"Nickname\" al formulari"}.
 {"You need a client that supports x:data and CAPTCHA to register","Necessites un client amb suport x:data i de CAPTCHA para poder registrar-te"}.
-{"You need a client that supports x:data to register the nickname","Necessites un client amb suport x:data per a poder registrar el Nickname"}.
+{"You need a client that supports x:data to register the nickname","Necessites un client amb suport x:data per a poder registrar el sobrenom"}.
 {"You need an x:data capable client to configure mod_irc settings","Necessites un client amb suport x:data per a configurar les opcions de mod_irc"}.
 {"You need an x:data capable client to configure room","Necessites un client amb suport x:data per a configurar la sala"}.
 {"You need an x:data capable client to search","Necessites un client amb suport x:data per a poder buscar"}.
+{"Your active privacy list has denied the routing of this stanza.","La teva llista de privacitat activa ha denegat l'encaminament d'aquesta stanza."}.
+{"Your contact offline message queue is full. The message has been discarded.","La cua de missatges offline és plena. El missatge ha sigut descartat"}.
 {"Your Jabber account was successfully created.","El teu compte Jabber ha sigut creat correctament."}.
 {"Your Jabber account was successfully deleted.","El teu compte Jabber ha sigut esborrat correctament."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Els teus missatges per ~s s'estan bloquejant. Per desbloquejar-los, visita ~s"}.

priv/msgs/cs.msg

@@ -1,8 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Přijmout"}.
 {"Access Configuration","Konfigurace přístupů"}.
 {"Access Control List Configuration","Konfigurace seznamu přístupových práv (ACL)"}.
 {"Access control lists","Seznamy přístupových práv (ACL)"}.
 {"Access Control Lists","Seznamy přístupových práv (ACL)"}.
+{"Access denied by service policy","Přístup byl zamítnut nastavením služby"}.
 {"Access rules","Pravidla přístupů"}.
 {"Access Rules","Pravidla přístupů"}.
 {"Action on user","Akce aplikovaná na uživatele"}.
@@ -11,6 +13,7 @@
 {"Add User","Přidat uživatele"}.
 {"Administration","Administrace"}.
 {"Administration of ","Administrace "}.
+{"Administrator privileges required","Potřebujete práva administrátora"}.
 {"A friendly name for the node","Přívětivé jméno pro uzel"}.
 {"All activity","Všechny aktivity"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Povolit tomuto Jabber ID odebírat tento pubsub uzel?"}.
@@ -25,9 +28,11 @@
 {"All Users","Všichni uživatelé"}.
 {"Announcements","Oznámení"}.
 {"anyone","každému"}.
+{"A password is required to enter this room","Pro vstup do místnosti musíte zadat heslo"}.
 {"April",". dubna"}.
 {"August",". srpna"}.
 {"Backup Management","Správa zálohování"}.
+{"Backup of ~p","Záloha ~p"}.
 {"Backup to File at ","Záloha do souboru na "}.
 {"Backup","Zálohovat"}.
 {"Bad format","Nesprávný formát"}.
@@ -48,6 +53,7 @@
 {"Choose whether to approve this entity's subscription.","Zvolte, zda chcete schválit odebírání touto entitou"}.
 {"City","Město"}.
 {"Commands","Příkazy"}.
+{"Conference room does not exist","Konferenční místnost neexistuje"}.
 {"Configuration","Konfigurace"}.
 {"Configuration of room ~s","Konfigurace místnosti ~s"}.
 {"Connected Resources:","Připojené zdroje:"}.
@@ -55,13 +61,13 @@
 {"Country","Země"}.
 {"CPU Time:","Čas procesoru"}.
 {"Database","Databáze"}.
+{"Database Tables at ~p","Databázové tabulky na ~p"}.
 {"Database Tables Configuration at ","Konfigurace databázových tabulek "}.
 {"December",". prosince"}.
 {"Default users as participants","Uživatelé jsou implicitně členy"}.
 {"Delete message of the day on all hosts","Smazat zprávu dne na všech hostitelích"}.
 {"Delete message of the day","Smazat zprávu dne"}.
 {"Delete Selected","Smazat vybrané"}.
-{"Delete","Smazat"}.
 {"Delete User","Smazat uživatele"}.
 {"Deliver event notifications","Doručovat upozornění na události"}.
 {"Deliver payloads with event notifications","Doručovat náklad s upozorněním na událost"}.
@@ -75,13 +81,16 @@
 {"Either approve or decline the voice request.","Povolit nebo odmítnout voice žádost."}.
 {"ejabberd IRC module","ejabberd IRC modul"}.
 {"ejabberd MUC module","ejabberd MUC modul"}.
+{"ejabberd Multicast service","Služba ejabberd Multicast"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe modul"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams modul"}.
 {"ejabberd vCard module","ejabberd vCard modul"}.
 {"ejabberd Web Admin","Webová administrace ejabberd"}.
 {"Elements","Položek"}.
 {"Email","E-mail"}.
+{"Empty Rooms","Prázdné konference"}.
 {"Enable logging","Zaznamenávat konverzace"}.
+{"Enable message archiving","Povolit ukládání historie zpráv"}.
 {"Encoding for server ~b","Kódování pro server ~b"}.
 {"End User Session","Ukončit sezení uživatele"}.
 {"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}.
@@ -97,8 +106,10 @@
 {"Error","Chyba"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Příklad: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].2\"}]."}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Vyloučit Jabber ID z procesu CAPTCHA ověřování"}.
+{"Export all tables as SQL queries to a file:","Zálohovat všechny tabulky jako SQL dotazy do souboru:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportovat všechny uživatele do souboru ve formátu PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportovat uživatele na hostiteli do souboru ve formátu PIEFXIS (XEP-0227):"}.
+{"Failed to extract JID from your voice request approval","Došlo k chybě při získávání Jabber ID z vaší žádosti o voice práva"}.
 {"Family Name","Příjmení"}.
 {"February",". února"}.
 {"Fill in fields to search for any matching Jabber User","Vyplňte políčka pro vyhledání uživatele Jabberu"}.
@@ -132,6 +143,9 @@
 {"Import users data from jabberd14 spool directory:","Importovat uživatele z jabberd14 spool souborů:"}.
 {"Import Users from Dir at ","Importovat uživatele z adresáře na "}.
 {"Import Users From jabberd14 Spool Files","Importovat uživatele z jabberd14 spool souborů"}.
+{"Improper message type","Nesprávný typ zprávy"}.
+{"Incoming s2s Connections:",""}.
+{"Incorrect password","Nesprávné heslo"}.
 {"Invalid affiliation: ~s","Neplatné přiřazení: ~s"}.
 {"Invalid role: ~s","Neplatná role: ~s"}.
 {"IP addresses","IP adresy"}.
@@ -143,6 +157,10 @@
 {"IRC username","IRC přezdívka"}.
 {"IRC Username","IRC přezdívka"}.
 {"is now known as","se přejmenoval(a) na"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Není povoleno posílat chybové zprávy do konference. Účastník (~s) odeslal chybovou zprávu (~s) a byl vyhozen z konference."}.
+{"It is not allowed to send private messages","Je zakázáno posílat soukromé zprávy"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Není dovoleno odeslání soukromé zprávy typu \"skupinová zpráva\" "}.
+{"It is not allowed to send private messages to the conference","Není povoleno odesílat soukromé zprávy do konference"}.
 {"Jabber Account Registration","Registrace účtu Jabberu"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Jabber ID ~s je neplatné"}.
@@ -161,6 +179,7 @@
 {"Listened Ports at ","Otevřené porty na "}.
 {"Listened Ports","Otevřené porty"}.
 {"List of modules to start","Seznam modulů, které mají být spuštěné"}.
+{"List of rooms","Seznam konferencí"}.
 {"Low level update script","Nízkoúrovňový aktualizační skript"}.
 {"Make participants list public","Nastavit seznam účastníků jako veřejný"}.
 {"Make room CAPTCHA protected","Chránit místnost pomocí CAPTCHA"}.
@@ -175,16 +194,22 @@
 {"Max payload size in bytes","Maximální náklad v bajtech"}.
 {"May",". května"}.
 {"Members:","Členové:"}.
+{"Membership is required to enter this room","Pro vstup do místnosti musíte být členem"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Svoje heslo si zapamatujte, nebo si jej poznamenejte na papírek a ten uschovejte v bezpečí. Jabber nemá žádný automatizovaný způsob obnovy hesla."}.
 {"Memory","Paměť"}.
 {"Message body","Tělo zprávy"}.
 {"Middle Name","Druhé jméno"}.
 {"Minimum interval between voice requests (in seconds)","Minimální interval mezi žádostmi o voice práva (v sekundách)"}.
+{"Moderator","Moderátor"}.
+{"Moderator privileges required","Potřebujete práva moderátora"}.
 {"moderators only","moderátorům"}.
 {"Modified modules","Aktualizované moduly"}.
 {"Module","Modul"}.
+{"Modules at ~p","Moduly v ~p"}.
 {"Modules","Moduly"}.
 {"Monday","Pondělí"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Víceuživatelský chat"}.
 {"Name:","Jméno:"}.
 {"Name","Jméno"}.
 {"Never","Nikdy"}.
@@ -197,6 +222,7 @@
 {"No Data","Žádná data"}.
 {"Node ID","ID uzlu"}.
 {"Node not found","Uzel nenalezen"}.
+{"Node ~p","Uzel ~p"}.
 {"Nodes","Uzly"}.
 {"No limit","Bez limitu"}.
 {"None","Nic"}.
@@ -218,15 +244,21 @@
 {"Online Users:","Online uživatelé:"}.
 {"Online Users","Online uživatelé"}.
 {"Only deliver notifications to available users","Doručovat upozornění jen právě přihlášeným uživatelům"}.
+{"Only members may query archives of this room","Pouze moderátoři mají povoleno měnit téma místnosti"}.
 {"Only moderators and participants are allowed to change the subject in this room","Jen moderátoři a účastníci mají povoleno měnit téma této místnosti"}.
 {"Only moderators are allowed to change the subject in this room","Jen moderátoři mají povoleno měnit téma místnosti"}.
+{"Only moderators can approve voice requests","Pouze moderátoři mohou schválit žádosti o voice práva"}.
+{"Only occupants are allowed to send messages to the conference","Jen členové mají povolené zasílat zprávy do konference"}.
+{"Only occupants are allowed to send queries to the conference","Jen členové mohou odesílat požadavky (query) do konference"}.
+{"Only service administrators are allowed to send service messages","Pouze správci služby smí odesílat servisní zprávy"}.
 {"Options","Nastavení"}.
 {"Organization Name","Název firmy"}.
 {"Organization Unit","Oddělení"}.
 {"Outgoing s2s Connections:","Odchozí s2s spojení:"}.
 {"Outgoing s2s Connections","Odchozí s2s spojení"}.
-{"Outgoing s2s Servers:","Odchozí s2s servery:"}.
+{"Owner privileges required","Jsou vyžadována práva vlastníka"}.
 {"Packet","Paket"}.
+{"Participant","Účastník"}.
 {"Password ~b","Heslo ~b"}.
 {"Password:","Heslo:"}.
 {"Password","Heslo"}.
@@ -236,9 +268,13 @@
 {"Path to File","Cesta k souboru"}.
 {"Pending","Čekající"}.
 {"Period: ","Čas: "}.
+{"Permanent rooms","Stálých konferencí"}.
 {"Persist items to storage","Uložit položky natrvalo do úložiště"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Podotýkáme, že tato nastavení budou zálohována do zabudované databáze Mnesia. Pokud používáte ODBC modul, musíte zálohovat svoji SQL databázi samostatně."}.
+{"Please specify file name.","Zvolit jméno souboru."}.
+{"Please specify file size.","Zvolit velikost souboru."}.
+{"Please, wait for a while before sending new voice request","Prosím, počkejte chvíli před posláním nové žádosti o voice práva"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,11 +284,14 @@
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žádost odběratele PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Smazat všechny položky, pokud se příslušný poskytovatel odpojí"}.
+{"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy konference nejsou v této místnosti povolené"}.
 {"RAM and disc copy","Kopie RAM a disku"}.
 {"RAM copy","Kopie RAM"}.
 {"Raw","Zdroj"}.
 {"Really delete message of the day?","Skutečně smazat zprávu dne?"}.
+{"Recipient is not in the conference room","Příjemce se nenachází v konferenční místnosti"}.
 {"Register a Jabber account","Zaregistrujte si účet Jabberu"}.
+{"Registered nicknames","Registrované přezdívky"}.
 {"Registered Users","Registrovaní uživatelé"}.
 {"Registered Users:","Registrovaní živatelé:"}.
 {"Register","Zaregistrovat se"}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Okamžitě obnovit binární zálohu:"}.
 {"Restore","Obnovit"}.
 {"Restore plain text backup immediately:","Okamžitě obnovit zálohu z textového souboru:"}.
+{"Roles for which Presence is Broadcasted","Role, pro které je zpráva o stavu šířena"}.
 {"Room Configuration","Nastavení místnosti"}.
+{"Room creation is denied by service policy","Pravidla služby nepovolují vytvořit místnost"}.
 {"Room description","Popis místnosti"}.
 {"Room Occupants","Počet účastníků"}.
 {"Room title","Název místnosti"}.
@@ -292,6 +333,7 @@
 {"September",". září"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"Server","Server"}.
 {"Set message of the day and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Set message of the day on all hosts and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Shared Roster Groups","Skupiny pro sdílený seznam kontaktů"}.
@@ -299,7 +341,7 @@
 {"Show Ordinary Table","Zobrazit běžnou tabulku"}.
 {"Shut Down Service","Vypnout službu"}.
 {"~s invites you to the room ~s","~s vás zve do místnosti ~s"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Někteří klienti umí uložit vaše heslo na disk počítače. Tuto funkci používejte, pouze pokud věříte zabezpečení svého počítače."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Někteří klienti umí uložit vaše heslo na disk počítače. Tuto funkci používejte, pouze pokud věříte zabezpečení svého počítače."}.
 {"Specify the access model","Uveďte přístupový model"}.
 {"Specify the event message type","Zvolte typ zpráv pro události"}.
 {"Specify the publisher model","Specifikovat model pro publikování"}.
@@ -322,33 +364,44 @@
 {"Subscriber Address","Adresa odběratele"}.
 {"Subscription","Přihlášení"}.
 {"Sunday","Neděle"}.
+{"That nickname is already in use by another occupant","Přezdívka je již používána jiným členem"}.
+{"That nickname is registered by another person","Přezdívka je zaregistrována jinou osobou"}.
 {"The CAPTCHA is valid.","CAPTCHA souhlasí."}.
+{"The CAPTCHA verification has failed","Ověření CAPTCHA se nezdařilo"}.
 {"The collections with which a node is affiliated","Kolekce, se kterými je uzel spřízněn"}.
 {"the password is","heslo je"}.
+{"The password is too weak","Heslo je příliš slabé"}.
 {"The password of your Jabber account was successfully changed.","Heslo vašeho účtu Jabberu bylo úspěšně změněno."}.
 {"There was an error changing the password: ","Při změně hesla došlo k chybě: "}.
 {"There was an error creating the account: ","Při vytváření účtu došlo k chybě."}.
 {"There was an error deleting the account: ","Při mazání účtu došlo k chybě: "}.
+{"This IP address is blacklisted in ~s","IP adresa je blokována na ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Zde nezáleží na velikosti písmen: macbeth je stejný jako MacBeth a Macbeth."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Na této stránce si můžete vytvořit účet na tomto serveru Jabberu. Vaše JID (Jabber IDentifikátor) bude mít tvar: uživatelskéjméno@server. Přečtěte si prosím pozorně instrukce pro vyplnění údajů."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Zde můžete zrušit registraci účtu na tomto serveru Jabberu."}.
-{"This room is not anonymous","Tato místnost není anonymní"}.
 {"Thursday","Čtvrtek"}.
 {"Time","Čas"}.
 {"Time delay","Časový posun"}.
+{"Too many CAPTCHA requests","Přiliš mnoho CAPTCHA žádostí"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Příliš mnoho (~p) chybných pokusů o přihlášení z této IP adresy (~s). Adresa bude zablokována do ~s UTC"}.
+{"Too many unacked stanzas","Příliš mnoho nepotvrzených stanz"}.
 {"To","Pro"}.
 {"To ~s","Pro ~s"}.
+{"Total rooms","Celkem konferencí"}.
+{"Traffic rate limit is exceeded","Byl překročen limit"}.
 {"Transactions Aborted:","Transakce zrušena"}.
 {"Transactions Committed:","Transakce potvrzena"}.
 {"Transactions Logged:","Transakce zaznamenána"}.
 {"Transactions Restarted:","Transakce restartována"}.
 {"Tuesday","Úterý"}.
+{"Unable to generate a CAPTCHA","Nebylo možné vygenerovat CAPTCHA"}.
 {"Unauthorized","Nemáte oprávnění"}.
 {"Unregister a Jabber account","Zrušte registraci účtu Jabberu"}.
 {"Unregister","Zrušit registraci"}.
 {"Update","Aktualizovat"}.
 {"Update message of the day (don't send)","Aktualizovat zprávu dne (neodesílat)"}.
 {"Update message of the day on all hosts (don't send)","Aktualizovat zprávu dne pro všechny hostitele (neodesílat)"}.
+{"Update ~p","Aktualizovat ~p"}.
 {"Update plan","Aktualizovat plán"}.
 {"Update script","Aktualizované skripty"}.
 {"Uptime:","Čas běhu:"}.
@@ -356,22 +409,32 @@
 {"User JID","Jabber ID uživatele"}.
 {"User Management","Správa uživatelů"}.
 {"Username:","Uživatelské jméno:"}.
+{"User ~s",""}.
+{"Users are not allowed to register accounts so quickly","Je zakázáno registrovat účty v tak rychlém sledu"}.
 {"Users Last Activity","Poslední aktivita uživatele"}.
 {"Users","Uživatelé"}.
 {"User","Uživatel"}.
 {"Validate","Ověřit"}.
 {"vCard User Search","Hledání uživatelů podle vizitek"}.
 {"Virtual Hosts","Virtuální hostitelé"}.
+{"Visitor","Návštěvník"}.
+{"Visitors are not allowed to change their nicknames in this room","Návštěvníkům této místnosti je zakázáno měnit přezdívku"}.
+{"Visitors are not allowed to send messages to all occupants","Návštevníci nemají povoleno zasílat zprávy všem účastníkům konference"}.
+{"Voice requests are disabled in this conference","Voice žádosti jsou v této konferenci zakázány"}.
 {"Voice request","Žádost o voice práva"}.
 {"Wednesday","Středa"}.
 {"When to send the last published item","Kdy odeslat poslední publikovanou položku"}.
 {"Whether to allow subscriptions","Povolit odebírání"}.
 {"You can later change your password using a Jabber client.","Později můžete své heslo změnit pomocí klienta Jabberu."}.
+{"You have been banned from this room","Byl jste vyloučen z této místnosti"}.
+{"You must fill in field \"Nickname\" in the form","Musíte vyplnit políčko \"Přezdívka\" ve formuláři"}.
 {"You need a client that supports x:data and CAPTCHA to register","Pro registraci potřebujete klienta s podporou x:data a CAPTCHA"}.
 {"You need a client that supports x:data to register the nickname","Pro registraci přezdívky potřebujete klienta s podporou x:data"}.
 {"You need an x:data capable client to configure mod_irc settings","Pro konfiguraci mod_irc potřebujete klienta s podporou x:data"}.
 {"You need an x:data capable client to configure room","Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}.
 {"You need an x:data capable client to search","K vyhledávání potřebujete klienta podporujícího x:data"}.
+{"Your active privacy list has denied the routing of this stanza.","Vaše nastavení soukromí znemožnilo směrování této stance."}.
+{"Your contact offline message queue is full. The message has been discarded.","Fronta offline zpráv pro váš kontakt je plná. Zpráva byla zahozena."}.
 {"Your Jabber account was successfully created.","Váš účet Jabberu byl úspěšně vytvořen."}.
 {"Your Jabber account was successfully deleted.","Váš účet Jabberu byl úspěšně smazán."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Nesmíte posílat zprávy na ~s. Pro povolení navštivte ~s"}.

priv/msgs/de.msg

@@ -1,16 +1,19 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Akzeptieren"}.
 {"Access Configuration","Zugangskonfiguration"}.
 {"Access Control List Configuration","Konfiguration der Zugangskontrolllisten"}.
 {"Access control lists","Zugangskontroll-Listen (ACL)"}.
 {"Access Control Lists","Zugangskontroll-Listen (ACL)"}.
+{"Access denied by service policy","Zugang aufgrund der Dienstrichtlinien verweigert"}.
 {"Access rules","Zugangsregeln"}.
 {"Access Rules","Zugangsregeln"}.
 {"Action on user","Aktion auf Benutzer"}.
 {"Add Jabber ID","Jabber-ID hinzufügen"}.
-{"Add New","Neue hinzufügen"}.
+{"Add New","Neue(n) hinzufügen"}.
 {"Add User","Benutzer hinzufügen"}.
 {"Administration of ","Administration von "}.
 {"Administration","Verwaltung"}.
+{"Administrator privileges required","Administratorenrechte benötigt"}.
 {"A friendly name for the node","Ein merkbarer Name für den Knoten"}.
 {"All activity","Alle Aktivitäten"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Dieser Jabber-ID das Abonnement dieses pubsub-Knotens erlauben?"}.
@@ -18,17 +21,19 @@
 {"Allow users to query other users","Erlaube Benutzern Informationen über andere Benutzer abzufragen"}.
 {"Allow users to send invites","Erlaube Benutzern Einladungen zu senden"}.
 {"Allow users to send private messages","Erlaube Benutzern private Nachrichten zu senden"}.
-{"Allow visitors to change nickname","Erlaube Besuchern ihren Spitznamen zu ändern"}.
+{"Allow visitors to change nickname","Erlaube Besuchern ihren Benutzernamen zu ändern"}.
 {"Allow visitors to send private messages to","Erlaube Besuchern das Senden von privaten Nachrichten an"}.
 {"Allow visitors to send status text in presence updates","Erlaube Besuchern einen Text bei Statusänderung zu senden"}.
 {"Allow visitors to send voice requests","Anfragen von Sprachrechten für Benutzer erlauben"}.
 {"All Users","Alle Benutzer"}.
 {"Announcements","Ankündigungen"}.
 {"anyone","jeden"}.
+{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
 {"April","April"}.
 {"August","August"}.
 {"Backup","Datensicherung"}.
 {"Backup Management","Datensicherungsverwaltung"}.
+{"Backup of ~p","Sicherung von ~p"}.
 {"Backup to File at ","Datensicherung in die Datei "}.
 {"Bad format","Ungültiges Format"}.
 {"Birthday","Geburtsdatum"}.
@@ -45,9 +50,10 @@
 {"Choose a username and password to register with this server","Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"}.
 {"Choose modules to stop","Wähle zu stoppende Module"}.
 {"Choose storage type of tables","Wähle Speichertyp der Tabellen"}.
-{"Choose whether to approve this entity's subscription.","Wähle Sie, ob dieses Abonnement akzeptiert werden soll."}.
+{"Choose whether to approve this entity's subscription.","Wählen sie, ob dieses Abonnement akzeptiert werden soll."}.
 {"City","Stadt"}.
 {"Commands","Befehle"}.
+{"Conference room does not exist","Konferenzraum existiert nicht"}.
 {"Configuration","Konfiguration"}.
 {"Configuration of room ~s","Konfiguration für Raum ~s"}.
 {"Connected Resources:","Verbundene Ressourcen:"}.
@@ -55,10 +61,10 @@
 {"Country","Land"}.
 {"CPU Time:","CPU-Zeit:"}.
 {"Database","Datenbank"}.
+{"Database Tables at ~p","Datenbanktabellen auf ~p"}.
 {"Database Tables Configuration at ","Datenbanktabellen-Konfiguration auf "}.
 {"December","Dezember"}.
-{"Default users as participants","Standardbenutzer als Teilnehmer"}.
-{"Delete","Löschen"}.
+{"Default users as participants","Benutzer werden standardmäßig vollwertige Teilnehmer"}.
 {"Delete message of the day","Lösche Nachricht des Tages"}.
 {"Delete message of the day on all hosts","Lösche Nachricht des Tages auf allen Hosts"}.
 {"Delete Selected","Markierte löschen"}.
@@ -75,34 +81,39 @@
 {"Either approve or decline the voice request.","Diese Anfrage für Sprachrechte bestätigen oder ablehnen."}.
 {"ejabberd IRC module","ejabberd IRC-Modul"}.
 {"ejabberd MUC module","ejabberd MUC-Modul"}.
+{"ejabberd Multicast service","ejabberd Multicast Dienst"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe-Modul"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5-Bytestreams-Modul"}.
 {"ejabberd vCard module","ejabberd vCard-Modul"}.
 {"ejabberd Web Admin","ejabberd Web-Admin"}.
 {"Elements","Elemente"}.
 {"Email","E-Mail"}.
+{"Empty Rooms","Leere Räume"}.
 {"Enable logging","Protokollierung aktivieren"}.
+{"Enable message archiving","Nachrichtenarchivierung aktivieren"}.
 {"Encoding for server ~b","Kodierung für Server ~b"}.
 {"End User Session","Benutzer-Sitzung beenden"}.
 {"Enter list of {Module, [Options]}","Geben sie eine Liste bestehend aus {Modul, [Optionen]} ein"}.
 {"Enter nickname you want to register","Geben sie den zu registrierenden Benutzernamen ein"}.
 {"Enter path to backup file","Geben sie den Pfad zur Datensicherung ein"}.
-{"Enter path to jabberd14 spool dir","Geben Sie den Pfad zum jabberd14-Spool-Verzeichnis ein"}.
-{"Enter path to jabberd14 spool file","Geben Sie den Pfad zur jabberd14-Spool-Datei ein"}.
+{"Enter path to jabberd14 spool dir","Geben sie den Pfad zum jabberd14-Spool-Verzeichnis ein"}.
+{"Enter path to jabberd14 spool file","Geben sie den Pfad zur jabberd14-Spool-Datei ein"}.
 {"Enter path to text file","Geben sie den Pfad zur Textdatei ein"}.
 {"Enter the text you see","Geben sie den Text den sie sehen ein"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Geben sie Benutzernamen und Kodierung für Verbindungen zu IRC Servern an. Drücken sie 'Mehr' um leere Felder hinzuzufügen. Drücken sie 'Beenden' um die Einstellungen zu speichern."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben Sie Benutzernamen und Zeichenkodierung für die Verbindung zum IRC-Server an"}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben sie den Benutzernamen, Zeichenkodierung, Ports und Passwörter, die sie für die Verbindung zum IRC-Server verwenden wollen, an"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","Fehler"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Beispiel: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Von CAPTCHA Überprüfung ausgeschlossene Jabber IDs"}.
+{"Export all tables as SQL queries to a file:","Alle Tabellen als SQL Abfragen in eine Datei exportieren:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Alle Benutzerdaten des Servers in PIEFXIS Dateien (XEP-0227) exportieren:"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Alle Benutzerdaten des Hosts in PIEFXIS Dateien (XEP-0227) exportieren:"}.
+{"Failed to extract JID from your voice request approval","Fehler beim Auslesen der JID aus der Anfragenbestätigung für Sprachrechte"}.
 {"Family Name","Nachname"}.
 {"February","Februar"}.
-{"Fill in fields to search for any matching Jabber User","Füllen Sie die Felder aus, um nach passenden Jabber-Benutzern zu suchen"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen Sie die Felder aus, um nach passenden Jabber-Benutzern zu suchen (beenden Sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}.
+{"Fill in fields to search for any matching Jabber User","Füllen sie die Felder aus, um nach bestimmten Jabber-Benutzern zu suchen"}.
+{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen sie die Felder aus, um nach passenden Jabber-Benutzern zu suchen (beenden Sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}.
 {"Friday","Freitag"}.
 {"From ~s","Von ~s"}.
 {"From","Von"}.
@@ -116,10 +127,10 @@
 {"Group ","Gruppe "}.
 {"Groups","Gruppen"}.
 {"has been banned","wurde gebannt"}.
-{"has been kicked because of an affiliation change","wurde wegen Änderung des Mitgliederstatus gekickt"}.
-{"has been kicked because of a system shutdown","wurde wegen Systemabschaltung gekickt"}.
-{"has been kicked because the room has been changed to members-only","wurde gekickt weil der Raum auf Nur-Mitglieder umgestellt wurde"}.
-{"has been kicked","wurde gekickt"}.
+{"has been kicked because of an affiliation change","wurde wegen Änderung des Mitgliederstatus entfernt"}.
+{"has been kicked because of a system shutdown","wurde wegen einer Systemabschaltung entfernt"}.
+{"has been kicked because the room has been changed to members-only","wurde entfernt weil der Raum auf Nur-Mitglieder umgestellt wurde"}.
+{"has been kicked","wurde entfernt"}.
 {" has set the subject to: "," hat das Thema geändert auf: "}.
 {"Host","Host"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Wenn sie das CAPTCHA Bild nicht sehen, besuchen sie bitte die Webseite."}.
@@ -132,6 +143,9 @@
 {"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14 Spool Verzeichnis:"}.
 {"Import Users from Dir at ","Benutzer importieren aus dem Verzeichnis "}.
 {"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spool-Dateien"}.
+{"Improper message type","Unzulässiger Nachrichtentyp"}.
+{"Incoming s2s Connections:","Eingehende s2s-Verbindungen:"}.
+{"Incorrect password","Falsches Passwort"}.
 {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}.
 {"Invalid role: ~s","Ungültige Rolle: ~s"}.
 {"IP addresses","IP Adressen"}.
@@ -143,6 +157,10 @@
 {"IRC username","IRC Benutzername"}.
 {"IRC Username","IRC-Benutzername"}.
 {"is now known as","ist nun bekannt als"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Es ist nicht erlaubt Fehlermeldungen an den Raum zu senden. Der Teilnehmer (~s) hat eine Fehlermeldung (~s) gesendet und wurde aus dem Raum entfernt"}.
+{"It is not allowed to send private messages","Es ist nicht erlaubt private Nachrichten zu senden"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Es ist nicht erlaubt private Nachrichten des Typs \"Gruppenchat\" zu senden"}.
+{"It is not allowed to send private messages to the conference","Es ist nicht erlaubt private Nachrichten an den Raum zu schicken"}.
 {"Jabber Account Registration","Jabber Konto Anmeldung"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Die Jabber-ID ~s ist ungültig"}.
@@ -161,6 +179,7 @@
 {"Listened Ports","Aktive Ports"}.
 {"Listened Ports at ","Aktive Ports bei"}.
 {"List of modules to start","Liste der zu startenden Module"}.
+{"List of rooms","Liste von Chaträumen"}.
 {"Low level update script","Low level Aktualisierungsscript"}.
 {"Make participants list public","Teilnehmerliste öffentlich machen"}.
 {"Make room CAPTCHA protected","Raum mit Verifizierung (Captcha) versehen"}.
@@ -174,29 +193,36 @@
 {"Max # of items to persist","Maximale Anzahl dauerhaft zu speichernder Einträge"}.
 {"Max payload size in bytes","Maximale Nutzlastgrösse in Bytes"}.
 {"May","Mai"}.
+{"Membership is required to enter this room","Um diesen Raum zu betreten müssen sie Mitglied sein"}.
 {"Members:","Mitglieder:"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Merken sie sich ihr Passwort, oder schreiben sie es auf einen Zettel den sie sicher verwahren. Bei Jabber gibt es keine automatische Möglichkeit, das Passwort wiederherzustellen."}.
 {"Memory","Speicher"}.
 {"Message body","Nachrichtentext"}.
 {"Middle Name","Zweiter Vorname"}.
 {"Minimum interval between voice requests (in seconds)","Mindestdauer zwischen Anfragen für Sprachrechte (in Sekunden)"}.
+{"Moderator","Moderator"}.
+{"Moderator privileges required","Moderatorrechte benötigt"}.
 {"moderators only","ausschliesslich Moderatoren"}.
 {"Modified modules","Geänderte Module"}.
 {"Module","Modul"}.
+{"Modules at ~p","Module bei ~p"}.
 {"Modules","Module"}.
 {"Monday","Montag"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Mehrbenutzer-Chat (MUC)"}.
 {"Name:","Name:"}.
 {"Name","Vorname"}.
 {"Never","Nie"}.
 {"New Password:","Neues Passwort:"}.
 {"Nickname","Benutzername"}.
-{"Nickname Registration at ","Registrieren des Benutzernames auf"}.
+{"Nickname Registration at ","Registrieren des Benutzernames auf "}.
 {"Nickname ~s does not exist in the room","Der Benutzername ~s existiert im Raum nicht"}.
 {"nobody","niemanden"}.
-{"No body provided for announce message","Kein Text für die Ankündigung angegeben"}.
+{"No body provided for announce message","Kein Text für die Ankündigungsnachricht angegeben"}.
 {"No Data","Keine Daten"}.
 {"Node ID","Knoten-ID"}.
 {"Node not found","Knoten nicht gefunden"}.
+{"Node ~p","Knoten ~p"}.
 {"Nodes","Knoten"}.
 {"No limit","Keine Begrenzung"}.
 {"None","Keine"}.
@@ -218,15 +244,21 @@
 {"Online Users:","Angemeldete Benutzer:"}.
 {"Online Users","Angemeldete Benutzer"}.
 {"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}.
+{"Only members may query archives of this room","Nur Mitglieder dürfen den Verlauf dieses Raumes abrufen"}.
 {"Only moderators and participants are allowed to change the subject in this room","Nur Moderatoren und Mitglieder dürfen das Thema in diesem Raum ändern"}.
 {"Only moderators are allowed to change the subject in this room","Nur Moderatoren dürfen das Thema in diesem Raum ändern"}.
+{"Only moderators can approve voice requests","Nur Moderatoren können Anfragen für Sprachrechte bestätigen"}.
+{"Only occupants are allowed to send messages to the conference","Nur Teilnehmer dürfen Nachrichten an den Raum schicken"}.
+{"Only occupants are allowed to send queries to the conference","Nur Teilnehmer sind berechtigt Anfragen an die Konferenz zu senden"}.
+{"Only service administrators are allowed to send service messages","Nur Service-Administratoren sind berechtigt, Servicenachrichten zu versenden"}.
 {"Options","Optionen"}.
-{"Organization Name","Organisation"}.
+{"Organization Name","Name der Organisation"}.
 {"Organization Unit","Abteilung"}.
 {"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
 {"Outgoing s2s Connections","Ausgehende s2s-Verbindungen"}.
-{"Outgoing s2s Servers:","Ausgehende s2s-Server:"}.
+{"Owner privileges required","Besitzerrechte benötigt"}.
 {"Packet","Paket"}.
+{"Participant","Teilnehmer"}.
 {"Password ~b","Passwort ~b"}.
 {"Password:","Passwort:"}.
 {"Password","Passwort"}.
@@ -234,11 +266,15 @@
 {"Password Verification","Passwort bestätigen"}.
 {"Path to Dir","Pfad zum Verzeichnis"}.
 {"Path to File","Pfad zur Datei"}.
-{"Pending","anhängig"}.
+{"Pending","Schwebend"}.
 {"Period: ","Zeitraum: "}.
+{"Permanent rooms","Permanente Chaträume"}.
 {"Persist items to storage","Einträge dauerhaft speichern"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Beachten sie, das diese Optionen nur die eingebaute Mnesia-Datenbank sichern. Wenn sie das ODBC-Modul verwenden, müssen sie die SQL-Datenbank manuell sichern."}.
+{"Please specify file name.","Bitte geben Sie den Dateinamen an."}.
+{"Please specify file size.","Bitte geben Sie die Dateigröße an."}.
+{"Please, wait for a while before sending new voice request","Bitte warten sie ein wenig, bevor sie eine weitere Anfrage für Sprachrechte senden"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,12 +284,15 @@
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub-Abonnenten-Anfrage"}.
 {"Purge all items when the relevant publisher goes offline","Alle Einträge entfernen, wenn der relevante Veröffentlicher offline geht"}.
+{"Queries to the conference members are not allowed in this room","Anfragen an die Teilnehmer sind in diesem Raum nicht erlaubt"}.
 {"RAM and disc copy","RAM und Festplatte"}.
 {"RAM copy","Nur RAM"}.
 {"Raw","Unformatiert"}.
 {"Really delete message of the day?","Die Nachricht des Tages wirklich löschen?"}.
+{"Recipient is not in the conference room","Der Empfänger ist nicht im Raum"}.
 {"Register a Jabber account","Jabber Konto registrieren"}.
 {"Register","Anmelden"}.
+{"Registered nicknames","Registrierte Benutzernamen"}.
 {"Registered Users:","Registrierte Benutzer:"}.
 {"Registered Users","Registrierte Benutzer"}.
 {"Registration in mod_irc for ","Registrierung in mod_irc für "}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Stelle binäre Sicherung sofort wieder her:"}.
 {"Restore plain text backup immediately:","Stelle Klartext-Sicherung sofort wieder her:"}.
 {"Restore","Wiederherstellung"}.
+{"Roles for which Presence is Broadcasted","Rollen, für die der Status übertragen wird"}.
 {"Room Configuration","Raum-Konfiguration"}.
+{"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}.
 {"Room description","Raum Beschreibung"}.
 {"Room Occupants","Teilnehmer in diesem Raum"}.
 {"Room title","Raumname"}.
@@ -292,14 +333,15 @@
 {"September","September"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"Server","Server"}.
 {"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}.
 {"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}.
 {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}.
-{"Show Integral Table","Vollständige Tabelle anzeigen"}.
-{"Show Ordinary Table","Normale Tabelle anzeigen"}.
+{"Show Integral Table","Integrale Tabelle anzeigen"}.
+{"Show Ordinary Table","Gewöhnliche Tabelle anzeigen"}.
 {"Shut Down Service","Dienst herunterfahren"}.
-{"~s invites you to the room ~s","~s lädt Sie in den Raum ~s ein"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Einige Jabber Client Programme speichern ihr Passwort auf ihrem Computer. Verwenden sie diese Möglichkeit nur auf Computern, die sie als sicher einstufen."}.
+{"~s invites you to the room ~s","~s lädt sie in den Raum ~s ein"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Einige Jabber Client Programme speichern ihr Passwort auf ihrem Computer. Verwenden sie diese Möglichkeit nur auf Computern, die sie als sicher einstufen."}.
 {"Specify the access model","Geben sie das Zugangsmodell an"}.
 {"Specify the event message type","Geben sie den Ereignis-Nachrichtentyp an"}.
 {"Specify the publisher model","Geben sie das Publikationsmodell an"}.
@@ -308,10 +350,10 @@
 {"Start Modules","Module starten"}.
 {"Start","Starten"}.
 {"Statistics of ~p","Statistiken von ~p"}.
-{"Statistics","Statistik"}.
+{"Statistics","Statistiken"}.
 {"Stop Modules at ","Stoppe Module auf "}.
 {"Stop Modules","Module stoppen"}.
-{"Stopped Nodes","Inaktive Knoten"}.
+{"Stopped Nodes","Angehaltene Knoten"}.
 {"Stop","Stoppen"}.
 {"Storage Type","Speichertyp"}.
 {"Store binary backup:","Speichere binäre Sicherung:"}.
@@ -322,33 +364,44 @@
 {"Subscriber Address","Abonnenten-Adresse"}.
 {"Subscription","Abonnement"}.
 {"Sunday","Sonntag"}.
+{"That nickname is already in use by another occupant","Dieser Benutzername wird bereits von einem Teilnehmer genutzt"}.
+{"That nickname is registered by another person","Dieser Benutzername wurde bereits von jemand anderem registriert"}.
 {"The CAPTCHA is valid.","Die Verifizierung ist gültig."}.
+{"The CAPTCHA verification has failed","Die CAPTCHA Verifizierung schlug fehl"}.
 {"The collections with which a node is affiliated","Sammlungen, mit denen ein Knoten verknüpft ist"}.
 {"the password is","das Passwort lautet"}.
+{"The password is too weak","Das Passwort ist zu einfach"}.
 {"The password of your Jabber account was successfully changed.","Das Passwort von ihrem Jabber Konto wurde geändert."}.
-{"There was an error changing the password: ","Es trat ein Fehler beim Ändern des Passworts auf:"}.
-{"There was an error creating the account: ","Es trat ein Fehler beim erstellen des Kontos auf:"}.
-{"There was an error deleting the account: ","Es trat ein Fehler beim Löschen des Kontos auf:"}.
+{"There was an error changing the password: ","Es trat ein Fehler beim Ändern des Passworts auf: "}.
+{"There was an error creating the account: ","Es trat ein Fehler beim Erstellen des Kontos auf: "}.
+{"There was an error deleting the account: ","Es trat ein Fehler beim Löschen des Kontos auf: "}.
+{"This IP address is blacklisted in ~s","Diese IP Adresse ist blockiert in ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Groß/Klein-Schreibung spielt hierbei keine Rolle: macbeth ist gleich MacBeth und Macbeth."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das anlegen eines Jabber Kontos auf diesem Jabber Server. Ihre JID (Jabber IDentifier) setzt sich folgend zusammen: benutzername@server. Bitte lesen sie die Hinweise genau durch, um die Felder korrekt auszufüllen."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Diese Seite erlaubt es, ein Jabber Konto von diesem Server zu entfernen."}.
-{"This room is not anonymous","Dieser Raum ist nicht anonym"}.
 {"Thursday","Donnerstag"}.
 {"Time delay","Zeitverzögerung"}.
 {"Time","Zeit"}.
 {"To","An"}.
+{"Too many CAPTCHA requests","Zu viele CAPTCHA Anfragen"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Zu viele (~p) fehlgeschlagene Anmeldeversuche von dieser IP Adresse (~s). Die Adresse wird bis ~s UTC blockiert."}.
+{"Too many unacked stanzas","Zu viele unbestätigte Stanzas"}.
 {"To ~s","An ~s"}.
+{"Total rooms","Alle Chaträume"}.
+{"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}.
 {"Transactions Aborted:","Abgebrochene Transaktionen:"}.
 {"Transactions Committed:","Durchgeführte Transaktionen:"}.
 {"Transactions Logged:","Protokollierte Transaktionen:"}.
 {"Transactions Restarted:","Neu gestartete Transaktionen:"}.
 {"Tuesday","Dienstag"}.
+{"Unable to generate a CAPTCHA","Konnte CAPTCHA nicht erstellen"}.
 {"Unauthorized","Nicht berechtigt"}.
 {"Unregister","Abmelden"}.
 {"Unregister a Jabber account","Jabber Konto entfernen"}.
 {"Update","Aktualisieren"}.
 {"Update message of the day (don't send)","Aktualisiere Nachricht des Tages (nicht senden)"}.
 {"Update message of the day on all hosts (don't send)","Aktualisiere Nachricht des Tages auf allen Hosts (nicht senden)"}.
+{"Update ~p","Aktualisierung ~p"}.
 {"Update plan","Aktualisierungsplan"}.
 {"Update script","Aktualisierungsscript"}.
 {"Uptime:","Betriebszeit:"}.
@@ -357,21 +410,31 @@
 {"User JID","Benutzer JID"}.
 {"User Management","Benutzerverwaltung"}.
 {"Username:","Benutzername:"}.
+{"Users are not allowed to register accounts so quickly","Benutzer dürfen Konten nicht so schnell registrieren"}.
 {"Users","Benutzer"}.
+{"User ~s","Benutzer ~s"}.
 {"Users Last Activity","Letzte Benutzeraktivität"}.
 {"Validate","Validieren"}.
 {"vCard User Search","vCard-Benutzer-Suche"}.
 {"Virtual Hosts","Virtuelle Hosts"}.
+{"Visitor","Besucher"}.
+{"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Benutzernamen nicht ändern"}.
+{"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten verschicken"}.
 {"Voice request","Anfrage für Sprachrechte"}.
+{"Voice requests are disabled in this conference","Anfragen für Sprachrechte sind in diesem Raum deaktiviert"}.
 {"Wednesday","Mittwoch"}.
-{"When to send the last published item","Wann soll das letzte veröffentlichte Objekt gesendet werden"}.
+{"When to send the last published item","Wann das letzte veröffentlichte Objekt gesendet werden soll"}.
 {"Whether to allow subscriptions","Ob Abonnements erlaubt sind"}.
 {"You can later change your password using a Jabber client.","Sie können das Passwort später mit einem Jabber Client Programm ändern."}.
+{"You have been banned from this room","Sie wurden aus diesem Raum verbannt"}.
+{"You must fill in field \"Nickname\" in the form","Sie müssen das Feld \"Benutzername\" ausfüllen"}.
 {"You need a client that supports x:data and CAPTCHA to register","Sie benötigen einen Client, der x:data und CAPTCHA unterstützt, um Ihren Benutzernamen zu registrieren"}.
 {"You need a client that supports x:data to register the nickname","Sie benötigen einen Client, der x:data unterstützt, um Ihren Benutzernamen zu registrieren"}.
 {"You need an x:data capable client to configure mod_irc settings","Sie benötigen einen Client, der x:data unterstützt, um die mod_irc-Einstellungen zu konfigurieren"}.
 {"You need an x:data capable client to configure room","Sie benötigen einen Client, der x:data unterstützt, um den Raum zu konfigurieren"}.
 {"You need an x:data capable client to search","Sie benötigen einen Client, der x:data unterstützt, um die Suche verwenden zu können"}.
+{"Your active privacy list has denied the routing of this stanza.","Ihre aktive Privacy Liste hat die Weiterleitung des Stanzas unterbunden."}.
+{"Your contact offline message queue is full. The message has been discarded.","Ihre Offline-Nachrichten-Warteschlange ist voll. Die Nachricht wurde verworfen."}.
 {"Your Jabber account was successfully created.","Ihr Jabber Konto wurde erfolgreich erstellt."}.
 {"Your Jabber account was successfully deleted.","Ihr Jabber Konto wurde erfolgreich gelöscht."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Ihre Nachrichten an ~s werden blockiert. Um dies zu ändern, besuchen sie ~s"}.