diff options
166 files changed, 845 insertions, 592 deletions
diff --git a/.gitignore b/.gitignore index f69da9b93..d1418f9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,9 @@ /doc/*.toc /doc/contributed_modules.tex /doc/version.tex -/ebin/*.beam -/ebin/ejabberd.app +/ebin/ +/ejabberd.init +/ejabberdctl.example /include/XmppAddr.hrl /src/XmppAddr.asn1db /src/XmppAddr.erl diff --git a/contrib/extract_translations/prepare-translation.sh b/contrib/extract_translations/prepare-translation.sh index fcc58cb27..56f999247 100755 --- a/contrib/extract_translations/prepare-translation.sh +++ b/contrib/extract_translations/prepare-translation.sh @@ -230,7 +230,8 @@ extract_lang_po2msg () msgattrib $PO_PATH --translated --no-fuzzy --no-obsolete --no-location --no-wrap | grep "^msg" | tail --lines=+3 >$MS_PATH grep "^msgid" $PO_PATH.ms | sed 's/^msgid //g' >$MSGID_PATH grep "^msgstr" $PO_PATH.ms | sed 's/^msgstr //g' >$MSGSTR_PATH - paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >$MSGS_PATH + echo "%% -*- coding: latin-1 -*-" >$MSGS_PATH + paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >>$MSGS_PATH rm $MS_PATH rm $MSGID_PATH diff --git a/doc/guide.tex b/doc/guide.tex index 46563561e..dd4255725 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -4052,15 +4052,28 @@ Options: not add/remove/modify contacts, or subscribe/unsubscribe presence. By default there aren't restrictions. + \titem{managers} \ind{options!managers} + List of remote entities that can manage users rosters using Remote Roster Management + (\xepref{0321}). + The protocol sections implemented are: + \term{4.2. The remote entity requests current user's roster}. + \term{4.3. The user updates roster}. + \term{4.4. The remote entity updates the user's roster}. + A remote entity cab only get or modify roster items that have the same domain as the entity. + Default value is: \term{[]}. \end{description} -This example configuration enables Roster Versioning with storage of current id: +This example configuration enables Roster Versioning with storage of current id. +The ICQ and MSN transports can get ICQ and MSN contacts, add them, or remove them for any local account: \begin{verbatim} modules: ... mod_roster: versioning: true store_current_id: true + managers: + - "icq.example.org" + - "msn.example.org" ... \end{verbatim} @@ -4988,6 +5001,9 @@ This can be used by other scripts to determine automatically if a command succeeded or failed, for example using: \term{echo \$?} +If you use Bash, you can get Bash completion by copying the file \term{tools/ejabberdctl.bc} +to the directory \term{/etc/bash\_completion.d/} (in Debian, Ubuntu, Fedora and maybe others). + \makesubsection{ectl-commands}{ejabberdctl Commands} When \term{ejabberdctl} is executed without any parameter, @@ -5949,7 +5965,7 @@ Thanks to all people who contributed to this guide: \makechapter{copyright}{Copyright Information} Ejabberd Installation and Operation Guide.\\ -Copyright \copyright{} 2003 --- 2013 ProcessOne +Copyright \copyright{} 2003 --- 2014 ProcessOne This document is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/include/adhoc.hrl b/include/adhoc.hrl index 974b29c3e..f16b188ae 100644 --- a/include/adhoc.hrl +++ b/include/adhoc.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd.hrl b/include/ejabberd.hrl index 9b8bff06f..67ac763a2 100644 --- a/include/ejabberd.hrl +++ b/include/ejabberd.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd_commands.hrl b/include/ejabberd_commands.hrl index 0ba75ce7a..5f35ba9ec 100644 --- a/include/ejabberd_commands.hrl +++ b/include/ejabberd_commands.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd_config.hrl b/include/ejabberd_config.hrl index 959ff5b5a..cbc8a5e69 100644 --- a/include/ejabberd_config.hrl +++ b/include/ejabberd_config.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd_ctl.hrl b/include/ejabberd_ctl.hrl index 75d92d436..e87dd03c2 100644 --- a/include/ejabberd_ctl.hrl +++ b/include/ejabberd_ctl.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd_http.hrl b/include/ejabberd_http.hrl index 708349e86..73f5aa960 100644 --- a/include/ejabberd_http.hrl +++ b/include/ejabberd_http.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ejabberd_web_admin.hrl b/include/ejabberd_web_admin.hrl index 865c69d26..cd3c3c0ec 100644 --- a/include/ejabberd_web_admin.hrl +++ b/include/ejabberd_web_admin.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/eldap.hrl b/include/eldap.hrl index 9a6ba0702..2b1676d15 100644 --- a/include/eldap.hrl +++ b/include/eldap.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/http_bind.hrl b/include/http_bind.hrl index 29014f122..a318561cf 100644 --- a/include/http_bind.hrl +++ b/include/http_bind.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/jlib.hrl b/include/jlib.hrl index a3ae1cd2e..8b749955a 100644 --- a/include/jlib.hrl +++ b/include/jlib.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/logger.hrl b/include/logger.hrl index c94fac90e..439567d97 100644 --- a/include/logger.hrl +++ b/include/logger.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl index 637b3e359..03a1f9d06 100644 --- a/include/mod_muc_room.hrl +++ b/include/mod_muc_room.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/mod_privacy.hrl b/include/mod_privacy.hrl index 05dfcfdfe..848de8640 100644 --- a/include/mod_privacy.hrl +++ b/include/mod_privacy.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/mod_proxy65.hrl b/include/mod_proxy65.hrl index bff9ff166..72fd70db2 100644 --- a/include/mod_proxy65.hrl +++ b/include/mod_proxy65.hrl @@ -2,7 +2,7 @@ %%% RFC 1928 constants. %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/mod_roster.hrl b/include/mod_roster.hrl index 2166f423f..c14aa0cf8 100644 --- a/include/mod_roster.hrl +++ b/include/mod_roster.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/ns.hrl b/include/ns.hrl index 4da5ef9cc..c5eb2e4ba 100644 --- a/include/ns.hrl +++ b/include/ns.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/include/pubsub.hrl b/include/pubsub.hrl index 4f2cc9f38..08f8ea0fe 100644 --- a/include/pubsub.hrl +++ b/include/pubsub.hrl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% copyright 2006-2013 ProcessOne +%%% copyright 2006-2014 ProcessOne %%% %%% This file contains pubsub types definition. %%% ==================================================================== diff --git a/priv/msgs/he.po b/priv/msgs/he.po index 581f554bf..f013b93b8 100644 --- a/priv/msgs/he.po +++ b/priv/msgs/he.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n" -"Language-Team: Rahut <genghiskhan@gmx.ca>\n" +"Language-Team: Rahut <http://sourceforge.net/projects/rahut/>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13,7 +13,7 @@ msgstr "" "X-Poedit-Language: Hebrew (עברית)\n" "X-Generator: Poedit 1.5.4\n" -#: ejabberd_c2s.erl:424 ejabberd_c2s.erl:729 +#: ejabberd_c2s.erl:424 ejabberd_c2s.erl:727 msgid "Use of STARTTLS required" msgstr "נדרש שימוש של STARTTLS" @@ -21,15 +21,16 @@ msgstr "נדרש שימוש של STARTTLS" msgid "No resource provided" msgstr "לא סופק משאב" -#: ejabberd_c2s.erl:1200 +#: ejabberd_c2s.erl:1197 msgid "Replaced by new connection" msgstr "הוחלף בחיבור חדש" -#: ejabberd_c2s.erl:1888 +#: ejabberd_c2s.erl:1885 msgid "Your active privacy list has denied the routing of this stanza." msgstr "רשימת הפרטיות הפעילה שלך אסרה את הניתוב של סטנזה זו." # תמליל +# כפי שעינייך רואות #: ejabberd_captcha.erl:96 ejabberd_captcha.erl:152 ejabberd_captcha.erl:178 msgid "Enter the text you see" msgstr "הזן את הטקסט אותו הינך רואה" @@ -37,7 +38,7 @@ msgstr "הזן את הטקסט אותו הינך רואה" # כדי שלא לחסומן #: ejabberd_captcha.erl:101 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s" -msgstr "הודעותייך אל ~s הינן חסומות. כדי למנוע את חסימתן, נא לבקר אצל ~s" +msgstr "ההודעות שלך לערוץ ~s הינן חסומות. כדי למנוע את חסימתן, בקר בכתובת ~s" # בקר את עמוד #: ejabberd_captcha.erl:134 @@ -64,65 +65,68 @@ msgstr "פינג" msgid "Pong" msgstr "פונג" -#: mod_announce.erl:516 +#: mod_announce.erl:507 mod_announce_odbc.erl:499 msgid "Really delete message of the day?" msgstr "באמת למחוק את הודעת היום?" -#: mod_announce.erl:524 mod_configure.erl:1083 mod_configure.erl:1128 +#: mod_announce.erl:515 mod_announce_odbc.erl:507 mod_configure.erl:1083 +#: mod_configure.erl:1128 msgid "Subject" msgstr "נושא" -#: mod_announce.erl:529 mod_configure.erl:1088 mod_configure.erl:1133 +#: mod_announce.erl:520 mod_announce_odbc.erl:512 mod_configure.erl:1088 +#: mod_configure.erl:1133 msgid "Message body" msgstr "גוף הודעה" -#: mod_announce.erl:609 +#: mod_announce.erl:600 mod_announce_odbc.erl:592 #, fuzzy msgid "No body provided for announce message" msgstr "לא סופק גוף עבור announce message" -#: mod_announce.erl:644 +#: mod_announce.erl:635 mod_announce_odbc.erl:627 msgid "Announcements" msgstr "מודעות" -#: mod_announce.erl:646 +#: mod_announce.erl:637 mod_announce_odbc.erl:629 msgid "Send announcement to all users" msgstr "שלח מודעות אל כל המשתמשים" # אצל כל -#: mod_announce.erl:648 +#: mod_announce.erl:639 mod_announce_odbc.erl:631 msgid "Send announcement to all users on all hosts" msgstr "שלח מודעות אל כל המשתמשים בכל המארחים" -#: mod_announce.erl:650 +#: mod_announce.erl:641 mod_announce_odbc.erl:633 msgid "Send announcement to all online users" msgstr "שלח מודעות אל כל המשתמשים המקוונים" -#: mod_announce.erl:652 mod_configure.erl:1078 mod_configure.erl:1123 +#: mod_announce.erl:643 mod_announce_odbc.erl:635 mod_configure.erl:1078 +#: mod_configure.erl:1123 msgid "Send announcement to all online users on all hosts" msgstr "שלח מודעות אל כל המשתמשים המקוונים בכל המארחים" -#: mod_announce.erl:654 +#: mod_announce.erl:645 mod_announce_odbc.erl:637 msgid "Set message of the day and send to online users" msgstr "קבע הודעת היום ושלח אל משתמשים מקוונים" -#: mod_announce.erl:656 +#: mod_announce.erl:647 mod_announce_odbc.erl:639 msgid "Set message of the day on all hosts and send to online users" msgstr "קבע הודעת היום בכל המארחים ושלח אל משתמשים מקוונים" -#: mod_announce.erl:658 +#: mod_announce.erl:649 mod_announce_odbc.erl:641 msgid "Update message of the day (don't send)" msgstr "עדכן הודעת היום (אל תשלח)" -#: mod_announce.erl:660 +#: mod_announce.erl:651 mod_announce_odbc.erl:643 msgid "Update message of the day on all hosts (don't send)" msgstr "עדכן הודעת היום בכל המארחים (אל תשלח)" -#: mod_announce.erl:662 +#: mod_announce.erl:653 mod_announce_odbc.erl:645 msgid "Delete message of the day" msgstr "מחק הודעת היום" -#: mod_announce.erl:664 +#: mod_announce.erl:655 mod_announce_odbc.erl:647 msgid "Delete message of the day on all hosts" msgstr "מחק הודעת היום בכל המארחים" @@ -131,7 +135,7 @@ msgstr "מחק הודעת היום בכל המארחים" msgid "Configuration" msgstr "תצורה" -#: mod_configure.erl:125 mod_configure.erl:576 web/ejabberd_web_admin.erl:1929 +#: mod_configure.erl:125 mod_configure.erl:576 web/ejabberd_web_admin.erl:1936 msgid "Database" msgstr "מסד נתונים" @@ -144,7 +148,7 @@ msgid "Stop Modules" msgstr "הפסק מודולים" # גיבוי -#: mod_configure.erl:131 mod_configure.erl:604 web/ejabberd_web_admin.erl:1930 +#: mod_configure.erl:131 mod_configure.erl:604 web/ejabberd_web_admin.erl:1937 msgid "Backup" msgstr "גבה" @@ -197,9 +201,10 @@ msgstr "השג סיסמת משתמש" msgid "Change User Password" msgstr "שנה סיסמת משתמש" +# התחברות #: mod_configure.erl:155 mod_configure.erl:523 mod_configure.erl:1272 msgid "Get User Last Login Time" -msgstr "השג זמן התחברות אחרון של משתמש" +msgstr "השג זמן כניסה אחרון של משתמש" #: mod_configure.erl:157 mod_configure.erl:524 mod_configure.erl:1284 msgid "Get User Statistics" @@ -243,15 +248,15 @@ msgstr "כל המשתמשים" msgid "Outgoing s2s Connections" msgstr "חיבורי s2s יוצאים" -#: mod_configure.erl:503 web/ejabberd_web_admin.erl:1900 +#: mod_configure.erl:503 web/ejabberd_web_admin.erl:1907 msgid "Running Nodes" msgstr "ממסרים שמורצים כעת" -#: mod_configure.erl:504 web/ejabberd_web_admin.erl:1902 +#: mod_configure.erl:504 web/ejabberd_web_admin.erl:1909 msgid "Stopped Nodes" msgstr "ממסרים שנפסקו" -#: mod_configure.erl:577 mod_configure.erl:587 web/ejabberd_web_admin.erl:1946 +#: mod_configure.erl:577 mod_configure.erl:587 web/ejabberd_web_admin.erl:1953 msgid "Modules" msgstr "מודולים" @@ -262,7 +267,7 @@ msgstr "ניהול גיבוי" # help is needed with spool #: mod_configure.erl:579 msgid "Import Users From jabberd14 Spool Files" -msgstr "ייבוא משתמשים מן קבצי סליל (Spool Files) של jabberd14" +msgstr "ייבוא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14" #: mod_configure.erl:699 msgid "To ~s" @@ -336,7 +341,7 @@ msgstr "נתיב אל קובץ" #: mod_configure.erl:997 msgid "Restore Backup from File at " -msgstr "שחזר גיבוי מן קובץ אצל " +msgstr "שחזר גיבוי מתוך קובץ אצל " #: mod_configure.erl:1011 msgid "Dump Backup to Text File at " @@ -348,7 +353,7 @@ msgstr "הזן נתיב אל קובץ טקסט" #: mod_configure.erl:1025 msgid "Import User from File at " -msgstr "ייבוא משתמש מן קובץ אצל " +msgstr "ייבוא משתמש מתוך קובץ אצל " #: mod_configure.erl:1029 msgid "Enter path to jabberd14 spool file" @@ -356,7 +361,7 @@ msgstr "הזן נתיב אל קובץ סליל (spool file) של jabberd14" #: mod_configure.erl:1039 msgid "Import Users from Dir at " -msgstr "ייבוא משתמשים מן מדור אצל " +msgstr "ייבוא משתמשים מתוך מדור אצל " #: mod_configure.erl:1043 msgid "Enter path to jabberd14 spool dir" @@ -388,17 +393,16 @@ msgstr "תצורת גישה" msgid "Access rules" msgstr "כללי גישה" -# מזהה Jabber #: mod_configure.erl:1200 mod_configure.erl:1222 mod_configure.erl:1234 #: mod_configure.erl:1246 mod_configure.erl:1258 mod_configure.erl:1275 #: mod_configure.erl:1287 mod_configure.erl:1650 mod_configure.erl:1700 -#: mod_configure.erl:1721 mod_roster.erl:1345 mod_vcard.erl:543 -#: mod_vcard_ldap.erl:554 +#: mod_configure.erl:1721 mod_roster.erl:943 mod_roster_odbc.erl:1060 +#: mod_vcard.erl:472 mod_vcard_ldap.erl:554 mod_vcard_odbc.erl:448 msgid "Jabber ID" -msgstr "JID" +msgstr "מזהה Jabber" #: mod_configure.erl:1205 mod_configure.erl:1263 mod_configure.erl:1651 -#: mod_configure.erl:1861 mod_muc/mod_muc_room.erl:3218 mod_register.erl:235 +#: mod_configure.erl:1863 mod_muc/mod_muc_room.erl:3224 mod_register.erl:235 #: web/ejabberd_web_admin.erl:1520 msgid "Password" msgstr "סיסמה" @@ -415,19 +419,19 @@ msgstr "מספר של משתמשים רשומים" msgid "Number of online users" msgstr "מספר של משתמשים מקוונים" -#: mod_configure.erl:1682 web/ejabberd_web_admin.erl:1587 -#: web/ejabberd_web_admin.erl:1736 +#: mod_configure.erl:1682 web/ejabberd_web_admin.erl:1588 +#: web/ejabberd_web_admin.erl:1743 msgid "Never" msgstr "אף פעם" -#: mod_configure.erl:1696 web/ejabberd_web_admin.erl:1600 -#: web/ejabberd_web_admin.erl:1749 +#: mod_configure.erl:1696 web/ejabberd_web_admin.erl:1601 +#: web/ejabberd_web_admin.erl:1756 msgid "Online" msgstr "מקוון" #: mod_configure.erl:1701 msgid "Last login" -msgstr "התחברות אחרונה" +msgstr "כניסה אחרונה" #: mod_configure.erl:1722 msgid "Roster size" @@ -441,56 +445,56 @@ msgstr "כתובות IP" msgid "Resources" msgstr "משאבים" -#: mod_configure.erl:1848 +#: mod_configure.erl:1850 msgid "Administration of " msgstr "ניהול של " -#: mod_configure.erl:1851 +#: mod_configure.erl:1853 msgid "Action on user" msgstr "פעולה על משתמש" -#: mod_configure.erl:1855 +#: mod_configure.erl:1857 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: mod_configure.erl:1858 web/ejabberd_web_admin.erl:1762 +#: mod_configure.erl:1860 web/ejabberd_web_admin.erl:1769 msgid "Remove User" msgstr "הסר משתמש" -#: mod_irc/mod_irc.erl:207 mod_muc/mod_muc.erl:406 +#: mod_irc/mod_irc.erl:201 mod_irc/mod_irc_odbc.erl:196 +#: mod_muc/mod_muc.erl:336 mod_muc/mod_muc_odbc.erl:342 msgid "Access denied by service policy" msgstr "גישה נדחתה על ידי פוליסת שירות" -#: mod_irc/mod_irc.erl:409 +#: mod_irc/mod_irc.erl:401 mod_irc/mod_irc_odbc.erl:398 msgid "IRC Transport" msgstr "מוביל IRC" -#: mod_irc/mod_irc.erl:436 +#: mod_irc/mod_irc.erl:428 mod_irc/mod_irc_odbc.erl:425 msgid "ejabberd IRC module" msgstr "מודול IRC של ejabberd" -#: mod_irc/mod_irc.erl:600 +#: mod_irc/mod_irc.erl:559 mod_irc/mod_irc_odbc.erl:568 msgid "You need an x:data capable client to configure mod_irc settings" -msgstr "" -"עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי להגדיר הגדרות של mod_irc" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי להגדיר הגדרות של mod_irc" -#: mod_irc/mod_irc.erl:607 +#: mod_irc/mod_irc.erl:566 mod_irc/mod_irc_odbc.erl:575 msgid "Registration in mod_irc for " msgstr "רישום בתוך mod_irc עבור " -#: mod_irc/mod_irc.erl:612 +#: mod_irc/mod_irc.erl:571 mod_irc/mod_irc_odbc.erl:580 msgid "" "Enter username, encodings, ports and passwords you wish to use for " "connecting to IRC servers" msgstr "" -"הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש עבור התחברות אל " +"הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש לשם התחברות אל " "שרתים של IRC" -#: mod_irc/mod_irc.erl:617 +#: mod_irc/mod_irc.erl:576 mod_irc/mod_irc_odbc.erl:585 msgid "IRC Username" msgstr "שם משתמש IRC" -#: mod_irc/mod_irc.erl:627 +#: mod_irc/mod_irc.erl:586 mod_irc/mod_irc_odbc.erl:595 msgid "" "If you want to specify different ports, passwords, encodings for IRC " "servers, fill this list with values in format '{\"irc server\", \"encoding" @@ -501,7 +505,7 @@ msgstr "" "רשימה זו עם ערכים בפורמט '{\"irc server\", \"encoding\", port, \"password" "\"}'. באופן משתמט שירות זה משתמש בקידוד \"~s\", פורט ~p, סיסמה ריקה." -#: mod_irc/mod_irc.erl:639 +#: mod_irc/mod_irc.erl:598 mod_irc/mod_irc_odbc.erl:607 msgid "" "Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef." "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." @@ -510,112 +514,115 @@ msgstr "" "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." # פרמטרי חיבור -#: mod_irc/mod_irc.erl:644 +#: mod_irc/mod_irc.erl:603 mod_irc/mod_irc_odbc.erl:612 msgid "Connections parameters" msgstr "פרמטרים של חיבור" -#: mod_irc/mod_irc.erl:787 +#: mod_irc/mod_irc.erl:728 mod_irc/mod_irc_odbc.erl:757 msgid "Join IRC channel" msgstr "הצטרף אל ערוץ IRC" # לא לשים סימן # ראשון # לא לשים את סימן # הראשון -#: mod_irc/mod_irc.erl:791 +#: mod_irc/mod_irc.erl:732 mod_irc/mod_irc_odbc.erl:761 msgid "IRC channel (don't put the first #)" msgstr "ערוץ IRC (אל תשים סימן # ראשון)" -#: mod_irc/mod_irc.erl:796 +#: mod_irc/mod_irc.erl:737 mod_irc/mod_irc_odbc.erl:766 msgid "IRC server" msgstr "שרת IRC" -#: mod_irc/mod_irc.erl:829 mod_irc/mod_irc.erl:833 +#: mod_irc/mod_irc.erl:770 mod_irc/mod_irc.erl:774 +#: mod_irc/mod_irc_odbc.erl:799 mod_irc/mod_irc_odbc.erl:803 msgid "Join the IRC channel here." msgstr "הצטרף אל ערוץ IRC כאן." -#: mod_irc/mod_irc.erl:837 +#: mod_irc/mod_irc.erl:778 mod_irc/mod_irc_odbc.erl:807 msgid "Join the IRC channel in this Jabber ID: ~s" -msgstr "הצטרף אל ערוץ IRC בכתובת JID זו: ~s" +msgstr "הצטרף אל ערוץ IRC במזהה Jabber זה: ~s" -#: mod_irc/mod_irc.erl:915 +#: mod_irc/mod_irc.erl:863 mod_irc/mod_irc_odbc.erl:904 msgid "IRC settings" msgstr "הגדרות IRC" # השלם -#: mod_irc/mod_irc.erl:920 +#: mod_irc/mod_irc.erl:868 mod_irc/mod_irc_odbc.erl:909 msgid "" "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." msgstr "" -"הזן שם משתמש וקידודים בהם ברצונך להשתמש עבור התחברות אל שרתים של IRC. לחץ " +"הזן שם משתמש וקידודים בהם ברצונך להשתמש לשם התחברות אל שרתים של IRC. לחץ " "'הבא' כדי להשיג עוד שדות למילוי. לחץ 'סיים' כדי לשמור הגדרות." -#: mod_irc/mod_irc.erl:926 +#: mod_irc/mod_irc.erl:874 mod_irc/mod_irc_odbc.erl:915 msgid "IRC username" msgstr "שם משתמש IRC" -#: mod_irc/mod_irc.erl:975 +#: mod_irc/mod_irc.erl:923 mod_irc/mod_irc_odbc.erl:964 msgid "Password ~b" msgstr "סיסמה ~b" -#: mod_irc/mod_irc.erl:980 +#: mod_irc/mod_irc.erl:928 mod_irc/mod_irc_odbc.erl:969 msgid "Port ~b" msgstr "פורט ~b" -#: mod_irc/mod_irc.erl:985 +#: mod_irc/mod_irc.erl:933 mod_irc/mod_irc_odbc.erl:974 msgid "Encoding for server ~b" msgstr "קידוד עבור שרת ~b" -#: mod_irc/mod_irc.erl:994 +#: mod_irc/mod_irc.erl:942 mod_irc/mod_irc_odbc.erl:983 msgid "Server ~b" msgstr "שרת ~b" -#: mod_muc/mod_muc.erl:520 +#: mod_muc/mod_muc.erl:449 mod_muc/mod_muc_odbc.erl:456 msgid "Only service administrators are allowed to send service messages" msgstr "רק מנהלי שירות רשאים לשלוח הודעות שירות" -#: mod_muc/mod_muc.erl:564 +#: mod_muc/mod_muc.erl:493 mod_muc/mod_muc_odbc.erl:500 msgid "Room creation is denied by service policy" msgstr "יצירת חדר נדחתה על ידי פוליסת שירות" -#: mod_muc/mod_muc.erl:571 +#: mod_muc/mod_muc.erl:500 mod_muc/mod_muc_odbc.erl:507 msgid "Conference room does not exist" msgstr "חדר ועידה לא קיים" -#: mod_muc/mod_muc.erl:673 +#: mod_muc/mod_muc.erl:582 mod_muc/mod_muc_odbc.erl:595 msgid "Chatrooms" msgstr "חדרי שיחה" # to register nickname -#: mod_muc/mod_muc.erl:829 +#: mod_muc/mod_muc.erl:712 mod_muc/mod_muc_odbc.erl:729 msgid "You need a client that supports x:data to register the nickname" -msgstr "עליך לעשות שימוש בלקוח שתומך x:data בכדי לרשום את שם הכינוי" +msgstr "עליך להשתמש בלקוח אשר תומך x:data בכדי לרשום את שם הכינוי" -#: mod_muc/mod_muc.erl:835 +#: mod_muc/mod_muc.erl:718 mod_muc/mod_muc_odbc.erl:735 msgid "Nickname Registration at " msgstr "רישום שם כינוי אצל " # אותו ברצונך לרשום -#: mod_muc/mod_muc.erl:839 +#: mod_muc/mod_muc.erl:722 mod_muc/mod_muc_odbc.erl:739 msgid "Enter nickname you want to register" -msgstr "הזן שם כינוי שברצונך לרושמו" +msgstr "הזן שם כינוי אשר ברצונך לרושמו" -#: mod_muc/mod_muc.erl:840 mod_muc/mod_muc_room.erl:3804 mod_roster.erl:1346 -#: mod_vcard.erl:435 mod_vcard.erl:548 +#: mod_muc/mod_muc.erl:723 mod_muc/mod_muc_odbc.erl:740 +#: mod_muc/mod_muc_room.erl:3810 mod_roster.erl:944 mod_roster_odbc.erl:1061 +#: mod_vcard.erl:364 mod_vcard.erl:477 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:453 msgid "Nickname" msgstr "שם כינוי" # note: another person > someone else -#: mod_muc/mod_muc.erl:924 mod_muc/mod_muc_room.erl:1059 -#: mod_muc/mod_muc_room.erl:1783 +#: mod_muc/mod_muc.erl:762 mod_muc/mod_muc_odbc.erl:784 +#: mod_muc/mod_muc_room.erl:1064 mod_muc/mod_muc_room.erl:1787 msgid "That nickname is registered by another person" msgstr "שם כינוי זה הינו רשום על ידי מישהו אחר" -#: mod_muc/mod_muc.erl:951 +#: mod_muc/mod_muc.erl:788 mod_muc/mod_muc_odbc.erl:811 msgid "You must fill in field \"Nickname\" in the form" msgstr "עליך למלא את השדה \"שם כינוי\" בתוך התבנית" -#: mod_muc/mod_muc.erl:971 +#: mod_muc/mod_muc.erl:808 mod_muc/mod_muc_odbc.erl:831 msgid "ejabberd MUC module" msgstr "מודול MUC של ejabberd" @@ -656,7 +663,7 @@ msgid "is now known as" msgstr "ידועה כעת בכינוי" #: mod_muc/mod_muc_log.erl:417 mod_muc/mod_muc_log.erl:688 -#: mod_muc/mod_muc_room.erl:2389 +#: mod_muc/mod_muc_room.erl:2393 msgid " has set the subject to: " msgstr " הגדיר/ה את הנושא אל: " @@ -761,365 +768,368 @@ msgid "Room Occupants" msgstr "נוכחי חדר" # נעברה -#: mod_muc/mod_muc_room.erl:170 +#: mod_muc/mod_muc_room.erl:174 msgid "Traffic rate limit is exceeded" msgstr "מגבלת שיעור תעבורה נחצתה" -#: mod_muc/mod_muc_room.erl:242 +#: mod_muc/mod_muc_room.erl:246 msgid "" "This participant is kicked from the room because he sent an error message" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח הודעת שגיאה" +msgstr "משתתף זה נבעט מתוך החדר מכיוון שהוא שלח הודעת שגיאה" -#: mod_muc/mod_muc_room.erl:251 +#: mod_muc/mod_muc_room.erl:255 msgid "It is not allowed to send private messages to the conference" msgstr "אין זה מותר לשלוח הודעות פרטיות אל הועידה" -#: mod_muc/mod_muc_room.erl:328 +#: mod_muc/mod_muc_room.erl:332 msgid "Please, wait for a while before sending new voice request" msgstr "אנא, המתן לזמן מה לפני שליחת בקשת ביטוי חדשה" -#: mod_muc/mod_muc_room.erl:343 +#: mod_muc/mod_muc_room.erl:347 msgid "Voice requests are disabled in this conference" msgstr "בקשות ביטוי מנוטרלות בועידה זו" -# לחלץ -#: mod_muc/mod_muc_room.erl:360 +#: mod_muc/mod_muc_room.erl:364 msgid "Failed to extract JID from your voice request approval" -msgstr "נכשל לחלץ JID מן אישור בקשת הביטוי שלך" +msgstr "נכשל לחלץ JID מתוך אישור בקשת הביטוי שלך" -#: mod_muc/mod_muc_room.erl:389 +#: mod_muc/mod_muc_room.erl:393 msgid "Only moderators can approve voice requests" msgstr "רק אחראים יכולים לאשר בקשות ביטוי" # הולם -#: mod_muc/mod_muc_room.erl:404 +#: mod_muc/mod_muc_room.erl:408 msgid "Improper message type" msgstr "טיפוס הודעה לא מתאים" -#: mod_muc/mod_muc_room.erl:514 +#: mod_muc/mod_muc_room.erl:518 msgid "" "This participant is kicked from the room because he sent an error message to " "another participant" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח הודעת שגיאה אל משתתף אחר" +msgstr "משתתף זה נבעט מתוך החדר משום שהוא שלח הודעת שגיאה אל משתתף אחר" -#: mod_muc/mod_muc_room.erl:527 +#: mod_muc/mod_muc_room.erl:531 msgid "It is not allowed to send private messages of type \"groupchat\"" msgstr "אין זה מותר לשלוח הודעות פרטיות מן טיפוס \"groupchat\"" -#: mod_muc/mod_muc_room.erl:539 mod_muc/mod_muc_room.erl:607 +#: mod_muc/mod_muc_room.erl:543 mod_muc/mod_muc_room.erl:611 msgid "Recipient is not in the conference room" msgstr "מקבל אינו מצוי בחדר הועידה" # אסור -#: mod_muc/mod_muc_room.erl:560 mod_muc/mod_muc_room.erl:581 +#: mod_muc/mod_muc_room.erl:564 mod_muc/mod_muc_room.erl:585 msgid "It is not allowed to send private messages" msgstr "אין זה מותר לשלוח הודעות פרטיות" -#: mod_muc/mod_muc_room.erl:572 mod_muc/mod_muc_room.erl:951 -#: mod_muc/mod_muc_room.erl:4034 +#: mod_muc/mod_muc_room.erl:576 mod_muc/mod_muc_room.erl:956 +#: mod_muc/mod_muc_room.erl:4040 msgid "Only occupants are allowed to send messages to the conference" msgstr "רק נוכחים רשאים לשלוח הודעות אל הועידה" -#: mod_muc/mod_muc_room.erl:630 +#: mod_muc/mod_muc_room.erl:634 msgid "Only occupants are allowed to send queries to the conference" msgstr "רק נוכחים רשאים לשלוח שאילתות אל הועידה" -#: mod_muc/mod_muc_room.erl:642 +#: mod_muc/mod_muc_room.erl:646 msgid "Queries to the conference members are not allowed in this room" msgstr "שאילתות אל חברי הועידה אינן מותרות בחדר זה" -#: mod_muc/mod_muc_room.erl:927 +#: mod_muc/mod_muc_room.erl:932 msgid "" "Only moderators and participants are allowed to change the subject in this " "room" msgstr "רק אחראים ומשתתפים רשאים לשנות את הנושא בחדר זה" -#: mod_muc/mod_muc_room.erl:932 +#: mod_muc/mod_muc_room.erl:937 msgid "Only moderators are allowed to change the subject in this room" msgstr "רק אחראים רשאים לשנות את הנושא בחדר זה" # רשאים -#: mod_muc/mod_muc_room.erl:942 +#: mod_muc/mod_muc_room.erl:947 msgid "Visitors are not allowed to send messages to all occupants" msgstr "מבקרים אינם מורשים לשלוח הודעות אל כל הנוכחים" # שגיאת נוכחות -#: mod_muc/mod_muc_room.erl:1016 +# נוכחות שגויה +#: mod_muc/mod_muc_room.erl:1021 msgid "" "This participant is kicked from the room because he sent an error presence" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח נוכחות שגויה" +msgstr "משתתף זה נבעט מתוך החדר משום שהוא שלח נוכחות שגיאה" -#: mod_muc/mod_muc_room.erl:1035 +#: mod_muc/mod_muc_room.erl:1040 msgid "Visitors are not allowed to change their nicknames in this room" -msgstr "מבקרים אינם מורשים לשנות את שמות כינוים בחדר זה" +msgstr "מבקרים אינם מורשים לשנות את שמות הכינויים שלהם בחדר זה" -#: mod_muc/mod_muc_room.erl:1048 mod_muc/mod_muc_room.erl:1775 +#: mod_muc/mod_muc_room.erl:1053 mod_muc/mod_muc_room.erl:1779 msgid "That nickname is already in use by another occupant" msgstr "שם כינוי זה כבר מצוי בשימוש על ידי נוכח אחר" -#: mod_muc/mod_muc_room.erl:1764 +#: mod_muc/mod_muc_room.erl:1768 msgid "You have been banned from this room" msgstr "נאסרת מן חדר זה" -#: mod_muc/mod_muc_room.erl:1767 +#: mod_muc/mod_muc_room.erl:1771 msgid "Membership is required to enter this room" msgstr "נדרשת חברות כדי להיכנס אל חדר זה" -#: mod_muc/mod_muc_room.erl:1803 +#: mod_muc/mod_muc_room.erl:1807 msgid "This room is not anonymous" msgstr "חדר זה אינו אנונימי" # מילת־מעבר -#: mod_muc/mod_muc_room.erl:1829 +#: mod_muc/mod_muc_room.erl:1833 msgid "A password is required to enter this room" msgstr "נדרשת סיסמה כדי להיכנס אל חדר זה" -#: mod_muc/mod_muc_room.erl:1851 mod_register.erl:246 +#: mod_muc/mod_muc_room.erl:1855 mod_register.erl:246 msgid "Too many CAPTCHA requests" msgstr "יותר מדי בקשות CAPTCHA" -# לחולל -#: mod_muc/mod_muc_room.erl:1860 mod_register.erl:251 +#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251 msgid "Unable to generate a CAPTCHA" -msgstr "לא ניתן להלחין CAPTCHA" +msgstr "אין אפשרות לחולל CAPTCHA" -#: mod_muc/mod_muc_room.erl:1870 +#: mod_muc/mod_muc_room.erl:1874 msgid "Incorrect password" msgstr "מילת מעבר שגויה" -#: mod_muc/mod_muc_room.erl:2444 +#: mod_muc/mod_muc_room.erl:2448 msgid "Administrator privileges required" msgstr "נדרשות הרשאות מנהל" -#: mod_muc/mod_muc_room.erl:2459 +#: mod_muc/mod_muc_room.erl:2463 msgid "Moderator privileges required" msgstr "נדרשות הרשאות אחראי" -#: mod_muc/mod_muc_room.erl:2615 +#: mod_muc/mod_muc_room.erl:2619 msgid "Jabber ID ~s is invalid" -msgstr "כתובת JID ~s הינה שגויה" +msgstr "מזהה Jabber ~s הינו שגוי" -#: mod_muc/mod_muc_room.erl:2629 +#: mod_muc/mod_muc_room.erl:2633 msgid "Nickname ~s does not exist in the room" msgstr "שם כינוי ~s לא קיים בחדר" -#: mod_muc/mod_muc_room.erl:2655 mod_muc/mod_muc_room.erl:3045 +#: mod_muc/mod_muc_room.erl:2659 mod_muc/mod_muc_room.erl:3049 msgid "Invalid affiliation: ~s" msgstr "סינוף שגוי: ~s" -#: mod_muc/mod_muc_room.erl:2709 +#: mod_muc/mod_muc_room.erl:2713 msgid "Invalid role: ~s" msgstr "תפקיד שגוי: ~s" -#: mod_muc/mod_muc_room.erl:3022 mod_muc/mod_muc_room.erl:3058 +#: mod_muc/mod_muc_room.erl:3026 mod_muc/mod_muc_room.erl:3062 msgid "Owner privileges required" msgstr "נדרשות הרשאות בעלים" # תצורה של חדר -#: mod_muc/mod_muc_room.erl:3189 +#: mod_muc/mod_muc_room.erl:3195 msgid "Configuration of room ~s" msgstr "תצורת חדר ~s" -#: mod_muc/mod_muc_room.erl:3194 +#: mod_muc/mod_muc_room.erl:3200 msgid "Room title" msgstr "כותרת חדר" -#: mod_muc/mod_muc_room.erl:3197 mod_muc/mod_muc_room.erl:3686 +#: mod_muc/mod_muc_room.erl:3203 mod_muc/mod_muc_room.erl:3692 msgid "Room description" msgstr "תיאור חדר" -#: mod_muc/mod_muc_room.erl:3204 +#: mod_muc/mod_muc_room.erl:3210 msgid "Make room persistent" msgstr "הפוך חדר אל קבוע" -#: mod_muc/mod_muc_room.erl:3209 +#: mod_muc/mod_muc_room.erl:3215 msgid "Make room public searchable" -msgstr "הפוך חדר אל בר־חיפוש פומבי" +msgstr "הפוך חדר אל בר חיפוש פומבי" -#: mod_muc/mod_muc_room.erl:3212 +#: mod_muc/mod_muc_room.erl:3218 msgid "Make participants list public" msgstr "הפוך רשימת משתתפים אל פומבית" -#: mod_muc/mod_muc_room.erl:3215 +#: mod_muc/mod_muc_room.erl:3221 msgid "Make room password protected" msgstr "הפוך חדר אל מוגן במילת מעבר" -#: mod_muc/mod_muc_room.erl:3226 +#: mod_muc/mod_muc_room.erl:3232 msgid "Maximum Number of Occupants" msgstr "מספר מרבי של נוכחים" -#: mod_muc/mod_muc_room.erl:3233 +#: mod_muc/mod_muc_room.erl:3239 msgid "No limit" msgstr "ללא הגבלה" # הצג כתובות JID ממשיות ל -#: mod_muc/mod_muc_room.erl:3244 +#: mod_muc/mod_muc_room.erl:3250 msgid "Present real Jabber IDs to" msgstr "הצג כתובות JID ממשיות" -#: mod_muc/mod_muc_room.erl:3252 mod_muc/mod_muc_room.erl:3286 +#: mod_muc/mod_muc_room.erl:3258 mod_muc/mod_muc_room.erl:3292 msgid "moderators only" msgstr "לאחראים בלבד" -#: mod_muc/mod_muc_room.erl:3254 mod_muc/mod_muc_room.erl:3288 +#: mod_muc/mod_muc_room.erl:3260 mod_muc/mod_muc_room.erl:3294 msgid "anyone" msgstr "לכל אחד" -#: mod_muc/mod_muc_room.erl:3256 +#: mod_muc/mod_muc_room.erl:3262 msgid "Make room members-only" msgstr "הפוך חדר אל חברים-בלבד" # חדר מבוקר חדר תחת ביקורת -#: mod_muc/mod_muc_room.erl:3259 +#: mod_muc/mod_muc_room.erl:3265 msgid "Make room moderated" msgstr "הפוך חדר אל מבוקר" -#: mod_muc/mod_muc_room.erl:3262 +#: mod_muc/mod_muc_room.erl:3268 msgid "Default users as participants" msgstr "משתמשים משתמטים כמשתתפים" # התרה -#: mod_muc/mod_muc_room.erl:3265 +#: mod_muc/mod_muc_room.erl:3271 msgid "Allow users to change the subject" msgstr "התר למשתמשים לשנות את הנושא" -#: mod_muc/mod_muc_room.erl:3268 +#: mod_muc/mod_muc_room.erl:3274 msgid "Allow users to send private messages" msgstr "התר למשתמשים לשלוח הודעות פרטיות" -#: mod_muc/mod_muc_room.erl:3273 +#: mod_muc/mod_muc_room.erl:3279 msgid "Allow visitors to send private messages to" msgstr "התר למבקרים לשלוח הודעות פרטיות אל" -#: mod_muc/mod_muc_room.erl:3284 +#: mod_muc/mod_muc_room.erl:3290 msgid "nobody" msgstr "אף אחד" -#: mod_muc/mod_muc_room.erl:3290 +#: mod_muc/mod_muc_room.erl:3296 msgid "Allow users to query other users" msgstr "התר למשתמשים לתשאל משתמשים אחרים" -#: mod_muc/mod_muc_room.erl:3293 +#: mod_muc/mod_muc_room.erl:3299 msgid "Allow users to send invites" msgstr "התר למשתמשים לשלוח הזמנות" -#: mod_muc/mod_muc_room.erl:3296 +#: mod_muc/mod_muc_room.erl:3302 msgid "Allow visitors to send status text in presence updates" msgstr "התר למבקרים לשלוח טקסט מצב בעדכוני נוכחות" -#: mod_muc/mod_muc_room.erl:3299 +#: mod_muc/mod_muc_room.erl:3305 msgid "Allow visitors to change nickname" msgstr "התר למבקרים לשנות שם כינוי" -#: mod_muc/mod_muc_room.erl:3302 +#: mod_muc/mod_muc_room.erl:3308 msgid "Allow visitors to send voice requests" msgstr "התר למבקרים לשלוח בקשות ביטוי" -#: mod_muc/mod_muc_room.erl:3305 +#: mod_muc/mod_muc_room.erl:3311 msgid "Minimum interval between voice requests (in seconds)" msgstr "תדירות מינימלית בין בקשות ביטוי (בשניות)" -#: mod_muc/mod_muc_room.erl:3311 +#: mod_muc/mod_muc_room.erl:3317 msgid "Make room CAPTCHA protected" msgstr "הפוך חדר אל מוגן CAPTCHA" # זהויות -#: mod_muc/mod_muc_room.erl:3316 +#: mod_muc/mod_muc_room.erl:3322 msgid "Exclude Jabber IDs from CAPTCHA challenge" -msgstr "הוצא כתובות של Jabber מן אתגר CAPTCHA" +msgstr "הוצא כתובות של Jabber מתוך אתגר CAPTCHA" -#: mod_muc/mod_muc_room.erl:3323 +#: mod_muc/mod_muc_room.erl:3329 msgid "Enable logging" msgstr "אפשור רישום פעילות" -#: mod_muc/mod_muc_room.erl:3331 +#: mod_muc/mod_muc_room.erl:3337 msgid "You need an x:data capable client to configure room" -msgstr "עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי להגדיר חדר" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי להגדיר חדר" -#: mod_muc/mod_muc_room.erl:3688 +#: mod_muc/mod_muc_room.erl:3694 msgid "Number of occupants" msgstr "מספר של נוכחים" # private what? (fe/male) -#: mod_muc/mod_muc_room.erl:3744 +#: mod_muc/mod_muc_room.erl:3750 #, fuzzy msgid "private, " msgstr "פרטי, " -#: mod_muc/mod_muc_room.erl:3793 +#: mod_muc/mod_muc_room.erl:3799 msgid "Voice request" msgstr "בקשת ביטוי" -#: mod_muc/mod_muc_room.erl:3797 +# אשר או דחה +#: mod_muc/mod_muc_room.erl:3803 msgid "Either approve or decline the voice request." msgstr "או שתאשר או שתדחה את בקשת הביטוי." -#: mod_muc/mod_muc_room.erl:3803 +#: mod_muc/mod_muc_room.erl:3809 msgid "User JID" msgstr "JID משתמש" -#: mod_muc/mod_muc_room.erl:3805 +#: mod_muc/mod_muc_room.erl:3811 msgid "Grant voice to this person?" msgstr "להעניק ביטוי לאישיות זו?" -#: mod_muc/mod_muc_room.erl:3954 +#: mod_muc/mod_muc_room.erl:3960 msgid "~s invites you to the room ~s" msgstr "~s מזמינך אל החדר ~s" -#: mod_muc/mod_muc_room.erl:3963 +#: mod_muc/mod_muc_room.erl:3969 msgid "the password is" msgstr "הסיסמה היא" # תור הודעות לא מקוונות של הקשר שלך הינו -#: mod_offline.erl:623 +#: mod_offline.erl:510 mod_offline_odbc.erl:352 msgid "" "Your contact offline message queue is full. The message has been discarded." msgstr "תור הודעות קשר לא מקוונות הינו מלא. ההודעה סולקה." -#: mod_offline.erl:713 +#: mod_offline.erl:560 mod_offline_odbc.erl:408 msgid "~s's Offline Messages Queue" msgstr "תור הודעות לא מקוונות של ~s" -#: mod_offline.erl:716 mod_roster.erl:1389 mod_shared_roster.erl:1060 -#: mod_shared_roster.erl:1169 web/ejabberd_web_admin.erl:833 +#: mod_offline.erl:563 mod_offline_odbc.erl:411 mod_roster.erl:987 +#: mod_roster_odbc.erl:1104 mod_shared_roster.erl:901 +#: mod_shared_roster.erl:1010 mod_shared_roster_odbc.erl:930 +#: mod_shared_roster_odbc.erl:1039 web/ejabberd_web_admin.erl:833 #: web/ejabberd_web_admin.erl:874 web/ejabberd_web_admin.erl:942 #: web/ejabberd_web_admin.erl:978 web/ejabberd_web_admin.erl:1019 -#: web/ejabberd_web_admin.erl:1508 web/ejabberd_web_admin.erl:1753 -#: web/ejabberd_web_admin.erl:1924 web/ejabberd_web_admin.erl:1956 -#: web/ejabberd_web_admin.erl:2024 web/ejabberd_web_admin.erl:2128 -#: web/ejabberd_web_admin.erl:2153 web/ejabberd_web_admin.erl:2241 +#: web/ejabberd_web_admin.erl:1508 web/ejabberd_web_admin.erl:1760 +#: web/ejabberd_web_admin.erl:1931 web/ejabberd_web_admin.erl:1963 +#: web/ejabberd_web_admin.erl:2031 web/ejabberd_web_admin.erl:2135 +#: web/ejabberd_web_admin.erl:2160 web/ejabberd_web_admin.erl:2248 msgid "Submitted" msgstr "" -#: mod_offline.erl:724 +#: mod_offline.erl:571 msgid "Time" msgstr "זמן" # מאת -#: mod_offline.erl:725 +#: mod_offline.erl:572 msgid "From" msgstr "מן" -#: mod_offline.erl:726 +#: mod_offline.erl:573 msgid "To" msgstr "אל" -#: mod_offline.erl:727 +#: mod_offline.erl:574 mod_offline_odbc.erl:419 #, fuzzy msgid "Packet" msgstr "חבילת מידע" # נבחרים -#: mod_offline.erl:740 mod_shared_roster.erl:1067 -#: web/ejabberd_web_admin.erl:882 web/ejabberd_web_admin.erl:986 +#: mod_offline.erl:587 mod_offline_odbc.erl:432 mod_shared_roster.erl:908 +#: mod_shared_roster_odbc.erl:937 web/ejabberd_web_admin.erl:882 +#: web/ejabberd_web_admin.erl:986 msgid "Delete Selected" msgstr "מחק נבחרות" -#: mod_offline.erl:864 +#: mod_offline.erl:645 mod_offline_odbc.erl:519 msgid "Offline Messages:" msgstr "הודעות לא מקוונות:" -#: mod_offline.erl:864 +#: mod_offline.erl:645 mod_offline_odbc.erl:519 msgid "Remove All Offline Messages" msgstr "הסר את כל ההודעות הלא מקוונות" @@ -1175,7 +1185,7 @@ msgstr "הודע מנויים כאשר הממסר נמחק" #: mod_pubsub/mod_pubsub.erl:3478 mod_pubsub/mod_pubsub_odbc.erl:3291 msgid "Notify subscribers when items are removed from the node" -msgstr "הודע מנויים כאשר פריטים מוסרים מן הממסר" +msgstr "הודע מנויים כאשר פריטים מוסרים מתוך הממסר" # Typo: store #: mod_pubsub/mod_pubsub.erl:3479 mod_pubsub/mod_pubsub_odbc.erl:3292 @@ -1243,14 +1253,14 @@ msgstr "אימות CAPTCHA נכשל" #: mod_register.erl:220 msgid "You need a client that supports x:data and CAPTCHA to register" -msgstr "עליך לעשות שימוש בלקוח שתומך x:data וגם CAPTCHA בכדי להירשם" +msgstr "עליך להשתמש בלקוח אשר תומך x:data וגם CAPTCHA בכדי להירשם" #: mod_register.erl:226 mod_register.erl:265 msgid "Choose a username and password to register with this server" msgstr "בחר שם משתמש וסיסמה להירשם עם שרת זה" -#: mod_register.erl:230 mod_vcard.erl:435 web/ejabberd_web_admin.erl:1515 -#: web/ejabberd_web_admin.erl:1571 +#: mod_register.erl:230 mod_vcard.erl:364 mod_vcard_odbc.erl:342 +#: web/ejabberd_web_admin.erl:1515 web/ejabberd_web_admin.erl:1572 msgid "User" msgstr "משתמש" @@ -1263,122 +1273,131 @@ msgstr "הסיסמה חלשה מדי" msgid "Users are not allowed to register accounts so quickly" msgstr "משתמשים אינם מורשים לרשום חשבונות כל כך במהירות" -#: mod_roster.erl:1340 web/ejabberd_web_admin.erl:1695 -#: web/ejabberd_web_admin.erl:1879 web/ejabberd_web_admin.erl:1890 -#: web/ejabberd_web_admin.erl:2212 +#: mod_roster.erl:938 mod_roster_odbc.erl:1055 web/ejabberd_web_admin.erl:1701 +#: web/ejabberd_web_admin.erl:1886 web/ejabberd_web_admin.erl:1897 +#: web/ejabberd_web_admin.erl:2219 #, fuzzy msgid "None" msgstr "ללא" -#: mod_roster.erl:1347 +#: mod_roster.erl:945 mod_roster_odbc.erl:1062 msgid "Subscription" msgstr "מִנּוּי" # ממתינות -#: mod_roster.erl:1348 +#: mod_roster.erl:946 mod_roster_odbc.erl:1063 #, fuzzy msgid "Pending" msgstr "ממתינים" -#: mod_roster.erl:1349 +#: mod_roster.erl:947 mod_roster_odbc.erl:1064 msgid "Groups" msgstr "קבוצות" -#: mod_roster.erl:1376 +#: mod_roster.erl:974 mod_roster_odbc.erl:1091 msgid "Validate" msgstr "הענק תוקף" -#: mod_roster.erl:1384 +#: mod_roster.erl:982 mod_roster_odbc.erl:1099 msgid "Remove" msgstr "הסר" -#: mod_roster.erl:1387 +#: mod_roster.erl:985 mod_roster_odbc.erl:1102 msgid "Roster of " msgstr "רשימה של " # פגום -#: mod_roster.erl:1390 mod_shared_roster.erl:1061 mod_shared_roster.erl:1170 -#: web/ejabberd_web_admin.erl:834 web/ejabberd_web_admin.erl:875 -#: web/ejabberd_web_admin.erl:943 web/ejabberd_web_admin.erl:979 -#: web/ejabberd_web_admin.erl:1020 web/ejabberd_web_admin.erl:1509 -#: web/ejabberd_web_admin.erl:1754 web/ejabberd_web_admin.erl:1925 -#: web/ejabberd_web_admin.erl:2129 web/ejabberd_web_admin.erl:2154 +#: mod_roster.erl:988 mod_roster_odbc.erl:1105 mod_shared_roster.erl:902 +#: mod_shared_roster.erl:1011 mod_shared_roster_odbc.erl:931 +#: mod_shared_roster_odbc.erl:1040 web/ejabberd_web_admin.erl:834 +#: web/ejabberd_web_admin.erl:875 web/ejabberd_web_admin.erl:943 +#: web/ejabberd_web_admin.erl:979 web/ejabberd_web_admin.erl:1020 +#: web/ejabberd_web_admin.erl:1509 web/ejabberd_web_admin.erl:1761 +#: web/ejabberd_web_admin.erl:1932 web/ejabberd_web_admin.erl:2136 +#: web/ejabberd_web_admin.erl:2161 msgid "Bad format" msgstr "פורמט רע" -#: mod_roster.erl:1397 +#: mod_roster.erl:995 mod_roster_odbc.erl:1112 msgid "Add Jabber ID" msgstr "הוסף JID" -#: mod_roster.erl:1496 +#: mod_roster.erl:1094 mod_roster_odbc.erl:1211 msgid "Roster" msgstr "רשימה" -#: mod_shared_roster.erl:1016 mod_shared_roster.erl:1058 -#: mod_shared_roster.erl:1166 +#: mod_shared_roster.erl:857 mod_shared_roster.erl:899 +#: mod_shared_roster.erl:1007 mod_shared_roster_odbc.erl:886 +#: mod_shared_roster_odbc.erl:928 mod_shared_roster_odbc.erl:1036 msgid "Shared Roster Groups" msgstr "קבוצות רשימה משותפות" -#: mod_shared_roster.erl:1054 web/ejabberd_web_admin.erl:1365 -#: web/ejabberd_web_admin.erl:2454 +#: mod_shared_roster.erl:895 mod_shared_roster_odbc.erl:924 +#: web/ejabberd_web_admin.erl:1365 web/ejabberd_web_admin.erl:2461 msgid "Add New" msgstr "הוסף חדש" -#: mod_shared_roster.erl:1137 +#: mod_shared_roster.erl:978 mod_shared_roster_odbc.erl:1007 msgid "Name:" msgstr "שם:" -#: mod_shared_roster.erl:1142 +#: mod_shared_roster.erl:983 mod_shared_roster_odbc.erl:1012 msgid "Description:" msgstr "תיאור:" -#: mod_shared_roster.erl:1150 +#: mod_shared_roster.erl:991 mod_shared_roster_odbc.erl:1020 msgid "Members:" msgstr "חברים:" -#: mod_shared_roster.erl:1158 +#: mod_shared_roster.erl:999 mod_shared_roster_odbc.erl:1028 msgid "Displayed Groups:" msgstr "קבוצות מוצגות:" -#: mod_shared_roster.erl:1167 +#: mod_shared_roster.erl:1008 mod_shared_roster_odbc.erl:1037 msgid "Group " msgstr "קבוצה " -#: mod_shared_roster.erl:1176 web/ejabberd_web_admin.erl:840 -#: web/ejabberd_web_admin.erl:884 web/ejabberd_web_admin.erl:949 -#: web/ejabberd_web_admin.erl:1026 web/ejabberd_web_admin.erl:2010 +#: mod_shared_roster.erl:1017 mod_shared_roster_odbc.erl:1046 +#: web/ejabberd_web_admin.erl:840 web/ejabberd_web_admin.erl:884 +#: web/ejabberd_web_admin.erl:949 web/ejabberd_web_admin.erl:1026 +#: web/ejabberd_web_admin.erl:2017 msgid "Submit" msgstr "שליחה" -#: mod_vcard.erl:172 mod_vcard_ldap.erl:238 +#: mod_vcard.erl:165 mod_vcard_ldap.erl:238 mod_vcard_odbc.erl:129 #, fuzzy msgid "Erlang Jabber Server" msgstr "שרת ג׳אבּר Erlang" -#: mod_vcard.erl:435 mod_vcard.erl:549 +#: mod_vcard.erl:364 mod_vcard.erl:478 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:454 msgid "Birthday" msgstr "יום הולדת" -#: mod_vcard.erl:435 mod_vcard.erl:551 +#: mod_vcard.erl:364 mod_vcard.erl:480 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:456 msgid "City" msgstr "עיר" -#: mod_vcard.erl:435 mod_vcard.erl:550 +#: mod_vcard.erl:364 mod_vcard.erl:479 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:455 msgid "Country" msgstr "ארץ" -#: mod_vcard.erl:435 mod_vcard.erl:552 +#: mod_vcard.erl:364 mod_vcard.erl:481 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:457 msgid "Email" msgstr "דוא״ל" -#: mod_vcard.erl:435 mod_vcard.erl:547 +#: mod_vcard.erl:364 mod_vcard.erl:476 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:452 msgid "Family Name" msgstr "שם משפחה" # נא למלא # שקול לתאום # note: matching > wanted -#: mod_vcard.erl:435 +#: mod_vcard.erl:364 mod_vcard_odbc.erl:342 msgid "" "Fill in the form to search for any matching Jabber User (Add * to the end of " "field to match substring)" @@ -1386,44 +1405,49 @@ msgstr "" "מלא את התבניות כדי לחפש עבור כל משתמש Jabber מבוקש (באפשרותך להוסיף * בסוף " "שדה כדי להתאים אל מחרוזת-משנה)" -#: mod_vcard.erl:435 mod_vcard.erl:544 +#: mod_vcard.erl:364 mod_vcard.erl:473 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:449 msgid "Full Name" msgstr "שם מלא" -#: mod_vcard.erl:435 mod_vcard.erl:546 +#: mod_vcard.erl:364 mod_vcard.erl:475 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:451 msgid "Middle Name" msgstr "שם אמצעי" -#: mod_vcard.erl:435 mod_vcard.erl:545 web/ejabberd_web_admin.erl:1999 +#: mod_vcard.erl:364 mod_vcard.erl:474 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:450 web/ejabberd_web_admin.erl:2006 msgid "Name" msgstr "שם" -#: mod_vcard.erl:435 mod_vcard.erl:553 +#: mod_vcard.erl:364 mod_vcard.erl:482 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:458 msgid "Organization Name" msgstr "שם ארגון" -#: mod_vcard.erl:435 mod_vcard.erl:554 +#: mod_vcard.erl:364 mod_vcard.erl:483 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:459 msgid "Organization Unit" msgstr "יחידת איגוד" # בקרב -#: mod_vcard.erl:435 mod_vcard_ldap.erl:462 +#: mod_vcard.erl:364 mod_vcard_ldap.erl:462 mod_vcard_odbc.erl:342 msgid "Search users in " msgstr "חיפוש משתמשים אצל " -#: mod_vcard.erl:435 mod_vcard_ldap.erl:462 +#: mod_vcard.erl:364 mod_vcard_ldap.erl:462 mod_vcard_odbc.erl:342 msgid "You need an x:data capable client to search" -msgstr "עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי לחפש" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי לחפש" -#: mod_vcard.erl:460 mod_vcard_ldap.erl:487 +#: mod_vcard.erl:389 mod_vcard_ldap.erl:487 mod_vcard_odbc.erl:367 msgid "vCard User Search" msgstr "חיפוש משתמש vCard" -#: mod_vcard.erl:516 mod_vcard_ldap.erl:541 +#: mod_vcard.erl:445 mod_vcard_ldap.erl:541 mod_vcard_odbc.erl:421 msgid "ejabberd vCard module" msgstr "מודול vCard של ejabberd" -#: mod_vcard.erl:540 mod_vcard_ldap.erl:551 +#: mod_vcard.erl:469 mod_vcard_ldap.erl:551 mod_vcard_odbc.erl:445 msgid "Search Results for " msgstr "תוצאות חיפוש עבור " @@ -1490,7 +1514,7 @@ msgstr "הצג טבלה רגילה" msgid "Show Integral Table" msgstr "הצג טבלה אינטגרלית" -#: web/ejabberd_web_admin.erl:1105 web/ejabberd_web_admin.erl:1932 +#: web/ejabberd_web_admin.erl:1105 web/ejabberd_web_admin.erl:1939 msgid "Statistics" msgstr "סטטיסטיקה" @@ -1510,262 +1534,264 @@ msgstr "מארח" msgid "Registered Users" msgstr "משתמשים רשומים" -#: web/ejabberd_web_admin.erl:1572 +#: web/ejabberd_web_admin.erl:1573 msgid "Offline Messages" msgstr "הודעות לא מקוונות" -#: web/ejabberd_web_admin.erl:1573 web/ejabberd_web_admin.erl:1760 +#: web/ejabberd_web_admin.erl:1574 web/ejabberd_web_admin.erl:1767 msgid "Last Activity" msgstr "פעילות אחרונה" -#: web/ejabberd_web_admin.erl:1653 web/ejabberd_web_admin.erl:1669 +#: web/ejabberd_web_admin.erl:1659 web/ejabberd_web_admin.erl:1675 msgid "Registered Users:" msgstr "משתמשים רשומים:" -#: web/ejabberd_web_admin.erl:1655 web/ejabberd_web_admin.erl:1671 -#: web/ejabberd_web_admin.erl:2185 +#: web/ejabberd_web_admin.erl:1661 web/ejabberd_web_admin.erl:1677 +#: web/ejabberd_web_admin.erl:2192 msgid "Online Users:" msgstr "משתמשים מקוונים:" -#: web/ejabberd_web_admin.erl:1657 +#: web/ejabberd_web_admin.erl:1663 msgid "Outgoing s2s Connections:" msgstr "חיבורי s2s יוצאים:" -#: web/ejabberd_web_admin.erl:1659 +#: web/ejabberd_web_admin.erl:1665 msgid "Outgoing s2s Servers:" msgstr "שרתי s2s יוצאים:" -#: web/ejabberd_web_admin.erl:1728 web/mod_register_web.erl:175 +#: web/ejabberd_web_admin.erl:1734 web/mod_register_web.erl:175 #: web/mod_register_web.erl:372 web/mod_register_web.erl:381 #: web/mod_register_web.erl:411 msgid "Change Password" msgstr "שנה סיסמה" -#: web/ejabberd_web_admin.erl:1751 +#: web/ejabberd_web_admin.erl:1758 msgid "User " -msgstr "משתמש" +msgstr "משתמש " -#: web/ejabberd_web_admin.erl:1758 +#: web/ejabberd_web_admin.erl:1765 msgid "Connected Resources:" msgstr "משאבים מחוברים:" -#: web/ejabberd_web_admin.erl:1759 web/mod_register_web.erl:227 +#: web/ejabberd_web_admin.erl:1766 web/mod_register_web.erl:227 #: web/mod_register_web.erl:519 msgid "Password:" msgstr "סיסמה:" -#: web/ejabberd_web_admin.erl:1821 +#: web/ejabberd_web_admin.erl:1828 msgid "No Data" msgstr "אין מידע" -#: web/ejabberd_web_admin.erl:1899 +#: web/ejabberd_web_admin.erl:1906 msgid "Nodes" msgstr "ממסרים" -#: web/ejabberd_web_admin.erl:1922 web/ejabberd_web_admin.erl:1944 +#: web/ejabberd_web_admin.erl:1929 web/ejabberd_web_admin.erl:1951 msgid "Node " msgstr "ממסר" -#: web/ejabberd_web_admin.erl:1931 +#: web/ejabberd_web_admin.erl:1938 #, fuzzy msgid "Listened Ports" msgstr "פורטים מואזנים" -#: web/ejabberd_web_admin.erl:1933 web/ejabberd_web_admin.erl:2253 -#: web/ejabberd_web_admin.erl:2441 +#: web/ejabberd_web_admin.erl:1940 web/ejabberd_web_admin.erl:2260 +#: web/ejabberd_web_admin.erl:2448 msgid "Update" msgstr "עדכן" -#: web/ejabberd_web_admin.erl:1936 web/ejabberd_web_admin.erl:2562 +#: web/ejabberd_web_admin.erl:1943 web/ejabberd_web_admin.erl:2569 msgid "Restart" msgstr "אתחל" -#: web/ejabberd_web_admin.erl:1938 web/ejabberd_web_admin.erl:2564 +#: web/ejabberd_web_admin.erl:1945 web/ejabberd_web_admin.erl:2571 msgid "Stop" msgstr "הפסק" -#: web/ejabberd_web_admin.erl:1952 +#: web/ejabberd_web_admin.erl:1959 msgid "RPC Call Error" msgstr "שגיאת קריאת RPC" -#: web/ejabberd_web_admin.erl:1993 +#: web/ejabberd_web_admin.erl:2000 msgid "Database Tables at " msgstr "טבלאות מסד נתונים אצל " -#: web/ejabberd_web_admin.erl:2000 +#: web/ejabberd_web_admin.erl:2007 msgid "Storage Type" msgstr "טיפוס אחסון" -#: web/ejabberd_web_admin.erl:2001 +#: web/ejabberd_web_admin.erl:2008 msgid "Elements" msgstr "אלמנטים" -#: web/ejabberd_web_admin.erl:2002 +#: web/ejabberd_web_admin.erl:2009 msgid "Memory" msgstr "זיכרון" -#: web/ejabberd_web_admin.erl:2025 web/ejabberd_web_admin.erl:2130 +#: web/ejabberd_web_admin.erl:2032 web/ejabberd_web_admin.erl:2137 msgid "Error" msgstr "שגיאה" -#: web/ejabberd_web_admin.erl:2027 +#: web/ejabberd_web_admin.erl:2034 msgid "Backup of " msgstr "גיבוי של " -# האינטגרלי בנפרד -#: web/ejabberd_web_admin.erl:2029 +# האינטגרלי לחוד +#: web/ejabberd_web_admin.erl:2036 msgid "" "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." msgstr "" -"נא לשים לב שלאפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך " -"עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL שברשותך לחוד." +"נא לשים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך " +"עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך " +"בנפרד." -#: web/ejabberd_web_admin.erl:2034 +#: web/ejabberd_web_admin.erl:2041 msgid "Store binary backup:" msgstr "אחסן גיבוי בינארי:" -#: web/ejabberd_web_admin.erl:2038 web/ejabberd_web_admin.erl:2045 -#: web/ejabberd_web_admin.erl:2053 web/ejabberd_web_admin.erl:2060 -#: web/ejabberd_web_admin.erl:2067 web/ejabberd_web_admin.erl:2074 -#: web/ejabberd_web_admin.erl:2081 web/ejabberd_web_admin.erl:2089 -#: web/ejabberd_web_admin.erl:2096 web/ejabberd_web_admin.erl:2103 +#: web/ejabberd_web_admin.erl:2045 web/ejabberd_web_admin.erl:2052 +#: web/ejabberd_web_admin.erl:2060 web/ejabberd_web_admin.erl:2067 +#: web/ejabberd_web_admin.erl:2074 web/ejabberd_web_admin.erl:2081 +#: web/ejabberd_web_admin.erl:2088 web/ejabberd_web_admin.erl:2096 +#: web/ejabberd_web_admin.erl:2103 web/ejabberd_web_admin.erl:2110 msgid "OK" msgstr "אישור" # ללא דיחוי -#: web/ejabberd_web_admin.erl:2041 +#: web/ejabberd_web_admin.erl:2048 msgid "Restore binary backup immediately:" msgstr "שחזר גיבוי בינארי לאלתר:" # לאחר אתחול בא של -#: web/ejabberd_web_admin.erl:2049 +#: web/ejabberd_web_admin.erl:2056 msgid "" "Restore binary backup after next ejabberd restart (requires less memory):" msgstr "שחזר גיבוי בינארי לאחר האתחול הבא של ejabberd (מצריך פחות זיכרון):" # תמליל ברור -#: web/ejabberd_web_admin.erl:2056 +#: web/ejabberd_web_admin.erl:2063 msgid "Store plain text backup:" msgstr "אחסן גיבוי טקסט גלוי (plain text):" -#: web/ejabberd_web_admin.erl:2063 +#: web/ejabberd_web_admin.erl:2070 msgid "Restore plain text backup immediately:" msgstr "שחזר גיבוי טקסט גלוי (plain text) לאלתר:" -#: web/ejabberd_web_admin.erl:2070 +#: web/ejabberd_web_admin.erl:2077 msgid "Import users data from a PIEFXIS file (XEP-0227):" -msgstr "ייבוא מידע משתמשים מן קובץ PIEFXIS (XEP-0227):" +msgstr "ייבוא מידע משתמשים מתוך קובץ PIEFXIS (XEP-0227):" -#: web/ejabberd_web_admin.erl:2077 +#: web/ejabberd_web_admin.erl:2084 msgid "Export data of all users in the server to PIEFXIS files (XEP-0227):" -msgstr "ייצוא מידע של כל המשתמשים שבשרת אל קבצי PIEFXIS (XEP-0227):" +msgstr "" +"ייצוא מידע של כל המשתמשים אשר מצויים בשרת זה אל קבצי PIEFXIS (XEP-0227):" -#: web/ejabberd_web_admin.erl:2084 +#: web/ejabberd_web_admin.erl:2091 msgid "Export data of users in a host to PIEFXIS files (XEP-0227):" -msgstr "ייצוא מידע של כל המשתמשים אצל מארח אל קבצי PIEFXIS (XEP-0227):" +msgstr "ייצוא מידע של כל המשתמשים בתוך מארח אל קבצי PIEFXIS (XEP-0227):" -#: web/ejabberd_web_admin.erl:2092 +#: web/ejabberd_web_admin.erl:2099 msgid "Import user data from jabberd14 spool file:" -msgstr "ייבוא נתוני משתמש מן קובץ סליל (spool file) של jabberd14:" +msgstr "ייבוא נתוני משתמש מתוך קובץ סליל (spool file) של jabberd14:" -#: web/ejabberd_web_admin.erl:2099 +#: web/ejabberd_web_admin.erl:2106 msgid "Import users data from jabberd14 spool directory:" -msgstr "ייבוא נתוני משתמשים מן מדור סליל (spool directory) של jabberd14:" +msgstr "ייבוא נתוני משתמשים מתוך מדור סליל (spool directory) של jabberd14:" -#: web/ejabberd_web_admin.erl:2125 +#: web/ejabberd_web_admin.erl:2132 #, fuzzy msgid "Listened Ports at " msgstr "פורטים מואזנים אצל " -#: web/ejabberd_web_admin.erl:2150 +#: web/ejabberd_web_admin.erl:2157 msgid "Modules at " msgstr "מודולים אצל " -#: web/ejabberd_web_admin.erl:2176 +#: web/ejabberd_web_admin.erl:2183 msgid "Statistics of ~p" msgstr "סטטיסטיקות עבור ~p" -#: web/ejabberd_web_admin.erl:2179 +#: web/ejabberd_web_admin.erl:2186 msgid "Uptime:" msgstr "זמן פעילות:" -#: web/ejabberd_web_admin.erl:2182 +#: web/ejabberd_web_admin.erl:2189 msgid "CPU Time:" msgstr "זמן מחשב (CPU):" # זיכרון דברים (דיני חוזים) -#: web/ejabberd_web_admin.erl:2188 +#: web/ejabberd_web_admin.erl:2195 msgid "Transactions Committed:" msgstr "טרנזקציות בוצעו:" -#: web/ejabberd_web_admin.erl:2191 +#: web/ejabberd_web_admin.erl:2198 msgid "Transactions Aborted:" msgstr "טרנזקציות בוטלו:" -#: web/ejabberd_web_admin.erl:2194 +#: web/ejabberd_web_admin.erl:2201 msgid "Transactions Restarted:" msgstr "טרנזקציות הותחלו מחדש:" -#: web/ejabberd_web_admin.erl:2197 +#: web/ejabberd_web_admin.erl:2204 msgid "Transactions Logged:" msgstr "טרנזקציות נרשמו:" -#: web/ejabberd_web_admin.erl:2239 +#: web/ejabberd_web_admin.erl:2246 msgid "Update " msgstr "" -#: web/ejabberd_web_admin.erl:2247 +#: web/ejabberd_web_admin.erl:2254 msgid "Update plan" msgstr "" # adjusted -#: web/ejabberd_web_admin.erl:2248 +#: web/ejabberd_web_admin.erl:2255 msgid "Modified modules" msgstr "מודולים שהותאמו" # תסריט עדכון -#: web/ejabberd_web_admin.erl:2249 +#: web/ejabberd_web_admin.erl:2256 #, fuzzy msgid "Update script" msgstr "עדכן תסריט" -#: web/ejabberd_web_admin.erl:2250 +#: web/ejabberd_web_admin.erl:2257 #, fuzzy msgid "Low level update script" msgstr "תסריט עדכון Low level" -#: web/ejabberd_web_admin.erl:2251 +#: web/ejabberd_web_admin.erl:2258 #, fuzzy msgid "Script check" msgstr "תסריט בדיקה" -#: web/ejabberd_web_admin.erl:2419 +#: web/ejabberd_web_admin.erl:2426 msgid "Port" msgstr "פורט" -#: web/ejabberd_web_admin.erl:2420 +#: web/ejabberd_web_admin.erl:2427 msgid "IP" msgstr "IP" -#: web/ejabberd_web_admin.erl:2421 +#: web/ejabberd_web_admin.erl:2428 msgid "Protocol" msgstr "פרוטוקול" -#: web/ejabberd_web_admin.erl:2422 web/ejabberd_web_admin.erl:2549 +#: web/ejabberd_web_admin.erl:2429 web/ejabberd_web_admin.erl:2556 msgid "Module" msgstr "מודול" -#: web/ejabberd_web_admin.erl:2423 web/ejabberd_web_admin.erl:2550 +#: web/ejabberd_web_admin.erl:2430 web/ejabberd_web_admin.erl:2557 msgid "Options" msgstr "אפשרויות" -#: web/ejabberd_web_admin.erl:2443 +#: web/ejabberd_web_admin.erl:2450 msgid "Delete" msgstr "מחק" -#: web/ejabberd_web_admin.erl:2572 +#: web/ejabberd_web_admin.erl:2579 msgid "Start" msgstr "התחל" @@ -1775,7 +1801,7 @@ msgstr "חשבון Jabber נוצר בהצלחה." #: web/mod_register_web.erl:107 msgid "There was an error creating the account: " -msgstr "ארעה שגיאה ביצירת החשבון: " +msgstr "אירעה שגיאה ביצירת החשבון: " #: web/mod_register_web.erl:115 msgid "Your Jabber account was successfully deleted." @@ -1783,7 +1809,7 @@ msgstr "חשבון Jabber נמחק בהצלחה." #: web/mod_register_web.erl:118 msgid "There was an error deleting the account: " -msgstr "ארעה שגיאה במחיקת החשבון: " +msgstr "אירעה שגיאה במחיקת החשבון: " #: web/mod_register_web.erl:128 msgid "The password of your Jabber account was successfully changed." @@ -1791,7 +1817,7 @@ msgstr "סיסמת חשבון Jabber שונתה בהצלחה." #: web/mod_register_web.erl:131 msgid "There was an error changing the password: " -msgstr "ארעה שגיאה בשנוי הסיסמה: " +msgstr "אירעה שגיאה בשינוי הסיסמה: " #: web/mod_register_web.erl:163 web/mod_register_web.erl:172 msgid "Jabber Account Registration" @@ -1815,7 +1841,7 @@ msgid "" "carefully the instructions to fill correctly the fields." msgstr "" "עמוד זה מתיר ליצור חשבון Jabber בשרת Jabber זה. כתובת JID (Jabber " -"IDentifier) תגובש באופן של: username@server. נא לקרוא את בזהירות את ההוראות " +"IDentifier) תגובש באופן של: username@server. נא לקרוא בזהירות את ההוראות " "למילוי השדות באופן נכון." #: web/mod_register_web.erl:212 web/mod_register_web.erl:386 @@ -1838,16 +1864,16 @@ msgstr "תווים לא מורשים:" msgid "Server:" msgstr "שרת:" -# אל נא לומר את סיסמתך +# אל נא לומר #: web/mod_register_web.erl:232 msgid "" "Don't tell your password to anybody, not even the administrators of the " "Jabber server." -msgstr "אל תאמר את סיסמתך לאף אחד, אפילו לא למנהלים של שרת Jabber" +msgstr "אל תגלה את הסיסמה שלך לאף אחד, אפילו לא למנהלים של שרת Jabber" #: web/mod_register_web.erl:234 msgid "You can later change your password using a Jabber client." -msgstr "ביכולתך לשנות את סיסמתך מאוחר יותר באמצעות לקוח Jabber." +msgstr "ביכולתך לשנות את הסיסמה שלך מאוחר יותר באמצעות לקוח Jabber." # בוטח # trust that your @@ -1856,8 +1882,8 @@ msgid "" "Some Jabber clients can store your password in your computer. Use that " "feature only if you trust your computer is safe." msgstr "" -"לקוחות Jabber מסוימים יכולים לאחסן את סיסמתך במחשבך. השתמש בתכונה זו רק אם " -"אתה סמוך שמחשבך הינו מוגן." +"לקוחות Jabber מסוימים יכולים לאחסן את הסיסמה שלך על המחשב שלך. השתמש בתכונה " +"זו רק אם אתה סמוך כי המחשב שלך הינו מוגן." # תישכח #: web/mod_register_web.erl:237 @@ -1866,8 +1892,8 @@ msgid "" "Jabber there isn't an automated way to recover your password if you forget " "it." msgstr "" -"שנן את סיסמתך, או רשום אותה בנייר שמור במקום בטוח. אצל Jabber אין דרך " -"אוטומטית לשחזר את סיסמתך במידה וזו תישמט מן זכרונך." +"שנן את הסיסמה שלך, או רשום אותה בנייר שמור במקום בטוח. אצל Jabber אין דרך " +"אוטומטית לשחזר את הסיסמה שלך במידה וזו תישמט מתוך זיכרונך." #: web/mod_register_web.erl:242 web/mod_register_web.erl:406 msgid "Password Verification:" diff --git a/rebar.config.script b/rebar.config.script index f342a6c90..7a5e332c4 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -16,7 +16,7 @@ Cfg = case file:consult("vars.config") of Macros = lists:flatmap( fun({roster_gateway_workaround, true}) -> [{d, 'ROSTER_GATEWAY_WORKAROUND'}]; - ({transient_supervisors, true}) -> + ({transient_supervisors, false}) -> [{d, 'NO_TRANSIENT_SUPERVISORS'}]; ({nif, true}) -> [{d, 'NIF'}]; diff --git a/sql/mssql2000.sql b/sql/mssql2000.sql index 7f3f5c284..d052c6209 100644 --- a/sql/mssql2000.sql +++ b/sql/mssql2000.sql @@ -1,5 +1,5 @@ /*
- * ejabberd, Copyright (C) 2002-2013 ProcessOne
+ * ejabberd, Copyright (C) 2002-2014 ProcessOne
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/sql/mssql2005.sql b/sql/mssql2005.sql index 695b7aa9a..b2f03b258 100644 --- a/sql/mssql2005.sql +++ b/sql/mssql2005.sql @@ -1,5 +1,5 @@ /* - * ejabberd, Copyright (C) 2002-2013 ProcessOne + * ejabberd, Copyright (C) 2002-2014 ProcessOne * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/sql/mssql2012.sql b/sql/mssql2012.sql index 0472f0368..928f92a7b 100644 --- a/sql/mssql2012.sql +++ b/sql/mssql2012.sql @@ -1,5 +1,5 @@ /* - * ejabberd, Copyright (C) 2002-2013 ProcessOne + * ejabberd, Copyright (C) 2002-2014 ProcessOne * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/sql/mysql.sql b/sql/mysql.sql index 04f997a83..7871d4534 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2013 ProcessOne +-- ejabberd, Copyright (C) 2002-2014 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as diff --git a/sql/pg.sql b/sql/pg.sql index a94026d34..aa87678ac 100644 --- a/sql/pg.sql +++ b/sql/pg.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2013 ProcessOne +-- ejabberd, Copyright (C) 2002-2014 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as diff --git a/src/acl.erl b/src/acl.erl index 4ef702568..53256fcbd 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -236,6 +236,8 @@ normalize_spec(Spec) -> {server_regexp, SR} -> {server_regexp, b(SR)}; {server_glob, S} -> {server_glob, b(S)}; {resource_glob, R} -> {resource_glob, b(R)}; + {ip, {Net, Mask}} -> + {ip, {Net, Mask}}; {ip, S} -> case parse_ip_netmask(b(S)) of {ok, Net, Mask} -> @@ -262,9 +264,6 @@ match_rule(Host, Access, JID) -> end, case GAccess ++ LAccess of [] -> - ?WARNING_MSG("Attempt to match against unspecified " - "access rule '~s' (scope: ~s)", - [Access, Host]), deny; AccessList -> Rules = lists:flatmap( diff --git a/src/adhoc.erl b/src/adhoc.erl index ff677f980..800a0a302 100644 --- a/src/adhoc.erl +++ b/src/adhoc.erl @@ -5,7 +5,7 @@ %%% Created : 31 Oct 2005 by Magnus Henoch <henoch@dtek.chalmers.se> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl index 08c8a647f..f404a7afb 100644 --- a/src/cyrsasl.erl +++ b/src/cyrsasl.erl @@ -5,7 +5,7 @@ %%% Created : 8 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl index 156ee348a..67e12b8c6 100644 --- a/src/cyrsasl_anonymous.erl +++ b/src/cyrsasl_anonymous.erl @@ -6,7 +6,7 @@ %%% Created : 23 Aug 2005 by Magnus Henoch <henoch@dtek.chalmers.se> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl index d87d015c6..d6a2afdf1 100644 --- a/src/cyrsasl_digest.erl +++ b/src/cyrsasl_digest.erl @@ -5,7 +5,7 @@ %%% Created : 11 Mar 2003 by Alexey Shchepin <alexey@sevcom.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/cyrsasl_plain.erl b/src/cyrsasl_plain.erl index 971f6c435..4f530e8f5 100644 --- a/src/cyrsasl_plain.erl +++ b/src/cyrsasl_plain.erl @@ -5,7 +5,7 @@ %%% Created : 8 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl index 718336831..1175af1e9 100644 --- a/src/cyrsasl_scram.erl +++ b/src/cyrsasl_scram.erl @@ -5,7 +5,7 @@ %%% Created : 7 Aug 2011 by Stephen Röttger <stephen.roettger@googlemail.com> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd.erl b/src/ejabberd.erl index 52631a624..ebe2b170c 100644 --- a/src/ejabberd.erl +++ b/src/ejabberd.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 0e903b0b4..3174b8523 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -5,7 +5,7 @@ %%% Created : 7 May 2006 by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index 75639b60c..6d315c6d3 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 2905f7e41..bf399af28 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -5,7 +5,7 @@ %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl index 6ef1853c8..c8c9cb153 100644 --- a/src/ejabberd_auth_anonymous.erl +++ b/src/ejabberd_auth_anonymous.erl @@ -5,7 +5,7 @@ %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl index 949cab7c3..ecd8552b1 100644 --- a/src/ejabberd_auth_external.erl +++ b/src/ejabberd_auth_external.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_internal.erl b/src/ejabberd_auth_internal.erl index 23aa68815..48bd6bd96 100644 --- a/src/ejabberd_auth_internal.erl +++ b/src/ejabberd_auth_internal.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl index 2045bce4b..77937d010 100644 --- a/src/ejabberd_auth_ldap.erl +++ b/src/ejabberd_auth_ldap.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index 33e25c164..57cef930a 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_auth_pam.erl b/src/ejabberd_auth_pam.erl index af320544b..9c73d97f8 100644 --- a/src/ejabberd_auth_pam.erl +++ b/src/ejabberd_auth_pam.erl @@ -5,7 +5,7 @@ %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 64676234e..44ad2d56b 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -1216,14 +1216,15 @@ handle_info({send_text, Text}, StateName, StateData) -> send_text(StateData, Text), ejabberd_hooks:run(c2s_loop_debug, [Text]), fsm_next_state(StateName, StateData); -handle_info(replaced, _StateName, StateData) -> +handle_info(replaced, StateName, StateData) -> Lang = StateData#state.lang, - send_element(StateData, - ?SERRT_CONFLICT(Lang, - <<"Replaced by new connection">>)), + Xmlelement = ?SERRT_CONFLICT(Lang, <<"Replaced by new connection">>), + handle_info({kick, replaced, Xmlelement}, StateName, StateData); +handle_info({kick, Reason, Xmlelement}, _StateName, StateData) -> + send_element(StateData, Xmlelement), send_trailer(StateData), {stop, normal, - StateData#state{authenticated = replaced}}; + StateData#state{authenticated = Reason}}; handle_info({route, _From, _To, {broadcast, Data}}, StateName, StateData) -> ?DEBUG("broadcast~n~p~n", [Data]), diff --git a/src/ejabberd_c2s_config.erl b/src/ejabberd_c2s_config.erl index d77aee8a0..3c65d562b 100644 --- a/src/ejabberd_c2s_config.erl +++ b/src/ejabberd_c2s_config.erl @@ -6,7 +6,7 @@ %%% Created : 2 Nov 2007 by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl index e938c4673..ab91ccb04 100644 --- a/src/ejabberd_captcha.erl +++ b/src/ejabberd_captcha.erl @@ -5,7 +5,7 @@ %%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov@gmail.com> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_commands.erl b/src/ejabberd_commands.erl index 640ac9f4e..8d9ec0cb0 100644 --- a/src/ejabberd_commands.erl +++ b/src/ejabberd_commands.erl @@ -5,7 +5,7 @@ %%% Created : 20 May 2008 by Badlop <badlop@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 55dfd32ce..06db8b569 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -5,7 +5,7 @@ %%% Created : 14 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index e526b298a..d8d067640 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jan 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -564,7 +564,7 @@ format_command_lines(CALD, MaxCmdLen, MaxC, ShCode, dual) -> lists:map( fun({Cmd, Args, CmdArgsL, Desc}) -> DescFmt = prepare_description(MaxCmdLen+4, MaxC, Desc), - [" ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], + [" ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], string:chars($\s, MaxCmdLen - CmdArgsL + 1), DescFmt, "\n"] end, CALD); @@ -573,7 +573,7 @@ format_command_lines(CALD, _MaxCmdLen, MaxC, ShCode, long) -> lists:map( fun({Cmd, Args, _CmdArgsL, Desc}) -> DescFmt = prepare_description(8, MaxC, Desc), - ["\n ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], "\n", " ", + ["\n ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], "\n", " ", DescFmt, "\n"] end, CALD). diff --git a/src/ejabberd_frontend_socket.erl b/src/ejabberd_frontend_socket.erl index b3118224d..d6ef3617d 100644 --- a/src/ejabberd_frontend_socket.erl +++ b/src/ejabberd_frontend_socket.erl @@ -5,7 +5,7 @@ %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_hooks.erl b/src/ejabberd_hooks.erl index fdc543e40..e1f99eb88 100644 --- a/src/ejabberd_hooks.erl +++ b/src/ejabberd_hooks.erl @@ -5,7 +5,7 @@ %%% Created : 8 Aug 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index 1347cc148..c5b5758ae 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -5,7 +5,7 @@ %%% Created : 27 Feb 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -50,7 +50,7 @@ request_auth, request_keepalive, request_content_length, - request_lang = "en", + request_lang = <<"en">>, %% XXX bard: request handlers are configured in %% ejabberd.cfg under the HTTP service. For example, %% to have the module test_web handle requests with diff --git a/src/ejabberd_http_poll.erl b/src/ejabberd_http_poll.erl index 62c59a8e6..9e65045cc 100644 --- a/src/ejabberd_http_poll.erl +++ b/src/ejabberd_http_poll.erl @@ -5,7 +5,7 @@ %%% Created : 4 Mar 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index ab74f7dca..2051afdb2 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -284,9 +284,10 @@ accept(ListenSocket, Module, Opts) -> case gen_tcp:accept(ListenSocket) of {ok, Socket} -> case {inet:sockname(Socket), inet:peername(Socket)} of - {{ok, Addr}, {ok, PAddr}} -> - ?INFO_MSG("(~w) Accepted connection ~w -> ~w", - [Socket, PAddr, Addr]); + {{ok, {Addr, Port}}, {ok, {PAddr, PPort}}} -> + ?INFO_MSG("(~w) Accepted connection ~s:~p -> ~s:~p", + [Socket, inet_parse:ntoa(PAddr), PPort, + inet_parse:ntoa(Addr), Port]); _ -> ok end, diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl index c9dc651d2..fd9ef1ca9 100644 --- a/src/ejabberd_local.erl +++ b/src/ejabberd_local.erl @@ -5,7 +5,7 @@ %%% Created : 30 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_node_groups.erl b/src/ejabberd_node_groups.erl index 9a142ddc9..ae1db531f 100644 --- a/src/ejabberd_node_groups.erl +++ b/src/ejabberd_node_groups.erl @@ -5,7 +5,7 @@ %%% Created : 1 Nov 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl index b64ec0450..6a7d9de6d 100644 --- a/src/ejabberd_odbc.erl +++ b/src/ejabberd_odbc.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -483,7 +483,7 @@ abort_on_driver_error(Reply, From) -> %% Open an ODBC database connection odbc_connect(SQLServer) -> ejabberd:start_app(odbc), - odbc:connect(SQLServer, [{scrollable_cursors, off}]). + odbc:connect(binary_to_list(SQLServer), [{scrollable_cursors, off}]). %% == Native PostgreSQL code diff --git a/src/ejabberd_odbc_sup.erl b/src/ejabberd_odbc_sup.erl index b16720daf..bfad5428e 100644 --- a/src/ejabberd_odbc_sup.erl +++ b/src/ejabberd_odbc_sup.erl @@ -5,7 +5,7 @@ %%% Created : 22 Dec 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl index d7fc03736..d4a06de9c 100644 --- a/src/ejabberd_piefxis.erl +++ b/src/ejabberd_piefxis.erl @@ -9,7 +9,7 @@ %%% @doc %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_rdbms.erl b/src/ejabberd_rdbms.erl index 5b7eccc1d..7c2b5e9ce 100644 --- a/src/ejabberd_rdbms.erl +++ b/src/ejabberd_rdbms.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index 3d75be3a3..86cd3e8f9 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -5,7 +5,7 @@ %%% Created : 10 Nov 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_regexp.erl b/src/ejabberd_regexp.erl index 91e1dac12..dff8bee1b 100644 --- a/src/ejabberd_regexp.erl +++ b/src/ejabberd_regexp.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2011 by Badlop %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl index e1057ea13..caf444fba 100644 --- a/src/ejabberd_router.erl +++ b/src/ejabberd_router.erl @@ -5,7 +5,7 @@ %%% Created : 27 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index 4dfccae40..057c60a98 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -5,7 +5,7 @@ %%% Created : 7 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 8e6099dca..0759ef5b9 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -87,7 +87,7 @@ -define(SUPERVISOR_START, p1_fsm:start(ejabberd_s2s_in, [SockData, Opts], - ?FSMOPTS ++ fsm_limit_opts(Opts)). + ?FSMOPTS ++ fsm_limit_opts(Opts))). -else. diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 000cd051c..8e4454d0b 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index 818639d33..04b29d380 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index c30599939..1db93f6ca 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -5,7 +5,7 @@ %%% Created : 24 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -799,7 +799,7 @@ commands() -> tags = [session], desc = "List user's connected resources", module = ?MODULE, function = user_resources, - args = [{user, string}, {host, string}], + args = [{user, binary}, {host, binary}], result = {resources, {list, {resource, string}}}}]. -spec connected_users() -> [binary()]. diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl index b5ed21d3d..165c53f23 100644 --- a/src/ejabberd_socket.erl +++ b/src/ejabberd_socket.erl @@ -5,7 +5,7 @@ %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index 8f35f3ac7..c89a068b7 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl index 6aaf6736b..011c02c40 100644 --- a/src/ejabberd_system_monitor.erl +++ b/src/ejabberd_system_monitor.erl @@ -5,7 +5,7 @@ %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_tmp_sup.erl b/src/ejabberd_tmp_sup.erl index fbd412214..9bc2046a9 100644 --- a/src/ejabberd_tmp_sup.erl +++ b/src/ejabberd_tmp_sup.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jul 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_update.erl b/src/ejabberd_update.erl index b07955503..17db47fb1 100644 --- a/src/ejabberd_update.erl +++ b/src/ejabberd_update.erl @@ -5,7 +5,7 @@ %%% Created : 27 Jan 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl index b0b109a1b..43119fead 100644 --- a/src/ejabberd_web.erl +++ b/src/ejabberd_web.erl @@ -6,7 +6,7 @@ %%% Created : 28 Feb 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 8b80a071c..56172fa16 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -5,7 +5,7 @@ %%% Created : 9 Apr 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -340,7 +340,7 @@ make_xhtml(Els, Host, Node, Lang, JID) -> ?XAE(<<"div">>, [{<<"id">>, <<"copyrightouter">>}], [?XAE(<<"div">>, [{<<"id">>, <<"copyright">>}], [?XC(<<"p">>, - <<"ejabberd (c) 2002-2013 ProcessOne">>)])])])]}}. + <<"ejabberd (c) 2002-2014 ProcessOne">>)])])])]}}. get_base_path(global, cluster) -> <<"/admin/">>; get_base_path(Host, cluster) -> @@ -1137,7 +1137,7 @@ string_to_spec2(ACLName, Val) -> jlib:string_to_jid(Val), case U of <<"">> -> {ACLName, S}; - _ -> {ACLName, U, S} + _ -> {ACLName, {U, S}} end. acl_parse_delete(ACLs, Query) -> @@ -1569,9 +1569,7 @@ user_info(User, Server, Query, Lang) -> end, lists:sort(Resources))))] end, - Password = ejabberd_auth:get_password_s(User, Server), - FPassword = [?INPUT(<<"password">>, <<"password">>, - Password), + FPassword = [?INPUT(<<"text">>, <<"password">>, <<"">>), ?C(<<" ">>), ?INPUTT(<<"submit">>, <<"chpassword">>, <<"Change Password">>)], @@ -2184,7 +2182,7 @@ get_node(global, Node, [<<"update">>], Query, Lang) -> ?XCT(<<"h3">>, <<"Update script">>), FmtScript, ?XCT(<<"h3">>, <<"Low level update script">>), FmtLowLevelScript, ?XCT(<<"h3">>, <<"Script check">>), - ?XC(<<"pre">>, (iolist_to_binary(Check))), + ?XC(<<"pre">>, (jlib:atom_to_binary(Check))), ?BR, ?INPUTT(<<"submit">>, <<"update">>, <<"Update">>)])]; get_node(Host, Node, NPath, Query, Lang) -> diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl index acda0c7f9..76610af8e 100644 --- a/src/ejabberd_xmlrpc.erl +++ b/src/ejabberd_xmlrpc.erl @@ -345,14 +345,18 @@ build_fault_response(Code, ParseString, ParseArgs) -> do_command(AccessCommands, Auth, Command, AttrL, ArgsF, ResultF) -> ArgsFormatted = format_args(AttrL, ArgsF), - {UserT, ServerT, PasswordT} = Auth, - AuthBin = {list_to_binary(UserT), list_to_binary(ServerT), list_to_binary(PasswordT)}, + AuthBin = convert_auth(Auth), Result = ejabberd_commands:execute_command(AccessCommands, AuthBin, Command, ArgsFormatted), ResultFormatted = format_result(Result, ResultF), {command_result, ResultFormatted}. +convert_auth(noauth) -> + noauth; +convert_auth({UserT, ServerT, PasswordT}) -> + {list_to_binary(UserT), list_to_binary(ServerT), list_to_binary(PasswordT)}. + %%----------------------------- %% Format arguments %%----------------------------- diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl index bc7ede491..892b8df62 100644 --- a/src/ejd2odbc.erl +++ b/src/ejd2odbc.erl @@ -5,7 +5,7 @@ %%% Created : 22 Aug 2005 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/eldap_filter.erl b/src/eldap_filter.erl index 1c253c713..fc2a31219 100644 --- a/src/eldap_filter.erl +++ b/src/eldap_filter.erl @@ -6,7 +6,7 @@ %%% Author: Evgeniy Khramtsov <ekhramtsov@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/eldap_pool.erl b/src/eldap_pool.erl index fe59c8d8e..87bb3182f 100644 --- a/src/eldap_pool.erl +++ b/src/eldap_pool.erl @@ -5,7 +5,7 @@ %%% Created : 12 Nov 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/eldap_utils.erl b/src/eldap_utils.erl index 6083563e2..a87023437 100644 --- a/src/eldap_utils.erl +++ b/src/eldap_utils.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/extauth.erl b/src/extauth.erl index b41067c22..51b4611be 100644 --- a/src/extauth.erl +++ b/src/extauth.erl @@ -5,7 +5,7 @@ %%% Created : 30 Jul 2004 by Leif Johansson <leifj@it.su.se> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl index 906de114b..d8dffa0e9 100644 --- a/src/gen_iq_handler.erl +++ b/src/gen_iq_handler.erl @@ -5,7 +5,7 @@ %%% Created : 22 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/gen_mod.erl b/src/gen_mod.erl index 33a014107..261e6c6dd 100644 --- a/src/gen_mod.erl +++ b/src/gen_mod.erl @@ -6,7 +6,7 @@ %%% Created : 24 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl index 0cf1fd2ff..a1252f9f8 100644 --- a/src/gen_pubsub_node.erl +++ b/src/gen_pubsub_node.erl @@ -11,12 +11,12 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl index 8acba659c..e343f4581 100644 --- a/src/gen_pubsub_nodetree.erl +++ b/src/gen_pubsub_nodetree.erl @@ -11,12 +11,12 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/idna.erl b/src/idna.erl index 8b19f1606..ec62d4c7a 100644 --- a/src/idna.erl +++ b/src/idna.erl @@ -5,7 +5,7 @@ %%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl index c904cce7f..1a75b1739 100644 --- a/src/jd2ejd.erl +++ b/src/jd2ejd.erl @@ -5,7 +5,7 @@ %%% Created : 2 Feb 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/jlib.erl b/src/jlib.erl index daaacdf78..0ff210652 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -5,7 +5,7 @@ %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl index 03db638da..47ce625b3 100644 --- a/src/mod_adhoc.erl +++ b/src/mod_adhoc.erl @@ -5,7 +5,7 @@ %%% Created : 15 Nov 2005 by Magnus Henoch <henoch@dtek.chalmers.se> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_announce.erl b/src/mod_announce.erl index 0cbe328c2..fba6d3b81 100644 --- a/src/mod_announce.erl +++ b/src/mod_announce.erl @@ -5,7 +5,7 @@ %%% Created : 11 Aug 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl index e8ca99d82..797b7573b 100644 --- a/src/mod_blocking.erl +++ b/src/mod_blocking.erl @@ -5,7 +5,7 @@ %%% Created : 24 Aug 2008 by Stephan Maka <stephan@spaceboyz.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_caps.erl b/src/mod_caps.erl index e221cd14d..5f529bd28 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -5,7 +5,7 @@ %%% Created : 7 Oct 2006 by Magnus Henoch <henoch@dtek.chalmers.se> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index ed7c0531f..69362bd77 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -7,7 +7,7 @@ %%% {mod_carboncopy, []} %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -150,7 +150,19 @@ check_and_forward(JID, #xmlel{name = <<"message">>, attrs = Attrs} = Packet, Dir false -> case xml:get_subtag(Packet,<<"received">>) of false -> - send_copies(JID, Packet, Direction); + %% We must check if a packet contains "<sent><forwarded></sent></forwarded>" tags in order to avoid + %% receiving message back to original sender. + SubTag = xml:get_subtag(Packet,<<"sent">>), + if SubTag == false -> + send_copies(JID, Packet, Direction); + true -> + case xml:get_subtag(SubTag,<<"forwarded">>) of + false-> + send_copies(JID, Packet, Direction); + _ -> + stop + end + end; _ -> %% stop the hook chain, we don't want mod_logdb to register this message (duplicate) stop diff --git a/src/mod_configure.erl b/src/mod_configure.erl index 52f7b4763..fab594ca1 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -5,7 +5,7 @@ %%% Created : 19 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -1845,13 +1845,14 @@ set_form(From, Host, ?NS_ADMINL(<<"delete-user">>), || {User, Server} <- ASL2], {result, []}; set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>), - _Lang, XData) -> + Lang, XData) -> AccountString = get_value(<<"accountjid">>, XData), JID = jlib:string_to_jid(AccountString), LUser = JID#jid.luser, LServer = JID#jid.lserver, true = LServer == Host orelse get_permission_level(From) == global, + Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>), case JID#jid.lresource of <<>> -> SIDs = mnesia:dirty_select(session, @@ -1859,14 +1860,14 @@ set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>), usr = {LUser, LServer, '_'}, _ = '_'}, [], ['$1']}]), - [Pid ! replaced || {_, Pid} <- SIDs]; + [Pid ! {kick, kicked_by_admin, Xmlelement} || {_, Pid} <- SIDs]; R -> [{_, Pid}] = mnesia:dirty_select(session, [{#session{sid = '$1', usr = {LUser, LServer, R}, _ = '_'}, [], ['$1']}]), - Pid ! replaced + Pid ! {kick, kicked_by_admin, Xmlelement} end, {result, []}; set_form(From, Host, diff --git a/src/mod_configure2.erl b/src/mod_configure2.erl index 6756c2f37..0d7d727f2 100644 --- a/src/mod_configure2.erl +++ b/src/mod_configure2.erl @@ -5,7 +5,7 @@ %%% Created : 26 Oct 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_disco.erl b/src/mod_disco.erl index 873e095e5..1f0afc3dd 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -5,7 +5,7 @@ %%% Created : 1 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -487,10 +487,10 @@ get_fields_xml(Host, Module) -> lists:map( fun(Opts) -> Mods = proplists:get_value(modules, Opts, all), - Name = proplists:get_value(names, Opts, <<>>), + Name = proplists:get_value(name, Opts, <<>>), URLs = proplists:get_value(urls, Opts, []), {Mods, Name, URLs} - end, lists:flatten(L)) + end, L) end, []), Fields_good = lists:filter(fun ({Modules, _, _}) -> case Modules of diff --git a/src/mod_echo.erl b/src/mod_echo.erl index 87f2f2671..db8771084 100644 --- a/src/mod_echo.erl +++ b/src/mod_echo.erl @@ -5,7 +5,7 @@ %%% Created : 15 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_http_bind.erl b/src/mod_http_bind.erl index 2d4e1f1d5..2dcac1419 100644 --- a/src/mod_http_bind.erl +++ b/src/mod_http_bind.erl @@ -5,7 +5,7 @@ %%% Created : Tue Feb 20 13:15:52 CET 2007 %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_http_fileserver.erl b/src/mod_http_fileserver.erl index 5ae125e1a..8807f24bf 100644 --- a/src/mod_http_fileserver.erl +++ b/src/mod_http_fileserver.erl @@ -5,7 +5,7 @@ %%% Created : %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_ip_blacklist.erl b/src/mod_ip_blacklist.erl index a6d4698ec..f0feb6551 100644 --- a/src/mod_ip_blacklist.erl +++ b/src/mod_ip_blacklist.erl @@ -7,7 +7,7 @@ %%% {mod_ip_blacklist, []} %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_irc.erl b/src/mod_irc.erl index 4ad632631..88e0f1dce 100644 --- a/src/mod_irc.erl +++ b/src/mod_irc.erl @@ -5,7 +5,7 @@ %%% Created : 15 Feb 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -465,7 +465,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd IRC module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. command_items(ServerHost, Host, Lang) -> lists:map(fun ({Node, Name, _Function}) -> diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl index 569e8beff..f150d9f53 100644 --- a/src/mod_irc_connection.erl +++ b/src/mod_irc_connection.erl @@ -5,7 +5,7 @@ %%% Created : 15 Feb 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_last.erl b/src/mod_last.erl index c170026f0..6b7a06bed 100644 --- a/src/mod_last.erl +++ b/src/mod_last.erl @@ -5,7 +5,7 @@ %%% Created : 24 Oct 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_muc.erl b/src/mod_muc.erl index 34f174bed..160b9009d 100644 --- a/src/mod_muc.erl +++ b/src/mod_muc.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -1019,7 +1019,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd MUC module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. broadcast_service_message(Host, Msg) -> diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl index cc95ecef0..e8724483e 100644 --- a/src/mod_muc_log.erl +++ b/src/mod_muc_log.erl @@ -5,7 +5,7 @@ %%% Created : 12 Mar 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index e30511891..461ab1da2 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_offline.erl b/src/mod_offline.erl index d316d3b7c..77d333bd7 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -5,7 +5,7 @@ %%% Created : 5 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_ping.erl b/src/mod_ping.erl index a4fc74499..15bfd08de 100644 --- a/src/mod_ping.erl +++ b/src/mod_ping.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jul 2009 by Brian Cully <bjc@kublai.com> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl index 0161e701a..d40d54596 100644 --- a/src/mod_pres_counter.erl +++ b/src/mod_pres_counter.erl @@ -5,7 +5,7 @@ %%% Created : 23 Sep 2010 by Ahmed Omar %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl index 4de601670..6b852bb47 100644 --- a/src/mod_privacy.erl +++ b/src/mod_privacy.erl @@ -5,7 +5,7 @@ %%% Created : 21 Jul 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_private.erl b/src/mod_private.erl index b21427e21..9fa74d9b7 100644 --- a/src/mod_private.erl +++ b/src/mod_private.erl @@ -5,7 +5,7 @@ %%% Created : 16 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_proxy65.erl b/src/mod_proxy65.erl index e4b4666a4..17da3660b 100644 --- a/src/mod_proxy65.erl +++ b/src/mod_proxy65.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_proxy65_lib.erl b/src/mod_proxy65_lib.erl index e85cabc98..e43ceb7e8 100644 --- a/src/mod_proxy65_lib.erl +++ b/src/mod_proxy65_lib.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl index a44e6ddb2..9f66cf7d2 100644 --- a/src/mod_proxy65_service.erl +++ b/src/mod_proxy65_service.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -247,7 +247,7 @@ iq_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd SOCKS5 Bytestreams module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. parse_options(ServerHost, Opts) -> MyHost = gen_mod:get_opt_host(ServerHost, Opts, diff --git a/src/mod_proxy65_sm.erl b/src/mod_proxy65_sm.erl index 7b15a6609..fc8cd3649 100644 --- a/src/mod_proxy65_sm.erl +++ b/src/mod_proxy65_sm.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_proxy65_stream.erl b/src/mod_proxy65_stream.erl index e088b935a..958aeaa1f 100644 --- a/src/mod_proxy65_stream.erl +++ b/src/mod_proxy65_stream.erl @@ -4,7 +4,7 @@ %%% Purpose : Bytestream process. %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 9bb5acfa4..87d49cb54 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} @@ -1910,7 +1910,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>))/binary, - "\nCopyright (c) 2004-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2004-2014 ProcessOne">>}]}]. -spec(iq_pubsub/6 :: ( diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl index 1a182e4d6..3d26ad0fa 100644 --- a/src/mod_pubsub_odbc.erl +++ b/src/mod_pubsub_odbc.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} @@ -1569,7 +1569,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>))/binary, - "\nCopyright (c) 2004-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2004-2014 ProcessOne">>}]}]. -spec(iq_pubsub/6 :: ( diff --git a/src/mod_register.erl b/src/mod_register.erl index 4ac18957e..21e088b5a 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl index 48be33934..0da53b26d 100644 --- a/src/mod_register_web.erl +++ b/src/mod_register_web.erl @@ -5,7 +5,7 @@ %%% Created : 4 May 2008 by Badlop <badlop@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -484,9 +484,15 @@ form_del_get(Host, Lang) -> %% {error, not_allowed} | %% {error, invalid_jid} register_account(Username, Host, Password) -> - case jlib:make_jid(Username, Host, <<"">>) of - error -> {error, invalid_jid}; - _ -> register_account2(Username, Host, Password) + Access = gen_mod:get_module_opt(Host, mod_register, access, + fun(A) when is_atom(A) -> A end, + all), + JID = jlib:make_jid(Username, Host, <<"">>), + Match = acl:match_rule(Host, Access, JID), + case {JID, Match} of + {error, _} -> {error, invalid_jid}; + {_, deny} -> {error, not_allowed}; + {_, allow} -> register_account2(Username, Host, Password) end. register_account2(Username, Host, Password) -> diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 04b4a236f..4ab8239b5 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -5,7 +5,7 @@ %%% Created : 11 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -129,6 +129,9 @@ stop(Host) -> gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_ROSTER). +process_iq(From, To, IQ) when ((From#jid.luser == <<"">>) andalso (From#jid.resource == <<"">>)) -> + process_iq_manager(From, To, IQ); + process_iq(From, To, IQ) -> #iq{sub_el = SubEl} = IQ, #jid{lserver = LServer} = From, @@ -464,15 +467,16 @@ try_process_iq_set(From, To, #iq{sub_el = SubEl} = IQ) -> process_iq_set(From, To, IQ) end. -process_iq_set(From, To, #iq{sub_el = SubEl} = IQ) -> +process_iq_set(From, To, #iq{sub_el = SubEl, id = Id} = IQ) -> #xmlel{children = Els} = SubEl, - lists:foreach(fun (El) -> process_item_set(From, To, El) + Managed = is_managed_from_id(Id), + lists:foreach(fun (El) -> process_item_set(From, To, El, Managed) end, Els), IQ#iq{type = result, sub_el = []}. process_item_set(From, To, - #xmlel{attrs = Attrs, children = Els}) -> + #xmlel{attrs = Attrs, children = Els}, Managed) -> JID1 = jlib:string_to_jid(xml:get_attr_s(<<"jid">>, Attrs)), #jid{user = User, luser = LUser, lserver = LServer} = @@ -483,12 +487,13 @@ process_item_set(From, To, LJID = jlib:jid_tolower(JID1), F = fun () -> Item = get_roster_by_jid_t(LUser, LServer, LJID), - Item1 = process_item_attrs(Item, Attrs), + Item1 = process_item_attrs_managed(Item, Attrs, Managed), Item2 = process_item_els(Item1, Els), case Item2#roster.subscription of remove -> del_roster_t(LUser, LServer, LJID); _ -> update_roster_t(LUser, LServer, LJID, Item2) end, + send_itemset_to_managers(From, Item2, Managed), Item3 = ejabberd_hooks:run_fold(roster_process_item, LServer, Item2, [LServer]), @@ -510,7 +515,7 @@ process_item_set(From, To, ?DEBUG("ROSTER: roster item set error: ~p~n", [E]), ok end end; -process_item_set(_From, _To, _) -> ok. +process_item_set(_From, _To, _, _Managed) -> ok. process_item_attrs(Item, [{Attr, Val} | Attrs]) -> case Attr of @@ -1553,6 +1558,91 @@ webadmin_user(Acc, _User, _Server, Lang) -> Acc ++ [?XE(<<"h3">>, [?ACT(<<"roster/">>, <<"Roster">>)])]. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%% Implement XEP-0321 Remote Roster Management + +process_iq_manager(From, To, IQ) -> + %% Check what access is allowed for From to To + MatchDomain = From#jid.lserver, + case is_domain_managed(MatchDomain, To#jid.lserver) of + true -> + process_iq_manager2(MatchDomain, To, IQ); + false -> + #iq{sub_el = SubEl} = IQ, + IQ#iq{type = error, sub_el = [SubEl, ?ERR_BAD_REQUEST]} + end. + +process_iq_manager2(MatchDomain, To, IQ) -> + %% If IQ is SET, filter the input IQ + IQFiltered = maybe_filter_request(MatchDomain, IQ), + %% Call the standard function with reversed JIDs + IdInitial = IQFiltered#iq.id, + ResIQ = process_iq(To, To, IQFiltered#iq{id = <<"roster-remotely-managed">>}), + %% Filter the output IQ + filter_stanza(MatchDomain, ResIQ#iq{id = IdInitial}). + +is_domain_managed(ContactHost, UserHost) -> + Managers = gen_mod:get_module_opt(UserHost, ?MODULE, managers, + fun(B) when is_list(B) -> B end, + []), + lists:member(ContactHost, Managers). + +maybe_filter_request(MatchDomain, IQ) when IQ#iq.type == set -> + filter_stanza(MatchDomain, IQ); +maybe_filter_request(_MatchDomain, IQ) -> + IQ. + +filter_stanza(_MatchDomain, #iq{sub_el = []} = IQ) -> + IQ; +filter_stanza(MatchDomain, #iq{sub_el = [SubEl | _]} = IQ) -> + #iq{sub_el = SubElFiltered} = IQRes = + filter_stanza(MatchDomain, IQ#iq{sub_el = SubEl}), + IQRes#iq{sub_el = [SubElFiltered]}; +filter_stanza(MatchDomain, #iq{sub_el = SubEl} = IQ) -> + #xmlel{name = Type, attrs = Attrs, children = Items} = SubEl, + ItemsFiltered = lists:filter( + fun(Item) -> + is_item_of_domain(MatchDomain, Item) end, Items), + SubElFiltered = #xmlel{name=Type, attrs = Attrs, children = ItemsFiltered}, + IQ#iq{sub_el = SubElFiltered}. + +is_item_of_domain(MatchDomain, #xmlel{} = El) -> + lists:any(fun(Attr) -> is_jid_of_domain(MatchDomain, Attr) end, El#xmlel.attrs); +is_item_of_domain(_MatchDomain, {xmlcdata, _}) -> + false. + +is_jid_of_domain(MatchDomain, {<<"jid">>, JIDString}) -> + case jlib:string_to_jid(JIDString) of + JID when JID#jid.lserver == MatchDomain -> true; + _ -> false + end; +is_jid_of_domain(_, _) -> + false. + +process_item_attrs_managed(Item, Attrs, true) -> + process_item_attrs_ws(Item, Attrs); +process_item_attrs_managed(Item, _Attrs, false) -> + process_item_attrs(Item, _Attrs). + +send_itemset_to_managers(_From, _Item, true) -> + ok; +send_itemset_to_managers(From, Item, false) -> + {_, UserHost} = Item#roster.us, + {_ContactUser, ContactHost, _ContactResource} = Item#roster.jid, + %% Check if the component is an allowed manager + IsManager = is_domain_managed(ContactHost, UserHost), + case IsManager of + true -> push_item(<<"">>, ContactHost, <<"">>, From, Item); + false -> ok + end. + +is_managed_from_id(<<"roster-remotely-managed">>) -> + true; +is_managed_from_id(_Id) -> + false. + + export(_Server) -> [{roster, fun(Host, #roster{usj = {LUser, LServer, LJID}} = R) diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl index 97d5e954d..dd4800baa 100644 --- a/src/mod_service_log.erl +++ b/src/mod_service_log.erl @@ -5,7 +5,7 @@ %%% Created : 24 Aug 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 850be38f2..e572a3a4d 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -5,7 +5,7 @@ %%% Created : 5 Mar 2005 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl index 63ae55899..6bf7c9f7d 100644 --- a/src/mod_shared_roster_ldap.erl +++ b/src/mod_shared_roster_ldap.erl @@ -7,7 +7,7 @@ %%% Created : 5 Mar 2005 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_sic.erl b/src/mod_sic.erl index 326a95962..46dfbebc1 100644 --- a/src/mod_sic.erl +++ b/src/mod_sic.erl @@ -5,7 +5,7 @@ %%% Created : 6 Mar 2010 by Karim Gemayel <karim.gemayel@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_stats.erl b/src/mod_stats.erl index 1da857cf0..15caa31ca 100644 --- a/src/mod_stats.erl +++ b/src/mod_stats.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_time.erl b/src/mod_time.erl index db6c26e67..119661c33 100644 --- a/src/mod_time.erl +++ b/src/mod_time.erl @@ -6,7 +6,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 730ed9aa2..c98750ed0 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -5,7 +5,7 @@ %%% Created : 2 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -162,7 +162,7 @@ process_local_iq(_From, _To, [{xmlcdata, <<(translate:translate(Lang, <<"Erlang Jabber Server">>))/binary, - "\nCopyright (c) 2002-2013 ProcessOne">>}]}, + "\nCopyright (c) 2002-2014 ProcessOne">>}]}, #xmlel{name = <<"BDAY">>, attrs = [], children = [{xmlcdata, <<"2002-11-16">>}]}]}]} @@ -532,7 +532,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd vCard module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. find_xdata_el(#xmlel{children = SubEls}) -> find_xdata_el1(SubEls). diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index 2a426f8cd..96ba25ac9 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -5,7 +5,7 @@ %%% Created : 2 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -220,7 +220,7 @@ process_local_iq(_From, _To, [{xmlcdata, <<(translate:translate(Lang, <<"Erlang Jabber Server">>))/binary, - "\nCopyright (c) 2002-2013 ProcessOne">>}]}, + "\nCopyright (c) 2002-2014 ProcessOne">>}]}, #xmlel{name = <<"BDAY">>, attrs = [], children = [{xmlcdata, <<"2002-11-16">>}]}]}]} @@ -581,7 +581,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd vCard module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. -define(LFIELD(Label, Var), #xmlel{name = <<"field">>, diff --git a/src/mod_version.erl b/src/mod_version.erl index a16e86e40..1aa026c51 100644 --- a/src/mod_version.erl +++ b/src/mod_version.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/node.template b/src/node.template index b31d8a8e2..45744c059 100644 --- a/src/node.template +++ b/src/node.template @@ -11,11 +11,11 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_buddy.erl b/src/node_buddy.erl index 23269b1eb..6db076935 100644 --- a/src/node_buddy.erl +++ b/src/node_buddy.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_club.erl b/src/node_club.erl index 10849b36d..5e6581ad8 100644 --- a/src/node_club.erl +++ b/src/node_club.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl index 9b72af7e7..81fe20d2b 100644 --- a/src/node_dispatch.erl +++ b/src/node_dispatch.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_flat.erl b/src/node_flat.erl index 836858520..e28fd3477 100644 --- a/src/node_flat.erl +++ b/src/node_flat.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_flat_odbc.erl b/src/node_flat_odbc.erl index 5736832ea..d299c8d52 100644 --- a/src/node_flat_odbc.erl +++ b/src/node_flat_odbc.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_hometree.erl b/src/node_hometree.erl index ff291635f..f59d8d9c0 100644 --- a/src/node_hometree.erl +++ b/src/node_hometree.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_hometree_odbc.erl b/src/node_hometree_odbc.erl index a98e56dcf..dfb9886f2 100644 --- a/src/node_hometree_odbc.erl +++ b/src/node_hometree_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_mb.erl b/src/node_mb.erl index c626b7a93..6587b5c07 100644 --- a/src/node_mb.erl +++ b/src/node_mb.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Eric Cestari <eric@ohmforce.com> %%% @version {@vsn}, {@date} {@time} %%% @end diff --git a/src/node_pep.erl b/src/node_pep.erl index 5635dee94..47afee945 100644 --- a/src/node_pep.erl +++ b/src/node_pep.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_pep_odbc.erl b/src/node_pep_odbc.erl index e4e1fafa9..4c7d8909b 100644 --- a/src/node_pep_odbc.erl +++ b/src/node_pep_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_private.erl b/src/node_private.erl index 27b7158a1..61f6d6a68 100644 --- a/src/node_private.erl +++ b/src/node_private.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_public.erl b/src/node_public.erl index 3c391cfe8..bcabec6eb 100644 --- a/src/node_public.erl +++ b/src/node_public.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl index 23159d7a2..1dc7fa9fb 100644 --- a/src/nodetree_tree.erl +++ b/src/nodetree_tree.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_tree_odbc.erl b/src/nodetree_tree_odbc.erl index 1cc45cfb5..1a5a4317f 100644 --- a/src/nodetree_tree_odbc.erl +++ b/src/nodetree_tree_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl index 1486fbc05..9e2e31f9f 100644 --- a/src/nodetree_virtual.erl +++ b/src/nodetree_virtual.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/odbc_queries.erl b/src/odbc_queries.erl index 29442b472..e0637f840 100644 --- a/src/odbc_queries.erl +++ b/src/odbc_queries.erl @@ -5,7 +5,7 @@ %%% Created : by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/p1_fsm.erl b/src/p1_fsm.erl index 70773e9b8..80f08c609 100644 --- a/src/p1_fsm.erl +++ b/src/p1_fsm.erl @@ -14,7 +14,7 @@ %% AB. All Rights Reserved.'' %% %% The code has been modified and improved by ProcessOne. -%% Copyright 2007-2013, ProcessOne +%% Copyright 2007-2014, ProcessOne %% %% The change adds the following features: %% - You can send exit(priority_shutdown) to the p1_fsm process to diff --git a/src/p1_mnesia.erl b/src/p1_mnesia.erl index fa308176c..b792472a6 100644 --- a/src/p1_mnesia.erl +++ b/src/p1_mnesia.erl @@ -13,10 +13,10 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' %%% -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. -module(p1_mnesia). diff --git a/src/pubsub_db_odbc.erl b/src/pubsub_db_odbc.erl index ca1318865..320a58c90 100644 --- a/src/pubsub_db_odbc.erl +++ b/src/pubsub_db_odbc.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Pablo Polvorin <pablo.polvorin@process-one.net> %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_index.erl b/src/pubsub_index.erl index 1ff5a1e45..9859141df 100644 --- a/src/pubsub_index.erl +++ b/src/pubsub_index.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain <christophe.romain@process-one.net> %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl index bb09cdd60..64bb8c2da 100644 --- a/src/pubsub_subscription.erl +++ b/src/pubsub_subscription.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Brian Cully <bjc@kublai.com> %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_subscription_odbc.erl b/src/pubsub_subscription_odbc.erl index 55b337c80..f0efcefb5 100644 --- a/src/pubsub_subscription_odbc.erl +++ b/src/pubsub_subscription_odbc.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Pablo Polvorin <pablo.polvorin@process-one.net> %%% @author based on pubsub_subscription.erl by Brian Cully <bjc@kublai.com> diff --git a/src/randoms.erl b/src/randoms.erl index 39c106675..db2d20ccd 100644 --- a/src/randoms.erl +++ b/src/randoms.erl @@ -5,7 +5,7 @@ %%% Created : 13 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/scram.erl b/src/scram.erl index 38992a688..19684cb46 100644 --- a/src/scram.erl +++ b/src/scram.erl @@ -5,7 +5,7 @@ %%% Created : 7 Aug 2011 by Stephen Röttger <stephen.roettger@googlemail.com> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/shaper.erl b/src/shaper.erl index 643fa5b2b..a31ec5560 100644 --- a/src/shaper.erl +++ b/src/shaper.erl @@ -5,7 +5,7 @@ %%% Created : 9 Feb 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -83,8 +83,6 @@ new(Name) -> [#shaper{maxrate = R}] -> R; [] -> - ?WARNING_MSG("Attempt to initialize an " - "unspecified shaper '~s'", [Name]), none end, new1(MaxRate). diff --git a/src/str.erl b/src/str.erl index 1bd9440df..cd0325e84 100644 --- a/src/str.erl +++ b/src/str.erl @@ -5,7 +5,7 @@ %%% Created : 23 Feb 2012 by Evgeniy Khramtsov <ekhramtsov@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/translate.erl b/src/translate.erl index 9abb12f1f..10199f648 100644 --- a/src/translate.erl +++ b/src/translate.erl @@ -5,7 +5,7 @@ %%% Created : 6 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/treap.erl b/src/treap.erl index 50c0b9534..9d1d69fc9 100644 --- a/src/treap.erl +++ b/src/treap.erl @@ -5,7 +5,7 @@ %%% Created : 22 Apr 2008 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/win32_dns.erl b/src/win32_dns.erl index cbcefb280..d3f25648b 100644 --- a/src/win32_dns.erl +++ b/src/win32_dns.erl @@ -5,7 +5,7 @@ %%% Created : 5 Mar 2009 by Geoff Cant %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/tools/configure.erl b/tools/configure.erl index aa7feee31..bc0f87eb7 100644 --- a/tools/configure.erl +++ b/tools/configure.erl @@ -5,7 +5,7 @@ %%% Created : 27 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/tools/ejabberdctl.bc b/tools/ejabberdctl.bc new file mode 100644 index 000000000..72a5356f2 --- /dev/null +++ b/tools/ejabberdctl.bc @@ -0,0 +1,99 @@ +# +# bash completion for ejabberdctl +# +get_help() +{ + local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM + ejabberdctl $CTLARGS help >$COMMANDCACHE + if [[ $? == 2 ]] ; then + ISRUNNING=1 + runningcommands=`cat $COMMANDCACHE | grep "^ [a-z]" | awk '{print $1}' | xargs` + fi + rm $COMMANDCACHE +} + +_ejabberdctl() +{ + local cur prev + local ISRUNNING=0 + local runningcommands + + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + local startcoms="start debug live" + local startpars="--config-dir --config --ctl-config --logs --spool" + + local i=1 + local CTLARGS="" + while [ $i -lt $COMP_CWORD ] ; do + local PARAM="${COMP_WORDS[i]}" + i=$((i+1)) + case $PARAM in + --*) + CTLARGS="--node ${COMP_WORDS[i]}" + i=$((i+1)) ;; + *) break ;; + esac + done + + case "${prev##*/}" in + ejabberdctl) + # This clause matches even when calling `/sbin/ejabberdctl` thanks to the ##*/ in the case + get_help + COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur)) + return 0 + ;; + start|live) + COMPREPLY=($(compgen -W "--node ${startpars}" -- $cur)) + return 0 + ;; + debug) + COMPREPLY=($(compgen -W "--node" -- $cur)) + return 0 + ;; + help) + get_help + COMPREPLY=($(compgen -W "${runningcommands}" -- $cur)) + return 0 + ;; + --node) + RUNNINGNODES=`epmd -names | grep name | awk '{print $2"@localhost"}' | xargs` + COMPREPLY=($(compgen -W "$RUNNINGNODES" -- $cur)) + return 0 + ;; + --config|--ctl-config) + _filedir '?(u)cfg' + return 0 + ;; + --config-dir|--logs|--spool) + _filedir + return 0 + ;; + *) + prev2="${COMP_WORDS[COMP_CWORD-2]}" + get_help + if [[ "$prev2" == --* ]]; then + COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur)) + else + if [[ $ISRUNNING == 1 ]]; then + echo "" + ejabberdctl $CTLARGS help ${PARAM} + echo -n "${COMP_LINE}" + fi + fi + return 0 + ;; + esac +} + +complete -F _ejabberdctl ejabberdctl + +# Local variables: +# mode: shell-script +# sh-basic-offset: 4 +# sh-indent-comment: t +# indent-tabs-mode: nil +# End: +# ex: ts=4 sw=4 et filetype=sh diff --git a/tools/p1_prof.erl b/tools/p1_prof.erl index 44fb9f766..c085f64fc 100644 --- a/tools/p1_prof.erl +++ b/tools/p1_prof.erl @@ -6,7 +6,7 @@ %%% Created : 23 Jan 2010 by Evgeniy Khramtsov <ekhramtsov@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/tools/xmpp_codec.erl b/tools/xmpp_codec.erl index ff73f4259..6cfcc7a22 100644 --- a/tools/xmpp_codec.erl +++ b/tools/xmpp_codec.erl @@ -5,7 +5,7 @@ -compile({nowarn_unused_function, [{dec_int, 3}, {dec_int, 1}, {dec_enum, 2}, - {enc_int, 1}, {enc_enum, 1}]}). + {enc_int, 1}, {get_attr, 2}, {enc_enum, 1}]}). -export([pp/1, format_error/1, decode/1, is_known_tag/1, encode/1]). @@ -1580,12 +1580,12 @@ encode({last, _, _} = Query) -> dec_int(Val) -> dec_int(Val, infinity, infinity). dec_int(Val, Min, Max) -> - case erlang:binary_to_integer(Val) of + case list_to_integer(binary_to_list(Val)) of Int when Int =< Max, Min == infinity -> Int; Int when Int =< Max, Int >= Min -> Int end. -enc_int(Int) -> erlang:integer_to_binary(Int). +enc_int(Int) -> list_to_binary(integer_to_list(Int)). dec_enum(Val, Enums) -> AtomVal = erlang:binary_to_existing_atom(Val, utf8), @@ -1787,8 +1787,8 @@ enc_tzo({H, M}) -> dec_tzo(Val) -> [H1, M1] = str:tokens(Val, <<":">>), - H = erlang:binary_to_integer(H1), - M = erlang:binary_to_integer(M1), + H = jlib:binary_to_integer(H1), + M = jlib:binary_to_integer(M1), if H >= -12, H =< 12, M >= 0, M < 60 -> {H, M} end. decode_muc({xmlel, <<"x">>, _attrs, _els}) -> diff --git a/tools/xmpp_codec.spec b/tools/xmpp_codec.spec index 86cc03088..02e28a1f9 100644 --- a/tools/xmpp_codec.spec +++ b/tools/xmpp_codec.spec @@ -1986,8 +1986,8 @@ dec_tzo(Val) -> [H1, M1] = str:tokens(Val, <<":">>), - H = erlang:binary_to_integer(H1), - M = erlang:binary_to_integer(M1), + H = jlib:binary_to_integer(H1), + M = jlib:binary_to_integer(M1), if H >= -12, H =< 12, M >= 0, M < 60 -> {H, M} end. |