From 1190aea0f7f87da46e01bd2b94f2e7469b96014e Mon Sep 17 00:00:00 2001 From: igor Date: Thu, 10 Sep 2020 10:41:01 +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/DBMSRecords.java | 1 + metadata/dbms/records.php | 5 ++--- metadata/dbms/setup.js | 8 ++++---- metadata/dbms/showrecord.js | 2 +- metadata/dbms/tools.js | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/metadata/dbms/DBMSRecords.java b/metadata/dbms/DBMSRecords.java index c9df006..d8c2acc 100644 --- a/metadata/dbms/DBMSRecords.java +++ b/metadata/dbms/DBMSRecords.java @@ -1,3 +1,4 @@ +// package kz.goodssales.GoodsSales.dbms; import java.io.BufferedOutputStream; diff --git a/metadata/dbms/records.php b/metadata/dbms/records.php index 1317f18..832f227 100644 --- a/metadata/dbms/records.php +++ b/metadata/dbms/records.php @@ -3,7 +3,7 @@ //ini_set('display_errors','Off'); //Чтоб ошибки не отправлялись клиентам //ini_set("error_log", "php_error.log"); //Чтоб ошибки сохранялись в локальную папку - + $host = $_SERVER['HTTP_HOST']; $host = '.'.cutAfterLast($host,'.',2); ini_set('session.cookie_domain', $host); @@ -14,8 +14,7 @@ if(isset($_SESSION['REMOTE_ADDR']) && $_SESSION['REMOTE_ADDR'] != $_SERVER['REMOTE_ADDR']) unset($_SESSION['USER_ID']); //Делаемся не авторизованным если зашли с другого ip адреса if(!isset($_SESSION['USER_ID'])) { $_SESSION['USER_ID']=null; } if(!isset($_COOKIE['GUID'])) { $_COOKIE['GUID']=null; } - - + //include("../include/xmltools.php"); //include("../include/toExcell.php"); //require_once("config.php"); diff --git a/metadata/dbms/setup.js b/metadata/dbms/setup.js index 4f47287..37c4628 100644 --- a/metadata/dbms/setup.js +++ b/metadata/dbms/setup.js @@ -1,4 +1,4 @@ -//var ScriptName='../metadata/dbms/records.jsp'; -var ScriptName='../records'; -var ScriptDName='../download'; -var ScriptUName='./upload'; \ No newline at end of file +//var ScriptName='../records'; //POST +//var ScriptDName='../download'; +//var ScriptUName='../upload'; +//var ScriptRName='../reports'; //GET For download reports (?file=name) \ No newline at end of file diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js index 3bd1182..0a2b75e 100644 --- a/metadata/dbms/showrecord.js +++ b/metadata/dbms/showrecord.js @@ -81,7 +81,7 @@ class SRec if(this.rwin!=null) { this.rwin.hideProgressBar(); - this.rwin.setContent('
'+trt('Download_report')+': "'+this.win.getCaption().innerHTML+'".
'); + this.rwin.setContent('
'+trt('Download_report')+': "'+this.win.getCaption().innerHTML+'".
'); } }else alert2(trt('Alert'),"Unknown function! fn=\""+fn+"\"" ); diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js index 6a090ca..f63040a 100644 --- a/metadata/dbms/tools.js +++ b/metadata/dbms/tools.js @@ -196,9 +196,9 @@ function alert2(title,text) \n\ '+text+'\n\ \n\ - \n\ -  \n\ - \n\ + \n\ +  \n\ + \n\ \n\ ';