modified settings lang

api/server/cl_server.py

@@ -76,17 +76,17 @@ class OpenSSLAdapter (pyOpenSSLAdapter):
         if errdepth == 0:
             curThread.client_cert = OpenSSL.crypto.dump_certificate \
                                         (OpenSSL.crypto.FILETYPE_PEM, x509)
-            cert = OpenSSL.crypto.load_certificate(OpenSSL.SSL.FILETYPE_PEM,
-                                                curThread.client_cert)
-            subject = cert.get_subject()
+            #cert = OpenSSL.crypto.load_certificate(OpenSSL.SSL.FILETYPE_PEM,
+                                                #curThread.client_cert)
+            #subject = cert.get_subject()
             
-            if ok:
-                try:
-                    country = len (subject.get_components()) - 1
-                    language = 1
-                    curThread.lang = subject.get_components()[country][language]
-                except:
-                    curThread.lang = "En"
+            #if ok:
+                #try:
+                    #country = len (subject.get_components()) - 1
+                    #language = 1
+                    #curThread.lang = subject.get_components()[country][language]
+                #except:
+                    #curThread.lang = "En"
         else:
             curThread.client_cert = None
         return ok

api/server/func.py

@@ -486,10 +486,10 @@ class ApiWsdl () :
                 fd.close()
                 lang = list_sid[3]
         fd.close()
-        if lang and not lang.lower() in ['ru', 'en', 'de', 'fr', ""]:
+        if lang and not lang.lower() in ['ru', 'en']:
             lang = "en"
-        elif lang == "":
-            lang = threading.currentThread().lang
+        #elif lang == "":
+            #lang = threading.currentThread().lang
         import locale
         try:
             lang = locale.locale_alias[lang.lower()]

api/server/gen_sid.py

@@ -103,6 +103,21 @@ class ApiWsdl () :
         fd.close()
         return 0
 
+    def set_sid_lang(self, sid, lang):
+        SIDS_DIR = self.sids
+        sid_file = SIDS_DIR+"/%d.sid" %sid
+        if not os.path.isfile(sid_file):
+            print 'sid file not found'
+            return 1
+        fd = open(sid_file, 'r')
+        list_sid = pickle.load(fd)
+        fd.close()
+
+        fp = open(sid_file, 'w')
+        list_sid[3] = lang
+        pickle.dump(list_sid,fp)
+        fp.close()
+
     # issue number of new session (and registered its)
     def sid_cmp (self, sid, cert_id, lang):
         if sid < 0 or sid > self.max_sid: 
@@ -129,6 +144,7 @@ class ApiWsdl () :
                 # add session id in file
                 self.add_sid_in_file(sid, cert_id, lang)
             else:
+                self.set_sid_lang(sid, lang)
                 # set - old session
                 session = 0