Pārlūkot izejas kodu

validate file name by extension

KoKiii 4 gadi atpakaļ
vecāks
revīzija
637b68d1fa

BIN
web_interface/dist/upload/ieupload.js


BIN
web_interface/dist/upload/upload.js


+ 2 - 2
web_interface/src/upload/ieupload.js

@@ -23,7 +23,7 @@ function stoneAgeUpload(elements, url, formData, callback) {
   form.style.display = 'none';
 
   // submit additional formData in hidden inputs
-  for (name in formData) {
+  for (var name in formData) {
     var input = document.createElement('input');
     input.type = 'hidden';
     input.name = name;
@@ -74,4 +74,4 @@ function stoneAgeUpload(elements, url, formData, callback) {
     parents[i].insertBefore(elements[i], nextSiblings[i]);
   }
   form.parentNode.removeChild(form);
-};
+}

+ 12 - 12
web_interface/src/upload/upload.css

@@ -57,10 +57,10 @@ input.file-name{
   line-height: 1.5;
   padding:3px 10px;
   border: 1px solid #337ab7;
-  // border-top-right-radius:0px;
-  // border-top-left-radius:5px;
-  // border-bottom-right-radius:0px;
-  // border-bottom-left-radius:5px;
+  /* border-top-right-radius:0px; */
+  /* border-top-left-radius:5px; */
+  /* border-bottom-right-radius:0px; */
+  /* border-bottom-left-radius:5px; */
   display: block;
   float: left;
 }
@@ -82,10 +82,10 @@ input.login {
 .fileUpload.btn {
   float: left;
   border: 1px solid;
-  // border-top-right-radius:5px;
-  // border-top-left-radius:0px;
-  // border-bottom-right-radius:5px;
-  // border-bottom-left-radius:0px;
+  /* border-top-right-radius:5px; */
+  /* border-top-left-radius:0px; */
+  /* border-bottom-right-radius:5px; */
+  /* border-bottom-left-radius:0px; */
   border-color: #3d7ab7;
 }
 .btn {
@@ -107,7 +107,7 @@ input.login {
           user-select: none;
   background-image: none;
   border: 1px solid transparent;
-  // border-radius: 5px;
+  /* border-radius: 5px; */
 }
 .btn:focus,
 .btn:active:focus,
@@ -157,7 +157,7 @@ fieldset[disabled] .btn {
 .btn-primary.active,.open > .dropdown-toggle.btn-primary {
   color: #fff;
   background-color: #2e6ea5;
-  // border-color: #F1F1F1;
+  /* border-color: #F1F1F1; */
 }
 .btn-primary:active,.btn-primary.active,.open > .dropdown-toggle.btn-primary {background-image: none;}
 .btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,
@@ -330,7 +330,7 @@ div.log { padding: 10px 250px;}
   width: 100%;
   height: 100%;
   border: 1px solid #e2e2e2;
-  // border-radius: 5px;
+  /* border-radius: 5px; */
 }
 #progressbar #progress {
   position: absolute;
@@ -339,7 +339,7 @@ div.log { padding: 10px 250px;}
   width: 0;
   height: 100%;
   background: #5cb85c;
-  // border-radius: 5px;
+  /* border-radius: 5px; */
   -webkit-transition: all .1s linear;
   transition: all .1s linear;
 }

+ 2 - 2
web_interface/src/upload/upload.js

@@ -164,10 +164,10 @@ document.addEventListener('DOMContentLoaded', function(event) {
           log('Не указан файл ПО!');
         }
       } else {
-        if (file2 && file2.name === getCookie('file2')) {
+        if (file2 && /\.(bin)$/.test(file2.name)) {
           upload2(file2);
         } else {
-          log2('Не указан файл ПО!');
+          log2('Не указан файл ПО или не соответствует расширению [*.bin]!');
         }
       }
       return false;