ShuanghongS vor 10 Monaten
Ursprung
Commit
66f9299dce
3 geänderte Dateien mit 35 neuen und 7 gelöschten Zeilen
  1. 1 1
      main_new_version.php
  2. 10 6
      service/ocean_order.class.php
  3. 24 0
      utils/utils.class.php

+ 1 - 1
main_new_version.php

@@ -21,7 +21,7 @@ include 'service/tools.class.php';
 
 //为了调用,临时做一个登录动作
 //  $_POST['uname'] = "ra.admin";
-//  $_POST['psw'] = common::excuteOneSql("select ra_password from ra_online_user where user_login = 'ra.admin'");
+//  $_POST['psw'] = common::excuteOneSql("select ra_password from public.ra_online_user where user_login = 'ra.admin'");
 //  login::getInstance()->do_login_auto();
 //验证路由权限
 common::securityCheckHandNew($action);

+ 10 - 6
service/ocean_order.class.php

@@ -162,18 +162,22 @@ class ocean_order {
                     }
                     $size = floor($_FILES ["file"]['size'][$i] / 1024 / 1024);
                     if ($size > 5) {
-                        $errorMsg .= $_FILES['file']["name"][$i] . " larger than 5M;";
+                        $errorMsg = $_FILES['file']["name"][$i] . "is larger than 5M";
                         continue;
                     }
                     if ($_FILES["file"]["error"][$i] > 0) {
-                        $errorMsg .= " File Upload Error(" . $_FILES ["file"]["error"][$i] . ");";
+                        $errorMsg = " File Upload Error(" . $_FILES ["file"]["error"][$i] . ")";
                         continue;
                     }
+                    // if (utils::hasMacro($_FILES['file']['tmp_name'][$i])) {
+                    //     $errorMsg .= $_FILES['file']["name"][$i] . " has Macro,pls remove;";
+                    //     continue;
+                    // }
                     $path_parts = pathinfo($file_name[$i]);
                     $exten = $path_parts['extension'];
                     if (stristr($allow_extend, "|." . $exten . "|") === FALSE) {
                         //$errorMsg .= ' Only can upload PDF/Excel/Doc file;';
-                        $errorMsg .= ' Only can upload PDF file;';
+                        $errorMsg = $_FILES['file']["name"][$i].' must PDF type';
                     }
 
                     //$filename = $file_name[$i];
@@ -202,7 +206,7 @@ class ocean_order {
     
                     $save_path = $folder . DS . date("Ymd") . DS;
                     if (common::mkdirs($save_path) === FALSE){
-                        $errorMsg .= " Save folder create error;";
+                        $errorMsg = " Save folder create error";
                     }
                     if (move_uploaded_file($_FILES['file']['tmp_name'][$i], $save_path . $filename)) {
                         $sql .= "insert into $_schemas.$_table (file_name, file_path, upload_date, upload_ip, upload_by, bol, file_type, file_size, online_upload, 
@@ -239,7 +243,7 @@ class ocean_order {
                     $ks_from = empty($ks_from)? 'f' : $ks_from;
                     $ks_to = empty($ks_to)? 'f' : $ks_to;
                     if($ks_from == "f" && $ks_to == "f"){
-                        $errorMsg .= " System Error,Both Non Ksmart;";
+                        $errorMsg = "Both Non Ksmart,pls checked Info";
                     }
                     
                     $curr_date_config = common::excuteObjectSql("SELECT to_char(now()::date,'Mon_DD_YYYY') as d1_day,to_char(now()::date,'Mon_DD_YYYY HH:MM') as d2_day");
@@ -398,7 +402,7 @@ class ocean_order {
 
                 if (!empty($errorMsg)) {
                     $data = array(
-                        'msg' => "Failed $errorMsg"
+                        'msg' => $errorMsg
                     );
                     common::echo_json_encode(500,$data);
                     exit();

+ 24 - 0
utils/utils.class.php

@@ -718,5 +718,29 @@ class utils {
         }
         return $result;
     }
+
+    // public static function hasMacro($filename) {
+    //     $zip = new ZipArchive();
+    //     if ($zip->open($filename) === TRUE) {
+    //         if ($zip->locateName('word/vbaProject.bin') !== false) {
+    //             return true;
+    //         } else {
+    //             return false;
+    //         }
+    //         $zip->close();
+    //     }
+    //     return false; // 没有发现VBA宏
+    // }
+
+    // public static function hasMacro2($filename){
+    //     require 'D:\code\php\Customer_Service_Online\thirdparty_vendors\vendor\autoload.php';
+    //     require 'vendor/autoload.php';
+    //     $ole = new PhpOffice\PhpSpreadsheet\Shared\OLE($filename);
+    //     if ($ole->isFile('vbaProject.bin')) {
+    //         return true;
+    //     } else {
+    //         return false;
+    //     }
+    // }
 }
 ?>