Remove mod_ctlextra in master because was obsoleted by mod_admin_extra
This commit is contained in:
Badlop
parent
4b117b5fe5
commit
cadc841927
|
|
@ -1,343 +0,0 @@
|
||||||
As a special exception, the authors give permission to link this program
|
|
||||||
with the OpenSSL library and distribute the resulting binary.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
this service if you wish), that you receive source code or can get it
|
|
||||||
if you want it, that you can change the software or use pieces of it
|
|
||||||
in new free programs; and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
|
||||||
These restrictions translate to certain responsibilities for you if you
|
|
||||||
distribute copies of the software, or if you modify it.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
|
||||||
you have. You must make sure that they, too, receive or can get the
|
|
||||||
source code. And you must show them these terms so they know their
|
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
|
||||||
distribute and/or modify the software.
|
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
|
||||||
that everyone understands that there is no warranty for this free
|
|
||||||
software. If the software is modified by someone else and passed on, we
|
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
|
||||||
program will individually obtain patent licenses, in effect making the
|
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
|
||||||
stating that you changed the files and the date of any change.
|
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
|
||||||
whole or in part contains or is derived from the Program or any
|
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
|
||||||
exercise the right to control the distribution of derivative or
|
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
|
||||||
a storage or distribution medium does not bring the other work under
|
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
|
||||||
source code, which must be distributed under the terms of Sections
|
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, complete source
|
|
||||||
code means all the source code for all modules it contains, plus any
|
|
||||||
associated interface definition files, plus the scripts used to
|
|
||||||
control compilation and installation of the executable. However, as a
|
|
||||||
special exception, the source code distributed need not include
|
|
||||||
anything that is normally distributed (in either source or binary
|
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
|
||||||
access to copy from a designated place, then offering equivalent
|
|
||||||
access to copy the source code from the same place counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
|
||||||
signed it. However, nothing else grants you permission to modify or
|
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
|
||||||
these terms and conditions. You may not impose any further
|
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
|
||||||
You are not responsible for enforcing compliance by third parties to
|
|
||||||
this License.
|
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
|
||||||
infringement or for any other reason (not limited to patent issues),
|
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
|
||||||
patents or other property right claims or to contest validity of any
|
|
||||||
such claims; this section has the sole purpose of protecting the
|
|
||||||
integrity of the free software distribution system, which is
|
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies a version number of this License which applies to it and "any
|
|
||||||
later version", you have the option of following the terms and conditions
|
|
||||||
either of that version or of any later version published by the Free
|
|
||||||
Software Foundation. If the Program does not specify a version number of
|
|
||||||
this License, you may choose any version ever published by the Free Software
|
|
||||||
Foundation.
|
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
|
||||||
programs whose distribution conditions are different, write to the author
|
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
||||||
|
|
@ -1,92 +0,0 @@
|
||||||
2009-06-26 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Fix load-config call return.
|
|
||||||
|
|
||||||
2009-02-09 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Calculation of 'stats registeredusers'
|
|
||||||
works also with non-internal authentication methods (thanks to
|
|
||||||
Francois de Metz)(EJAB-864)
|
|
||||||
|
|
||||||
2008-10-31 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Remove duplicated command
|
|
||||||
delete-older-messages (EJAB-789)
|
|
||||||
|
|
||||||
2008-10-12 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* README.txt: Explain that the new mod_admin_extra provides the
|
|
||||||
same features and much more
|
|
||||||
|
|
||||||
2008-04-26 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: New command: ban-account
|
|
||||||
* README.txt: Documented new command
|
|
||||||
|
|
||||||
2008-04-04 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Added new command
|
|
||||||
rosteritem-purge [options]
|
|
||||||
|
|
||||||
2008-03-19 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Added two new commands for administration
|
|
||||||
of Shared Roster Groups: "srg-list-groups host" and "srg-get-info
|
|
||||||
group host" (thanks to Taylor Laramie)
|
|
||||||
|
|
||||||
2008-03-09 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Show the result of each table export
|
|
||||||
|
|
||||||
2008-03-04 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: New command 'stats
|
|
||||||
onlineusersnode'. Removed old unusued code.
|
|
||||||
|
|
||||||
* README.txt: Updated module page
|
|
||||||
|
|
||||||
2008-01-20 Badlop <badlop@process-one.net>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Allow to define group name with spaces
|
|
||||||
* README.txt: Likewise
|
|
||||||
|
|
||||||
2007-11-14 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Updated to ejabberd SVN.
|
|
||||||
|
|
||||||
2007-09-08 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Bugfix: unregister commands when module
|
|
||||||
stops. Removed all MUC-related commands.
|
|
||||||
|
|
||||||
2007-08-29 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Added command: stats uptime-seconds.
|
|
||||||
|
|
||||||
2007-08-24 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Fixed bug in vcard-set command that
|
|
||||||
forgot second level attributes.
|
|
||||||
|
|
||||||
2007-08-23 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Command add-rosteritem now pushes the
|
|
||||||
roster item to the client. New command rem-rosteritem.
|
|
||||||
|
|
||||||
2007-08-19 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Now vcard-get and vcard-set are more
|
|
||||||
compatible with mod_vcard_odbc and mod_vcard_ldap.
|
|
||||||
|
|
||||||
2007-08-16 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: add-rosteritem only adds an item in a
|
|
||||||
roster.
|
|
||||||
|
|
||||||
2007-08-07 Badlop <badlop@ono.com>
|
|
||||||
|
|
||||||
* src/mod_ctlextra.erl: Fixed indentation.
|
|
||||||
|
|
||||||
* ChangeLog: New file to track changes.
|
|
||||||
|
|
||||||
* README.txt: Removed Changelog section.
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
{'../ejabberd-dev/src/gen_mod', [{outdir, "../ejabberd-dev/ebin"},{i,"../ejabberd-dev/include"}]}.
|
|
||||||
{'src/mod_ctlextra', [{outdir, "ebin"},{i,"../ejabberd-dev/include"}]}.
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
mod_ctlextra - Additional commands for ejabberdctl
|
|
||||||
|
|
||||||
Homepage: http://www.ejabberd.im/mod_ctlextra
|
|
||||||
Author: Badlop
|
|
||||||
Module for ejabberd 2.0.*
|
|
||||||
|
|
||||||
|
|
||||||
IMPORTANT
|
|
||||||
=========
|
|
||||||
|
|
||||||
This module will only receive bugfixes. All the features provided by
|
|
||||||
this module are also provided by the new module mod_admin_extra.
|
|
||||||
|
|
||||||
If you are using ejabberd 2.1.0 or newer, use mod_admin_extra instead.
|
|
||||||
It provides generic ejabberd
|
|
||||||
commands that can be executed not only with ejabberdctl, but also with
|
|
||||||
other ejabberd-command frontends.
|
|
||||||
|
|
||||||
|
|
||||||
CONFIGURATION
|
|
||||||
=============
|
|
||||||
|
|
||||||
Add the module to your ejabberd.cfg, on the modules section:
|
|
||||||
{modules, [
|
|
||||||
...
|
|
||||||
{mod_ctlextra, []},
|
|
||||||
...
|
|
||||||
]}.
|
|
||||||
|
|
||||||
|
|
||||||
USAGE
|
|
||||||
=====
|
|
||||||
|
|
||||||
Now you have several new commands in ejabberdctl.
|
|
||||||
|
|
||||||
Description of some commands:
|
|
||||||
|
|
||||||
- vcard-*
|
|
||||||
Example: ejabberdctl eja@host vcard-get joe myjab.net email
|
|
||||||
|
|
||||||
- pushroster*
|
|
||||||
The file used by 'pushroster' and 'pushroster-all' must be placed:
|
|
||||||
- Windows: on the directory were you installed ejabberd:
|
|
||||||
'C:/Program Files/ejabberd'
|
|
||||||
- Other OS: on the same directory where the .beam files are.
|
|
||||||
Example content for the roster file:
|
|
||||||
[{"bob", "example.org", "workers", "Bob"},
|
|
||||||
{"mart", "example.org", "workers", "Mart"},
|
|
||||||
{"Rich", "example.org", "bosses", "Rich"}].
|
|
||||||
|
|
||||||
- srg-create
|
|
||||||
If you want to put a group Name with blankspaces, use the characters
|
|
||||||
"' and '" to define when the Name starts and ends.
|
|
||||||
For example:
|
|
||||||
ejabberdctl srg-create g1 example.org "'Group number 1'" this_is_g1 g1
|
|
||||||
|
|
||||||
- ban-account
|
|
||||||
|
|
||||||
This command kicks all the connected sessions of the account from the
|
|
||||||
server. It also changes his password to another randomly
|
|
||||||
generated, so he can't login anymore unless a server administrator
|
|
||||||
changes him again the password.
|
|
||||||
|
|
||||||
It is possible to define the reason of the ban. The new password
|
|
||||||
also includes the reason and the date and time of the ban.
|
|
||||||
|
|
||||||
For example, if this command is called:
|
|
||||||
ejabberdctl vhost example.org ban-account boby Spammed several MUC rooms
|
|
||||||
then the sessions of the local account which JID is boby@example.org
|
|
||||||
will be kicked, and its password will be set to something like this:
|
|
||||||
BANNED_ACCOUNT--20080425T21:45:07--2176635--Spammed_several_MUC_rooms
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
erl -pa ../ejabberd-dev/ebin -pa ebin -make
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
erl -pa ../ejabberd-dev/ebin -pz ebin -make
|
|
||||||
|
|
@ -1,895 +0,0 @@
|
||||||
%%%----------------------------------------------------------------------
|
|
||||||
%%% File : mod_ctlextra.erl
|
|
||||||
%%% Author : Badlop <badlop@ono.com>
|
|
||||||
%%% Purpose : Adds more commands to ejabberd_ctl
|
|
||||||
%%% Created : 30 Nov 2006 by Badlop <badlop@ono.com>
|
|
||||||
%%% Id : $Id: mod_ctlextra.erl 1020 2009-08-30 10:13:34Z badlop $
|
|
||||||
%%%----------------------------------------------------------------------
|
|
||||||
|
|
||||||
-module(mod_ctlextra).
|
|
||||||
-author('badlop@ono.com').
|
|
||||||
|
|
||||||
-behaviour(gen_mod).
|
|
||||||
|
|
||||||
-export([start/2,
|
|
||||||
stop/1,
|
|
||||||
ctl_process/2,
|
|
||||||
ctl_process/3
|
|
||||||
]).
|
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
|
||||||
-include("ejabberd_ctl.hrl").
|
|
||||||
-include("jlib.hrl").
|
|
||||||
-include("mod_roster.hrl").
|
|
||||||
|
|
||||||
%% Copied from ejabberd_sm.erl
|
|
||||||
-record(session, {sid, usr, us, priority, info}).
|
|
||||||
|
|
||||||
-compile(export_all).
|
|
||||||
|
|
||||||
%%-------------
|
|
||||||
%% gen_mod
|
|
||||||
%%-------------
|
|
||||||
|
|
||||||
start(Host, _Opts) ->
|
|
||||||
ejabberd_ctl:register_commands(commands_global(), ?MODULE, ctl_process),
|
|
||||||
ejabberd_ctl:register_commands(Host, commands_host(), ?MODULE, ctl_process).
|
|
||||||
|
|
||||||
stop(Host) ->
|
|
||||||
ejabberd_ctl:unregister_commands(commands_global(), ?MODULE, ctl_process),
|
|
||||||
ejabberd_ctl:unregister_commands(Host, commands_host(), ?MODULE, ctl_process).
|
|
||||||
|
|
||||||
commands_global() ->
|
|
||||||
[
|
|
||||||
{"compile file", "recompile and reload file"},
|
|
||||||
{"load-config file", "load config from file"},
|
|
||||||
{"remove-node nodename", "remove an ejabberd node from the database"},
|
|
||||||
|
|
||||||
%% ejabberd_auth
|
|
||||||
{"delete-older-users days", "delete users that have not logged in the last 'days'"},
|
|
||||||
{"delete-older-users-vhost host days", "delete users that not logged in last 'days' in 'host'"},
|
|
||||||
{"set-password user server password", "set password to user@server"},
|
|
||||||
|
|
||||||
%% ejd2odbc
|
|
||||||
{"export2odbc server output", "export Mnesia tables on server to files on output directory"},
|
|
||||||
|
|
||||||
%% mod_shared_roster
|
|
||||||
{"srg-create group host name description display", "create the group with options"},
|
|
||||||
{"srg-delete group host", "delete the group"},
|
|
||||||
{"srg-user-add user server group host", "add user@server to group on host"},
|
|
||||||
{"srg-user-del user server group host", "delete user@server from group on host"},
|
|
||||||
{"srg-list-groups host", "list the shared roster groups from host"},
|
|
||||||
{"srg-get-info group host", "get info of a specific group on host"},
|
|
||||||
|
|
||||||
%% mod_vcard
|
|
||||||
{"vcard-get user host data [data2]", "get data from the vCard of the user"},
|
|
||||||
{"vcard-set user host data [data2] content", "set data to content on the vCard"},
|
|
||||||
|
|
||||||
%% mod_announce
|
|
||||||
%% announce_send_online host message
|
|
||||||
%% announce_send_all host, message
|
|
||||||
|
|
||||||
%% mod_roster
|
|
||||||
{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2@server2 to user1@server1's roster"},
|
|
||||||
%%{"", "subs= none, from, to or both"},
|
|
||||||
%%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
|
|
||||||
%%{"", "will add mike@server.com to peter@localhost roster"},
|
|
||||||
{"rem-rosteritem user1 server1 user2 server2", "Remove user2@server2 from user1@server1's roster"},
|
|
||||||
{"rosteritem-purge [options]", "Purge all rosteritems that match filtering options"},
|
|
||||||
{"pushroster file user server", "push template roster in file to user@server"},
|
|
||||||
{"pushroster-all file", "push template roster in file to all those users"},
|
|
||||||
{"push-alltoall server group", "adds all the users to all the users in Group"},
|
|
||||||
|
|
||||||
{"status-list status", "list the logged users with status"},
|
|
||||||
{"status-num status", "number of logged users with status"},
|
|
||||||
|
|
||||||
{"stats registeredusers", "number of registered users"},
|
|
||||||
{"stats onlineusers", "number of logged users"},
|
|
||||||
{"stats onlineusersnode", "number of logged users in the ejabberd node"},
|
|
||||||
{"stats uptime-seconds", "uptime of ejabberd node in seconds"},
|
|
||||||
|
|
||||||
%% misc
|
|
||||||
{"get-cookie", "get the Erlang cookie of this node"},
|
|
||||||
{"killsession user server resource", "kill a user session"}
|
|
||||||
].
|
|
||||||
|
|
||||||
commands_host() ->
|
|
||||||
[
|
|
||||||
%% mod_last
|
|
||||||
{"num-active-users days", "number of users active in the last 'days'"},
|
|
||||||
{"status-list status", "list the logged users with status"},
|
|
||||||
{"status-num status", "number of logged users with status"},
|
|
||||||
{"stats registeredusers", "number of registered users"},
|
|
||||||
{"stats onlineusers", "number of logged users"},
|
|
||||||
|
|
||||||
%% misc
|
|
||||||
{"ban-account username [reason]", "ban account: kick sessions and change password"}
|
|
||||||
].
|
|
||||||
|
|
||||||
|
|
||||||
%%-------------
|
|
||||||
%% Commands global
|
|
||||||
%%-------------
|
|
||||||
|
|
||||||
ctl_process(_Val, ["delete-older-users", Days]) ->
|
|
||||||
{removed, N, UR} = delete_older_users(list_to_integer(Days)),
|
|
||||||
io:format("Deleted ~p users: ~p~n", [N, UR]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["delete-older-users-vhost", Host, Days]) ->
|
|
||||||
{removed, N, UR} = delete_older_users_vhost(Host, list_to_integer(Days)),
|
|
||||||
io:format("Deleted ~p users: ~p~n", [N, UR]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["export2odbc", Server, Output]) ->
|
|
||||||
Tables = [
|
|
||||||
{export_last, last},
|
|
||||||
{export_offline, offline},
|
|
||||||
{export_passwd, passwd},
|
|
||||||
{export_private_storage, private_storage},
|
|
||||||
{export_roster, roster},
|
|
||||||
{export_vcard, vcard},
|
|
||||||
{export_vcard_search, vcard_search}],
|
|
||||||
Export = fun({TableFun, Table}) ->
|
|
||||||
Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
|
|
||||||
io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
|
|
||||||
Res = (catch ejd2odbc:TableFun(Server, Filename)),
|
|
||||||
io:format(" Result: ~p~n", [Res])
|
|
||||||
end,
|
|
||||||
lists:foreach(Export, Tables),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["set-password", User, Server, Password]) ->
|
|
||||||
ejabberd_auth:set_password(User, Server, Password),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
|
|
||||||
{ok, Res} = vcard_get(User, Server, [Data]),
|
|
||||||
io:format("~s~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
|
|
||||||
{ok, Res} = vcard_get(User, Server, [Data1, Data2]),
|
|
||||||
io:format("~s~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
|
|
||||||
{ok, Res} = vcard_set(User, Server, [Data1], Content),
|
|
||||||
io:format("~s~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
|
|
||||||
{ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
|
|
||||||
io:format("~s~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["compile", Module]) ->
|
|
||||||
compile:file(Module),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["remove-node", Node]) ->
|
|
||||||
mnesia:del_table_copy(schema, list_to_atom(Node)),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
%% The Display argument can be several groups separated with ,
|
|
||||||
%% Example: ejabberdctl srg-create aa localhost Name Desc Display1,Display2,Display3
|
|
||||||
ctl_process(_Val, ["srg-create" | Parameters]) ->
|
|
||||||
[Group, Host, Name, Description, Display] = group_parameters(Parameters, "'"),
|
|
||||||
DisplayList = string:tokens(Display, ","),
|
|
||||||
Opts = [{name, Name}, {displayed_groups, DisplayList}, {description, Description}],
|
|
||||||
{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["srg-delete", Group, Host]) ->
|
|
||||||
{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
|
|
||||||
{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
|
|
||||||
{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["srg-list-groups", Host]) ->
|
|
||||||
lists:foreach(
|
|
||||||
fun(SrgGroup) ->
|
|
||||||
io:format("~s~n",[SrgGroup])
|
|
||||||
end,
|
|
||||||
lists:sort(mod_shared_roster:list_groups(Host))),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["srg-get-info", Group, Host]) ->
|
|
||||||
Opts = mod_shared_roster:get_group_opts(Host,Group),
|
|
||||||
[io:format("~s: ~p~n", [Title, Value]) || {Title , Value} <- Opts],
|
|
||||||
|
|
||||||
Members = mod_shared_roster:get_group_explicit_users(Host,Group),
|
|
||||||
Members_string = [ " " ++ jlib:jid_to_string(jlib:make_jid(MUser, MServer, ""))
|
|
||||||
|| {MUser, MServer} <- Members],
|
|
||||||
io:format("members:~s~n", [Members_string]),
|
|
||||||
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
|
|
||||||
case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
|
|
||||||
{atomic, ok} ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Can't add ~p@~p to ~p@~p: ~p~n",
|
|
||||||
[RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't add roster item to user ~p: ~p~n",
|
|
||||||
[LocalUser, Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
|
|
||||||
case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
|
|
||||||
{atomic, ok} ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
|
|
||||||
[RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't remove roster item to user ~p: ~p~n",
|
|
||||||
[LocalUser, Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["rosteritem-purge"]) ->
|
|
||||||
io:format("Rosteritems that match all the filtering will be removed.~n"),
|
|
||||||
io:format("Options for filtering:~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
io:format(" -subs none|from|to|both~n"),
|
|
||||||
io:format(" Subscription type. By default all values~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
io:format(" -ask none|out|in~n"),
|
|
||||||
io:format(" Pending subscription. By default all values~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
io:format(" -user JID~n"),
|
|
||||||
io:format(" The JID of the local user.~n"),
|
|
||||||
io:format(" Can use these globs: *, ? and [...].~n"),
|
|
||||||
io:format(" By default it is: * *@*~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
io:format(" -contact JID~n"),
|
|
||||||
io:format(" Similar to 'user', but for the contact JID.~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
io:format("Example:~n"),
|
|
||||||
io:format(" ejabberdctl rosteritem-purge -subs none from to -ask out in -contact *@*icq*~n"),
|
|
||||||
io:format("~n"),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
ctl_process(_Val, ["rosteritem-purge" | Options_list]) ->
|
|
||||||
Options_prop_list = lists:foldl(
|
|
||||||
fun(O, R) ->
|
|
||||||
case O of
|
|
||||||
[$- | K] ->
|
|
||||||
[{K, []} | R];
|
|
||||||
V ->
|
|
||||||
[{K, Vs} | RT] = R,
|
|
||||||
[{K, [V|Vs]} | RT]
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
[],
|
|
||||||
Options_list),
|
|
||||||
|
|
||||||
Subs = [list_to_atom(S)
|
|
||||||
|| S <- proplists:get_value("subs",
|
|
||||||
Options_prop_list,
|
|
||||||
["none", "from", "to", "both"])],
|
|
||||||
Asks = [list_to_atom(S)
|
|
||||||
|| S <-
|
|
||||||
proplists:get_value("ask",
|
|
||||||
Options_prop_list,
|
|
||||||
["none", "out", "in"])],
|
|
||||||
User = proplists:get_value("user", Options_prop_list, ["*", "*@*"]),
|
|
||||||
Contact = proplists:get_value("contact", Options_prop_list, ["*", "*@*"]),
|
|
||||||
|
|
||||||
case rosteritem_purge({Subs, Asks, User, Contact}) of
|
|
||||||
{atomic, ok} ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Error purging rosteritems: ~p~n",
|
|
||||||
[Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("BadRPC purging rosteritems: ~p~n",
|
|
||||||
[Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["pushroster", File, User, Server]) ->
|
|
||||||
case pushroster(File, User, Server) of
|
|
||||||
ok ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Can't push roster ~p to ~p@~p: ~p~n",
|
|
||||||
[File, User, Server, Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't push roster ~p: ~p~n",
|
|
||||||
[File, Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["pushroster-all", File]) ->
|
|
||||||
case pushroster_all([File]) of
|
|
||||||
ok ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Can't push roster ~p: ~p~n",
|
|
||||||
[File, Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't push roster ~p: ~p~n",
|
|
||||||
[File, Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["push-alltoall", Server, Group]) ->
|
|
||||||
case push_alltoall(Server, Group) of
|
|
||||||
ok ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{error, Reason} ->
|
|
||||||
io:format("Can't push all to all: ~p~n",
|
|
||||||
[Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't push all to all: ~p~n",
|
|
||||||
[Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["load-config", Path]) ->
|
|
||||||
case catch ejabberd_config:load_file(Path) of
|
|
||||||
ok ->
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
{'EXIT', Reason} ->
|
|
||||||
io:format("Problem loading config file ~p: ~p~n",
|
|
||||||
[filename:absname(Path), Reason]),
|
|
||||||
?STATUS_ERROR;
|
|
||||||
{badrpc, Reason} ->
|
|
||||||
io:format("Can't load config file ~p: ~p~n",
|
|
||||||
[filename:absname(Path), Reason]),
|
|
||||||
?STATUS_BADRPC
|
|
||||||
end;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["stats", Stat]) ->
|
|
||||||
Res = case Stat of
|
|
||||||
"uptime-seconds" -> uptime_seconds();
|
|
||||||
"registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
|
|
||||||
"onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
|
|
||||||
"onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
|
|
||||||
end,
|
|
||||||
io:format("~p~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["status-num", Status_required]) ->
|
|
||||||
ctl_process(_Val, "all", ["status-num", Status_required]);
|
|
||||||
|
|
||||||
ctl_process(_Val, ["status-list", Status_required]) ->
|
|
||||||
ctl_process(_Val, "all", ["status-list", Status_required]);
|
|
||||||
|
|
||||||
ctl_process(_Val, ["get-cookie"]) ->
|
|
||||||
io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, ["killsession", User, Server, Resource | Tail]) ->
|
|
||||||
kick_session(User, Server, Resource, prepare_reason(Tail)),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(Val, _Args) ->
|
|
||||||
Val.
|
|
||||||
|
|
||||||
|
|
||||||
%%-------------
|
|
||||||
%% Commands vhost
|
|
||||||
%%-------------
|
|
||||||
|
|
||||||
ctl_process(_Val, Host, ["num-active-users", Days]) ->
|
|
||||||
Number = num_active_users(Host, list_to_integer(Days)),
|
|
||||||
io:format("~p~n", [Number]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, Host, ["stats", Stat]) ->
|
|
||||||
Res = case Stat of
|
|
||||||
"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
|
|
||||||
"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
|
|
||||||
end,
|
|
||||||
io:format("~p~n", [Res]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, Host, ["status-num", Status_required]) ->
|
|
||||||
Num = length(get_status_list(Host, Status_required)),
|
|
||||||
io:format("~p~n", [Num]),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, Host, ["status-list", Status_required]) ->
|
|
||||||
Res = get_status_list(Host, Status_required),
|
|
||||||
[ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(_Val, Host, ["ban-account", User | Tail]) ->
|
|
||||||
ban_account(User, Host, prepare_reason(Tail)),
|
|
||||||
?STATUS_SUCCESS;
|
|
||||||
|
|
||||||
ctl_process(Val, _Host, _Args) ->
|
|
||||||
Val.
|
|
||||||
|
|
||||||
|
|
||||||
%%-------------
|
|
||||||
%% Utils
|
|
||||||
%%-------------
|
|
||||||
|
|
||||||
uptime_seconds() ->
|
|
||||||
trunc(element(1, erlang:statistics(wall_clock))/1000).
|
|
||||||
|
|
||||||
get_status_list(Host, Status_required) ->
|
|
||||||
%% Get list of all logged users
|
|
||||||
Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
|
|
||||||
%% Reformat the list
|
|
||||||
Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
|
|
||||||
Fhost = case Host of
|
|
||||||
"all" ->
|
|
||||||
%% All hosts are requested, so dont filter at all
|
|
||||||
fun(_, _) -> true end;
|
|
||||||
_ ->
|
|
||||||
%% Filter the list, only Host is interesting
|
|
||||||
fun(A, B) -> A == B end
|
|
||||||
end,
|
|
||||||
Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
|
|
||||||
%% For each Pid, get its presence
|
|
||||||
Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
|
|
||||||
%% Filter by status
|
|
||||||
Fstatus = case Status_required of
|
|
||||||
"all" ->
|
|
||||||
fun(_, _) -> true end;
|
|
||||||
_ ->
|
|
||||||
fun(A, B) -> A == B end
|
|
||||||
end,
|
|
||||||
[{User, Server, Resource, Priority, stringize(Status_text)}
|
|
||||||
|| {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4,
|
|
||||||
apply(Fstatus, [Status, Status_required])].
|
|
||||||
|
|
||||||
%% Make string more print-friendly
|
|
||||||
stringize(String) ->
|
|
||||||
%% Replace newline characters with other code
|
|
||||||
element(2, regexp:gsub(String, "\n", "\\n")).
|
|
||||||
|
|
||||||
add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
|
|
||||||
subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
|
|
||||||
route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
|
|
||||||
{atomic, ok}.
|
|
||||||
|
|
||||||
subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
|
|
||||||
R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
|
|
||||||
us = {LocalUser,LocalServer},
|
|
||||||
jid = {RemoteUser,RemoteServer,[]},
|
|
||||||
name = Nick,
|
|
||||||
subscription = Subscription, % none, to=you see him, from=he sees you, both
|
|
||||||
ask = none, % out=send request, in=somebody requests you, none
|
|
||||||
groups = [Group],
|
|
||||||
askmessage = Xattrs, % example: [{"category","conference"}]
|
|
||||||
xs = []},
|
|
||||||
mnesia:transaction(fun() -> mnesia:write(R) end).
|
|
||||||
|
|
||||||
rem_rosteritem(LU, LS, RU, RS) ->
|
|
||||||
unsubscribe(LU, LS, RU, RS),
|
|
||||||
route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
|
|
||||||
{atomic, ok}.
|
|
||||||
|
|
||||||
unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
|
|
||||||
Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
|
|
||||||
{LocalUser,LocalServer}},
|
|
||||||
mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
|
|
||||||
|
|
||||||
route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
|
|
||||||
LJID = jlib:make_jid(LocalUser, LocalServer, ""),
|
|
||||||
RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
|
|
||||||
ToS = jlib:jid_to_string(LJID),
|
|
||||||
ItemJIDS = jlib:jid_to_string(RJID),
|
|
||||||
GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
|
|
||||||
Item = {xmlelement, "item",
|
|
||||||
[{"jid", ItemJIDS},
|
|
||||||
{"name", Nick},
|
|
||||||
{"subscription", Subscription}],
|
|
||||||
[GroupXML]},
|
|
||||||
Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
|
|
||||||
Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
|
|
||||||
ejabberd_router:route(LJID, LJID, Packet).
|
|
||||||
|
|
||||||
|
|
||||||
%%-----------------------------
|
|
||||||
%% Ban user
|
|
||||||
%%-----------------------------
|
|
||||||
|
|
||||||
ban_account(User, Server, Reason) ->
|
|
||||||
kick_sessions(User, Server, Reason),
|
|
||||||
set_random_password(User, Server, Reason).
|
|
||||||
|
|
||||||
kick_sessions(User, Server, Reason) ->
|
|
||||||
lists:map(
|
|
||||||
fun(Resource) ->
|
|
||||||
kick_session(User, Server, Resource, Reason)
|
|
||||||
end,
|
|
||||||
get_resources(User, Server)).
|
|
||||||
|
|
||||||
kick_session(User, Server, Resource, Reason) ->
|
|
||||||
ejabberd_router:route(
|
|
||||||
jlib:make_jid("", "", ""),
|
|
||||||
jlib:make_jid(User, Server, Resource),
|
|
||||||
{xmlelement, "broadcast", [], [{exit, Reason}]}).
|
|
||||||
|
|
||||||
get_resources(User, Server) ->
|
|
||||||
lists:map(
|
|
||||||
fun(Session) ->
|
|
||||||
element(3, Session#session.usr)
|
|
||||||
end,
|
|
||||||
get_sessions(User, Server)).
|
|
||||||
|
|
||||||
get_sessions(User, Server) ->
|
|
||||||
LUser = jlib:nodeprep(User),
|
|
||||||
LServer = jlib:nameprep(Server),
|
|
||||||
Sessions = mnesia:dirty_index_read(session, {LUser, LServer}, #session.us),
|
|
||||||
true = is_list(Sessions),
|
|
||||||
Sessions.
|
|
||||||
|
|
||||||
set_random_password(User, Server, Reason) ->
|
|
||||||
NewPass = build_random_password(Reason),
|
|
||||||
set_password(User, Server, NewPass).
|
|
||||||
|
|
||||||
build_random_password(Reason) ->
|
|
||||||
Date = jlib:timestamp_to_iso(calendar:universal_time()),
|
|
||||||
RandomString = randoms:get_string(),
|
|
||||||
"BANNED_ACCOUNT--" ++ Date ++ "--" ++ RandomString ++ "--" ++ Reason.
|
|
||||||
|
|
||||||
set_password(User, Server, Password) ->
|
|
||||||
{atomic, ok} = ejabberd_auth:set_password(User, Server, Password).
|
|
||||||
|
|
||||||
prepare_reason([]) ->
|
|
||||||
"Kicked by administrator";
|
|
||||||
prepare_reason([Reason]) ->
|
|
||||||
Reason;
|
|
||||||
prepare_reason(StringList) ->
|
|
||||||
string:join(StringList, "_").
|
|
||||||
|
|
||||||
|
|
||||||
%%-----------------------------
|
|
||||||
%% Purge roster items
|
|
||||||
%%-----------------------------
|
|
||||||
|
|
||||||
rosteritem_purge(Options) ->
|
|
||||||
Num_rosteritems = mnesia:table_info(roster, size),
|
|
||||||
io:format("There are ~p roster items in total.~n", [Num_rosteritems]),
|
|
||||||
Key = mnesia:dirty_first(roster),
|
|
||||||
ok = rip(Key, Options, {0, Num_rosteritems, 0, 0}),
|
|
||||||
{atomic, ok}.
|
|
||||||
|
|
||||||
rip('$end_of_table', _Options, Counters) ->
|
|
||||||
print_progress_line(Counters),
|
|
||||||
ok;
|
|
||||||
rip(Key, Options, {Pr, NT, NV, ND}) ->
|
|
||||||
Key_next = mnesia:dirty_next(roster, Key),
|
|
||||||
ND2 = case decide_rip(Key, Options) of
|
|
||||||
true ->
|
|
||||||
mnesia:dirty_delete(roster, Key),
|
|
||||||
ND+1;
|
|
||||||
false ->
|
|
||||||
ND
|
|
||||||
end,
|
|
||||||
NV2 = NV+1,
|
|
||||||
Pr2 = print_progress_line({Pr, NT, NV2, ND2}),
|
|
||||||
rip(Key_next, Options, {Pr2, NT, NV2, ND2}).
|
|
||||||
|
|
||||||
print_progress_line({Pr, NT, NV, ND}) ->
|
|
||||||
Pr2 = trunc((NV/NT)*100),
|
|
||||||
case Pr == Pr2 of
|
|
||||||
true ->
|
|
||||||
ok;
|
|
||||||
false ->
|
|
||||||
io:format("Progress ~p% - visited ~p - deleted ~p~n", [Pr2, NV, ND])
|
|
||||||
end,
|
|
||||||
Pr2.
|
|
||||||
|
|
||||||
decide_rip(Key, {Subs, Asks, User, Contact}) ->
|
|
||||||
case catch mnesia:dirty_read(roster, Key) of
|
|
||||||
[RI] ->
|
|
||||||
lists:member(RI#roster.subscription, Subs)
|
|
||||||
andalso lists:member(RI#roster.ask, Asks)
|
|
||||||
andalso decide_rip_jid(RI#roster.us, User)
|
|
||||||
andalso decide_rip_jid(RI#roster.jid, Contact);
|
|
||||||
_ ->
|
|
||||||
false
|
|
||||||
end.
|
|
||||||
|
|
||||||
%% Returns true if the server of the JID is included in the servers
|
|
||||||
decide_rip_jid({UName, UServer, _UResource}, Match_list) ->
|
|
||||||
decide_rip_jid({UName, UServer}, Match_list);
|
|
||||||
decide_rip_jid({UName, UServer}, Match_list) ->
|
|
||||||
lists:any(
|
|
||||||
fun(Match_string) ->
|
|
||||||
MJID = jlib:string_to_jid(Match_string),
|
|
||||||
MName = MJID#jid.luser,
|
|
||||||
MServer = MJID#jid.lserver,
|
|
||||||
Is_server = is_glob_match(UServer, MServer),
|
|
||||||
case MName of
|
|
||||||
[] when UName == [] ->
|
|
||||||
Is_server;
|
|
||||||
[] ->
|
|
||||||
false;
|
|
||||||
_ ->
|
|
||||||
Is_server
|
|
||||||
andalso is_glob_match(UName, MName)
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
Match_list).
|
|
||||||
|
|
||||||
%% Copied from ejabberd-2.0.0/src/acl.erl
|
|
||||||
is_regexp_match(String, RegExp) ->
|
|
||||||
case regexp:first_match(String, RegExp) of
|
|
||||||
nomatch ->
|
|
||||||
false;
|
|
||||||
{match, _, _} ->
|
|
||||||
true;
|
|
||||||
{error, ErrDesc} ->
|
|
||||||
io:format(
|
|
||||||
"Wrong regexp ~p in ACL: ~p",
|
|
||||||
[RegExp, lists:flatten(regexp:format_error(ErrDesc))]),
|
|
||||||
false
|
|
||||||
end.
|
|
||||||
is_glob_match(String, Glob) ->
|
|
||||||
is_regexp_match(String, regexp:sh_to_awk(Glob)).
|
|
||||||
|
|
||||||
|
|
||||||
%%-----------------------------
|
|
||||||
%% Push Roster from file
|
|
||||||
%%-----------------------------
|
|
||||||
|
|
||||||
pushroster(File, User, Server) ->
|
|
||||||
{ok, [Roster]} = file:consult(File),
|
|
||||||
subscribe_roster({User, Server, "", User}, Roster).
|
|
||||||
|
|
||||||
pushroster_all(File) ->
|
|
||||||
{ok, [Roster]} = file:consult(File),
|
|
||||||
subscribe_all(Roster).
|
|
||||||
|
|
||||||
subscribe_all(Roster) ->
|
|
||||||
subscribe_all(Roster, Roster).
|
|
||||||
subscribe_all([], _) ->
|
|
||||||
ok;
|
|
||||||
subscribe_all([User1 | Users], Roster) ->
|
|
||||||
subscribe_roster(User1, Roster),
|
|
||||||
subscribe_all(Users, Roster).
|
|
||||||
|
|
||||||
subscribe_roster(_, []) ->
|
|
||||||
ok;
|
|
||||||
%% Do not subscribe a user to itself
|
|
||||||
subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
|
|
||||||
subscribe_roster({Name, Server, Group, Nick}, Roster);
|
|
||||||
%% Subscribe Name2 to Name1
|
|
||||||
subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
|
|
||||||
subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
|
|
||||||
subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
|
|
||||||
|
|
||||||
push_alltoall(S, G) ->
|
|
||||||
Users = ejabberd_auth:get_vh_registered_users(S),
|
|
||||||
Users2 = build_list_users(G, Users, []),
|
|
||||||
subscribe_all(Users2).
|
|
||||||
|
|
||||||
build_list_users(_Group, [], Res) ->
|
|
||||||
Res;
|
|
||||||
build_list_users(Group, [{User, Server}|Users], Res) ->
|
|
||||||
build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
|
|
||||||
|
|
||||||
vcard_get(User, Server, Data) ->
|
|
||||||
[{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
|
|
||||||
JID = jlib:make_jid(User, Server, ""),
|
|
||||||
IQ = #iq{type = get, xmlns = ?NS_VCARD},
|
|
||||||
IQr = Module:Function(JID, JID, IQ),
|
|
||||||
Res = case IQr#iq.sub_el of
|
|
||||||
[A1] ->
|
|
||||||
case vcard_get(Data, A1) of
|
|
||||||
false -> no_value;
|
|
||||||
Elem -> xml:get_tag_cdata(Elem)
|
|
||||||
end;
|
|
||||||
[] ->
|
|
||||||
no_vcard
|
|
||||||
end,
|
|
||||||
{ok, Res}.
|
|
||||||
|
|
||||||
vcard_get([Data1, Data2], A1) ->
|
|
||||||
case xml:get_subtag(A1, Data1) of
|
|
||||||
false -> false;
|
|
||||||
A2 -> vcard_get([Data2], A2)
|
|
||||||
end;
|
|
||||||
|
|
||||||
vcard_get([Data], A1) ->
|
|
||||||
xml:get_subtag(A1, Data).
|
|
||||||
|
|
||||||
vcard_set(User, Server, Data, Content) ->
|
|
||||||
[{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
|
|
||||||
JID = jlib:make_jid(User, Server, ""),
|
|
||||||
IQ = #iq{type = get, xmlns = ?NS_VCARD},
|
|
||||||
IQr = Module:Function(JID, JID, IQ),
|
|
||||||
|
|
||||||
%% Get old vcard
|
|
||||||
A4 = case IQr#iq.sub_el of
|
|
||||||
[A1] ->
|
|
||||||
{_, _, _, A2} = A1,
|
|
||||||
update_vcard_els(Data, Content, A2);
|
|
||||||
[] ->
|
|
||||||
update_vcard_els(Data, Content, [])
|
|
||||||
end,
|
|
||||||
|
|
||||||
%% Build new vcard
|
|
||||||
SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
|
|
||||||
IQ2 = #iq{type=set, sub_el = SubEl},
|
|
||||||
|
|
||||||
Module:Function(JID, JID, IQ2),
|
|
||||||
{ok, "done"}.
|
|
||||||
|
|
||||||
update_vcard_els(Data, Content, Els1) ->
|
|
||||||
Els2 = lists:keysort(2, Els1),
|
|
||||||
[Data1 | Data2] = Data,
|
|
||||||
NewEl = case Data2 of
|
|
||||||
[] ->
|
|
||||||
{xmlelement, Data1, [], [{xmlcdata,Content}]};
|
|
||||||
[D2] ->
|
|
||||||
OldEl = case lists:keysearch(Data1, 2, Els2) of
|
|
||||||
{value, A} -> A;
|
|
||||||
false -> {xmlelement, Data1, [], []}
|
|
||||||
end,
|
|
||||||
{xmlelement, _, _, ContentOld1} = OldEl,
|
|
||||||
Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
|
|
||||||
ContentOld2 = lists:keysort(2, ContentOld1),
|
|
||||||
ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
|
|
||||||
ContentNew = lists:keymerge(2, Content2, ContentOld3),
|
|
||||||
{xmlelement, Data1, [], ContentNew}
|
|
||||||
end,
|
|
||||||
Els3 = lists:keydelete(Data1, 2, Els2),
|
|
||||||
lists:keymerge(2, [NewEl], Els3).
|
|
||||||
|
|
||||||
-record(last_activity, {us, timestamp, status}).
|
|
||||||
|
|
||||||
delete_older_users(Days) ->
|
|
||||||
%% Get the list of registered users
|
|
||||||
Users = ejabberd_auth:dirty_get_registered_users(),
|
|
||||||
delete_older_users(Days, Users).
|
|
||||||
|
|
||||||
delete_older_users_vhost(Host, Days) ->
|
|
||||||
%% Get the list of registered users
|
|
||||||
Users = ejabberd_auth:get_vh_registered_users(Host),
|
|
||||||
delete_older_users(Days, Users).
|
|
||||||
|
|
||||||
delete_older_users(Days, Users) ->
|
|
||||||
%% Convert older time
|
|
||||||
SecOlder = Days*24*60*60,
|
|
||||||
|
|
||||||
%% Get current time
|
|
||||||
{MegaSecs, Secs, _MicroSecs} = now(),
|
|
||||||
TimeStamp_now = MegaSecs * 1000000 + Secs,
|
|
||||||
|
|
||||||
%% For a user, remove if required and answer true
|
|
||||||
F = fun({LUser, LServer}) ->
|
|
||||||
%% Check if the user is logged
|
|
||||||
case ejabberd_sm:get_user_resources(LUser, LServer) of
|
|
||||||
%% If it isnt
|
|
||||||
[] ->
|
|
||||||
%% Look for his last_activity
|
|
||||||
case mnesia:dirty_read(last_activity, {LUser, LServer}) of
|
|
||||||
%% If it is
|
|
||||||
%% existent:
|
|
||||||
[#last_activity{timestamp = TimeStamp}] ->
|
|
||||||
%% get his age
|
|
||||||
Sec = TimeStamp_now - TimeStamp,
|
|
||||||
%% If he is
|
|
||||||
if
|
|
||||||
%% younger than SecOlder:
|
|
||||||
Sec < SecOlder ->
|
|
||||||
%% do nothing
|
|
||||||
false;
|
|
||||||
%% older:
|
|
||||||
true ->
|
|
||||||
%% remove the user
|
|
||||||
ejabberd_auth:remove_user(LUser, LServer),
|
|
||||||
true
|
|
||||||
end;
|
|
||||||
%% nonexistent:
|
|
||||||
[] ->
|
|
||||||
%% remove the user
|
|
||||||
ejabberd_auth:remove_user(LUser, LServer),
|
|
||||||
true
|
|
||||||
end;
|
|
||||||
%% Else
|
|
||||||
_ ->
|
|
||||||
%% do nothing
|
|
||||||
false
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
%% Apply the function to every user in the list
|
|
||||||
Users_removed = lists:filter(F, Users),
|
|
||||||
{removed, length(Users_removed), Users_removed}.
|
|
||||||
|
|
||||||
num_active_users(Host, Days) ->
|
|
||||||
list_last_activity(Host, true, Days).
|
|
||||||
|
|
||||||
%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
|
|
||||||
list_last_activity(Host, Integral, Days) ->
|
|
||||||
{MegaSecs, Secs, _MicroSecs} = now(),
|
|
||||||
TimeStamp = MegaSecs * 1000000 + Secs,
|
|
||||||
TS = TimeStamp - Days * 86400,
|
|
||||||
case catch mnesia:dirty_select(
|
|
||||||
last_activity, [{{last_activity, {'_', Host}, '$1', '_'},
|
|
||||||
[{'>', '$1', TS}],
|
|
||||||
[{'trunc', {'/',
|
|
||||||
{'-', TimeStamp, '$1'},
|
|
||||||
86400}}]}]) of
|
|
||||||
{'EXIT', _Reason} ->
|
|
||||||
[];
|
|
||||||
Vals ->
|
|
||||||
Hist = histogram(Vals, Integral),
|
|
||||||
if
|
|
||||||
Hist == [] ->
|
|
||||||
0;
|
|
||||||
true ->
|
|
||||||
Left = if
|
|
||||||
Days == infinity ->
|
|
||||||
0;
|
|
||||||
true ->
|
|
||||||
Days - length(Hist)
|
|
||||||
end,
|
|
||||||
Tail = if
|
|
||||||
Integral ->
|
|
||||||
lists:duplicate(Left, lists:last(Hist));
|
|
||||||
true ->
|
|
||||||
lists:duplicate(Left, 0)
|
|
||||||
end,
|
|
||||||
lists:nth(Days, Hist ++ Tail)
|
|
||||||
end
|
|
||||||
end.
|
|
||||||
histogram(Values, Integral) ->
|
|
||||||
histogram(lists:sort(Values), Integral, 0, 0, []).
|
|
||||||
histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
|
|
||||||
histogram(T, Integral, Current, Count + 1, Hist);
|
|
||||||
histogram([H | _] = Values, Integral, Current, Count, Hist) when Current < H ->
|
|
||||||
if
|
|
||||||
Integral ->
|
|
||||||
histogram(Values, Integral, Current + 1, Count, [Count | Hist]);
|
|
||||||
true ->
|
|
||||||
histogram(Values, Integral, Current + 1, 0, [Count | Hist])
|
|
||||||
end;
|
|
||||||
histogram([], _Integral, _Current, Count, Hist) ->
|
|
||||||
if
|
|
||||||
Count > 0 ->
|
|
||||||
lists:reverse([Count | Hist]);
|
|
||||||
true ->
|
|
||||||
lists:reverse(Hist)
|
|
||||||
end.
|
|
||||||
|
|
||||||
group_parameters(Ps, [Char]) ->
|
|
||||||
{none, Grouped_Ps} = lists:foldl(
|
|
||||||
fun(P, {State, Res}) ->
|
|
||||||
case State of
|
|
||||||
none ->
|
|
||||||
case P of
|
|
||||||
[Char | PTail]->
|
|
||||||
{building, [PTail | Res]};
|
|
||||||
_ ->
|
|
||||||
{none, [P | Res]}
|
|
||||||
end;
|
|
||||||
building ->
|
|
||||||
[ResHead | ResTail] = Res,
|
|
||||||
case lists:last(P) of
|
|
||||||
Char ->
|
|
||||||
P2 = lists:sublist(P, length(P)-1),
|
|
||||||
{none, [ResHead ++ " " ++ P2 | ResTail]};
|
|
||||||
_ ->
|
|
||||||
{building, [ResHead ++ " " ++ P | ResTail]}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
{none, []},
|
|
||||||
Ps),
|
|
||||||
lists:reverse(Grouped_Ps).
|
|
||||||
Loading…
Reference in New Issue