From a758140f78a5e235279e087e4000b4c6d5422a9c Mon Sep 17 00:00:00 2001
From: Igor <irigm@mail.ru>
Date: Tue, 10 Nov 2020 22:01:48 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/login.js       | 27 ++++++++++++---------------
 metadata/include/captcha.php |  2 +-
 metadata/include/tools.php   |  4 ++--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/metadata/dbms/login.js b/metadata/dbms/login.js
index 2630f1f..5ff5a44 100644
--- a/metadata/dbms/login.js
+++ b/metadata/dbms/login.js
@@ -230,20 +230,18 @@ class DBMSUser
 		win.BuildGUI(10,10);
 		win.setCaption(trt("Password_recovery"));
 
-		str='<div id="TWin_DT_'+win.tWinId+'" style="width: 100%; height: 100%; padding: 4px; text-align: left;">\n\
-			<table border="0" cellpadding="0" cellspacing="0" style="width: 100%; height: 100%; padding: 0px;">\n\
-				<tr>\n\
-					<td style="padding: 2px; white-space: nowrap"><b>'+trt('Login')+' (E-mail)</b></td>\n\
-					<td style="padding: 2px;"><input type="text" maxlength="40" style="width: 100%; display: inline;" id="'+win.uid+'_email" name="login">\n\
-						<table id="'+win.uid+'_phone" style="width: 100%; display: none;" cellpadding="0" cellspacing="0"><tr><td style="white-space: nowrap;"><b>+7 ( </b><input type="text" maxlength="3" onkeydown="this.value = this.value.replace(/[^0-9]/g, \'\')" onkeyup="this.value = this.value.replace(/[^0-9]/g, \'\')" style="width: 35px; display: inline;" id="'+win.uid+'_phone0" value=""><b> ) </b></td><td style="width: 90%;"><input type="text" onkeydown="this.value = this.value.replace(/[^0-9]/g, \'\')" onkeyup="this.value = this.value.replace(/[^0-9]/g, \'\')" maxlength="7" style="width: 100%;display: inline;" id="'+win.uid+'_phone1" value=""></td></tr></table><br></td>\n\
-				</tr>\n\
-				<tr><td colspan="2" style="text-align: right; padding: 2px;"><input class="button-secondary" id="'+win.uid+'_restore" type="button" style="display: inline;" value="'+trt('Restore')+'"></td></tr>\n\
-			</table>\n\
-		</td></tr>\n\
-	</div>';
-		document.getElementById('TWin_Co_'+win.tWinId).innerHTML=str;
-
-		win.setSize("300px","100px");
+		str='<div style="width: 100%; height: 100%; padding: 4px; text-align: left;">\n\
+					<table border="0" cellpadding="0" cellspacing="0" style="width: 100%; height: 100%; padding: 0px;">\n\
+						<tr>\n\
+							<td style="padding: 2px; white-space: nowrap"><b>'+trt('Login')+' (E-mail)</b></td>\n\
+							<td style="padding: 2px;"><input type="text" maxlength="40" style="width: 100%; display: inline;" id="'+win.uid+'_email" name="login">\n\
+								<table id="'+win.uid+'_phone" style="width: 100%; display: none;" cellpadding="0" cellspacing="0"><tr><td style="white-space: nowrap;"><b>+7 ( </b><input type="text" maxlength="3" onkeydown="this.value = this.value.replace(/[^0-9]/g, \'\')" onkeyup="this.value = this.value.replace(/[^0-9]/g, \'\')" style="width: 35px; display: inline;" id="'+win.uid+'_phone0" value=""><b> ) </b></td><td style="width: 90%;"><input type="text" onkeydown="this.value = this.value.replace(/[^0-9]/g, \'\')" onkeyup="this.value = this.value.replace(/[^0-9]/g, \'\')" maxlength="7" style="width: 100%;display: inline;" id="'+win.uid+'_phone1" value=""></td></tr></table><br></td>\n\
+						</tr>\n\
+						<tr><td colspan="2" style="text-align: right; padding: 2px;"><input class="button-secondary" id="'+win.uid+'_restore" type="button" style="display: inline;" value="'+trt('Restore')+'"></td></tr>\n\
+					</table>\n\
+				</td></tr>\n\
+			</div>';
+		win.setContent(str);
 
 		//Центрируем окно и отображаем тень
 		if(win.tbl.offsetHeight>win.div.offsetHeight) win.div.style.height=win.tbl.offsetHeight+"px";
@@ -261,7 +259,6 @@ class DBMSUser
 			{	return function()
 			{
 				win.showProgressBar();
-				//showProgressBar(document.getElementById('TWin_DT_'+win.tWinId),win.uid);
 
 				var em=document.getElementById(win.uid+'_email').value;
 
diff --git a/metadata/include/captcha.php b/metadata/include/captcha.php
index f6459cf..2c63972 100644
--- a/metadata/include/captcha.php
+++ b/metadata/include/captcha.php
@@ -54,4 +54,4 @@ if (isset($_REQUEST['id'])) $id = $_REQUEST['id']; else $id = '';
 
  header ("Content-type: image/gif");
  imagegif($src);
-?>
+
diff --git a/metadata/include/tools.php b/metadata/include/tools.php
index f9b66e9..b0d7332 100644
--- a/metadata/include/tools.php
+++ b/metadata/include/tools.php
@@ -13,10 +13,10 @@ function getScript($path)
 //Функция для перевода текста без применения GetText "trt("
 function trt($text)
 {
-    global $db;
+    global $db,$Schema;
 
     $result='';
-    $sql='select translation from main._translations where del=false and language_id='.$_SESSION["LNG"].' and identifier=\''.$text.'\';';
+    $sql='select translation from '.$Schema.'._translations where del=false and language_id='.$_SESSION["LNG"].' and identifier=\''.$text.'\';';
     //$sql='select translation from main._translations where del=false and language_id=(select id from main._languages where short_name=\''.$_SESSION["LNG"].'\') and identifier=\''.$text.'\';';
     $res = NULL;
     try