From f6b4fa6b35bb380ad55b1a46f38e04d322bdd6db Mon Sep 17 00:00:00 2001
From: asamoukin <asamoukin@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Thu, 14 May 2009 07:18:45 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20-?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D1=81=20=D1=83=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20jabber=20ID=20(?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20-jid)=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B5=20=D0=B2=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1373 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 ldif/jabber_user.ldif | 2 +-
 pym/cl_fill_server.py | 7 +++++++
 pym/cl_vars_server.py | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ldif/jabber_user.ldif b/ldif/jabber_user.ldif
index 054220d..17ae101 100644
--- a/ldif/jabber_user.ldif
+++ b/ldif/jabber_user.ldif
@@ -2,7 +2,7 @@
 dn: uid=#-ur_name-#,ou=Users,#-ld_jabber_dn-#
 objectClass: inetOrgPerson
 uid: #-ur_name-#
-cn: #-ur_name-#
+cn: #-sr_jabber_user_name-#
 sn: #-ur_fio-#
 mail: #-sr_jabber_user_id-#
 initials: Yes
diff --git a/pym/cl_fill_server.py b/pym/cl_fill_server.py
index b8f7250..bbfc1d3 100644
--- a/pym/cl_fill_server.py
+++ b/pym/cl_fill_server.py
@@ -509,3 +509,10 @@ class fillVars(object, cl_base.glob_attr):
         if jabberHosts:
             return ", ".join(map(lambda x: '"'+x+'"', jabberHosts.split(",")))
         return ""
+
+    def get_sr_jabber_user_name(self):
+        """Имя jabber пользователя (левая часть jabber id)"""
+        userJid = self.Get("sr_jabber_user_id")
+        if userJid:
+            return userJid.partition('@')[0]
+        return ""
diff --git a/pym/cl_vars_server.py b/pym/cl_vars_server.py
index 13dc82e..c65c399 100644
--- a/pym/cl_vars_server.py
+++ b/pym/cl_vars_server.py
@@ -154,6 +154,9 @@ class Data:
     # jabber id пользователя
     sr_jabber_user_id = {'mode':"w"}
 
+    # имя jabber пользователя (левая часть jabber id)
+    sr_jabber_user_name = {'mode':"w"}
+
     # шифрование при получении - ''/ssl
     sr_jabber_crypt = {'mode':"w",'value':'ssl'}