fix: bug修复

2024-10-29 17:38:47 +08:00
parent 48bf3e6f33
commit 6df8d23686
31 changed files with 1032 additions and 664 deletions
--- a/app/admin/controller/BaseController.php
+++ b/app/admin/controller/BaseController.php
@@ -15,6 +15,8 @@ class BaseController extends Base {
    //当前是否管理员 0:否 1:是
    protected $administrator = 0;

+    protected $adminlang;
+    protected $country_code;
    public function __construct() {
        parent::__construct();
    }
--- a/app/admin/controller/Product.php
+++ b/app/admin/controller/Product.php
@@ -13,6 +13,8 @@ class Product extends BaseController {
    private $saveDirectory = 'default';
    private $config; //配置信息

+    private $docDir;
+    private $rootDir;
    public function __construct() {
        parent::__construct();
        date_default_timezone_set("Asia/Shanghai");
@@ -648,7 +650,7 @@ class Product extends BaseController {
                         foreach($productAttr[$key]['type'] as $kt => $attrValue ) {
                                //echo $attrValue."<pre>*****"; print_r($productAttr[$key]['sort']);
                                $arrribute[$kt] = array(
-                                        $data['product_attr'][$kt] => $attrValue,
+                                        $data['product_attr'][$kt] => trim($attrValue),
                                        'sort'=> isset($productAttr[$key]['sort'][$kt]) ? $productAttr[$key]['sort'][$kt]: ''
                                );                                
                           
@@ -694,7 +696,7 @@ class Product extends BaseController {
                        'product_id' => $last_insert_id,
                        'image_url' => isset($product_image['image_url']) ? $product_image['image_url'] : '',
                        'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
-                        'image_color' => isset($product_image['image_color']) ? $product_image['image_color'] : '',
+                        'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
                        'original_url' => isset($product_image['image_url']) ? $product_image['image_url'] : '',
                        'country_code'  => $this->country_code
                    );
@@ -821,9 +823,8 @@ class Product extends BaseController {
        foreach($productImages as $color => $att_item) {
            $product_images[] = $att_item;
        }
-      
-      //echo "<pre>-------"; print_r($product_images); die;
-        
+
+
        unset($tmp_product_images);

        // tiaoshi($product_images);die;
@@ -831,7 +832,7 @@ class Product extends BaseController {
        $value['product_images'] = $product_images;

        $value['product_two_img'] = model('product_two_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);//print_r($value['product_product']);die;
-        //$value['product_bkimg'] = model('product_bk_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);//print_r($value['product_bkimg']);die;
+        //$value['product_bkimg'] = model('product_bk_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);
        $value['product_dls'] = model('product_dl')->getList(array('product_id' => $product['id']), ['dl_sort' => 'asc', 'id' => 'asc',]);
        $value['product_relateds'] = model('product')->getRelatedProductList(array('pr.product_id' => $product['id']), ['pr.related_sort' => 'asc', 'pr.id' => 'asc',], ['p.id' => 'id', 'p.name', 'pr.id' => 'related_id', 'pr.related_product_id', 'pr.related_sort', 'pr.related_desc']);
        // tiaoshi($value['product_images']);die;
@@ -1047,7 +1048,7 @@ class Product extends BaseController {
                        
                         foreach($productAttr[$key]['type'] as $kt => $attrValue ) {
                                $arrribute[$kt] = array(
-                                        $data['product_attr'][$kt] => $attrValue,
+                                        $data['product_attr'][$kt] => trim($attrValue),
                                        'sort'=> isset($productAttr[$key]['sort']) ? $productAttr[$key]['sort'][$kt]: ''
                                );                                
                           
@@ -1082,8 +1083,8 @@ class Product extends BaseController {
                        $product_image_list[$product_image_id] = array('sign' => 'update', 'where' => array('id' => $product_image_id), 'data' => array(
                            'product_id' => $last_update_id,
                            'image_url' => $product_image['image_url'],
-                            'image_bk_color' => isset( $product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
-                            'image_color' => isset($product_image['image_color']) ? $product_image['image_color']: '',
+                            'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
+                            'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
                            'original_url' => $product_image['image_url'],
                        ));
                    } else {
@@ -1091,12 +1092,13 @@ class Product extends BaseController {
                            'product_id' => $last_update_id,
                            'image_url' => $product_image['image_url'],
                            'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
-                            'image_color' => isset($product_image['image_color']) ? $product_image['image_color']: '',
+                            'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
                            'original_url' => $product_image['image_url'],
                        ));
                    }
                    //$imageModel->insertRow($image);
                }
+
                foreach ($product_image_list as $product_image_id => $image) {
                    if ($image['sign'] == 'insert') {
                        $imageModel->insertRow($image['data']);
@@ -1106,6 +1108,8 @@ class Product extends BaseController {
                        $imageModel->deleteRow($image['where']);
                    }
                }
+            } else {
+                model('product_two_img')->deleteRow(['product_id' => $last_update_id]);
            }
            /* 二级列表主图片 end */

@@ -1591,13 +1595,13 @@ class Product extends BaseController {
        $arg_order = ['a.id' => 'desc'];
        $arg_field = ['a.*', 'c.id' => 'categoryid', 'c.name' => 'categoryname'];

-        foreach ($id as $where ){
+        foreach ($id as $where) {
            $where = [
-                'a.id'=>$where,
-                'a.stat'=>0,
+                'a.id' => $where,
+                'a.stat' => 0,
                'a.country_code' => $this->country_code
-                ];
-            $result = model('product')->getProductLists($where,$arg_order,$arg_field,12);
+            ];
+            $result = model('product')->getProductLists($where, $arg_order, $arg_field, 12);
        }

        $this->assign($result);
@@ -1711,7 +1715,9 @@ class Product extends BaseController {
        }

        $arg_order = ['c.sort' => 'asc', 'c.id' => 'asc'];
-        $arg_field = array_map(function($value) {return 'a.' . $value;}, array_keys($fields));
+        $arg_field = array_map(function ($value) {
+            return 'a.' . $value;
+        }, array_keys($fields));
        $arg_field['c.id'] = 'categoryid';
        $arg_field['c.name'] = 'categoryname';
        $arg_field['c.pid'] = 'pid';
@@ -2592,7 +2598,7 @@ class Product extends BaseController {
                    mysqli_query($con, $sql);
                }
            }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
            return $this->json(-1, $e->getMessage());
        }

--- a/app/admin/controller/ProductCategory.php
+++ b/app/admin/controller/ProductCategory.php
@@ -49,6 +49,9 @@ class ProductCategory extends BaseController
        $max_unique_id = \think\db::query($sql)[0]['unique_id'];

        $value = ['categoryOptions' => $categoryOptions, 'pid' => $pid, 'max_unique_id' => $max_unique_id];
+
+        $tcoCategory = \think\Db::name('product_tco_category')->where('id', '>', 0)->where('country_code', '=', $this->country_code)->select();
+        $value['tcoCategoryOptions'] = $this->buildTcoCategoryToTree($tcoCategory, 0, 0, 0);
        $this->assign($value);
        return $this->fetch();
    }
--- a/app/admin/controller/ProductPurchaseLinks.php
+++ b/app/admin/controller/ProductPurchaseLinks.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller;

 use PHPExcel;
@@ -41,7 +42,7 @@ class ProductPurchaseLinks extends BaseController
            ->order('links.id', 'sort')
            ->group('links.product_id')
            ->paginate(10);
-            
+
        $data = [];
        foreach ($list as $val) {
            if (empty($data[$val['spu']])) {
@@ -49,7 +50,6 @@ class ProductPurchaseLinks extends BaseController
                $data[$val['spu']] = $val;
            }
        }
-        
        if (!$list->isEmpty()) {
            $others = Db::name('product_purchase_links')->alias('links')
                ->field([
@@ -75,7 +75,7 @@ class ProductPurchaseLinks extends BaseController
                }
            }
        }
-        
+
        $this->assign('list', $data);
        $this->assign('page', $list->render());

@@ -160,7 +160,7 @@ class ProductPurchaseLinks extends BaseController
        $rows  = $sheet->getHighestRow();    //总行数

        $xlsx = [];
-        for($i = 2; $i <= $rows; $i++) {
+        for ($i = 2; $i <= $rows; $i++) {
            // $xlsx[行号] = 数据
            $xlsx[$i] = [
                'spu'      => $sheet->getCellByColumnAndRow(0, $i)->getValue(),
@@ -171,7 +171,7 @@ class ProductPurchaseLinks extends BaseController

        // 错误提示
        $errors = [];
-        
+
        // 验证成功数据
        $valid_data = [];

@@ -272,7 +272,7 @@ class ProductPurchaseLinks extends BaseController
            ])
            ->join('product_purchase_link_platforms platforms', 'platforms.id=links.platform_id')
            ->join('product', 'product.id=links.product_id')
-            ->where(function($query) {
+            ->where(function ($query) {
                $query->where('product.is_show', '=', 0)->where('links.country_code', '=', $this->country_code);
                if (request()->has('skeyword')) {
                    $query->where(function ($q) {
--- a/app/admin/controller/ProductSeries.php
+++ b/app/admin/controller/ProductSeries.php
--- a/app/admin/controller/ReceiveSync.php
+++ b/app/admin/controller/ReceiveSync.php
@@ -222,10 +222,10 @@ class ReceiveSync extends Base
                            $record['cid'] = $category_id;
                        }
                    }
-                    
+
                    // 不更新产品名称
                    unset($record['name']);
-
+                    
                    $record['updatetime'] = time();
                    $ok = $query->name('product')->where('id', '=', $mp['id'])->update($record);
                    if (!$ok) {
--- a/app/admin/controller/Webuploader.php
+++ b/app/admin/controller/Webuploader.php
@@ -8,13 +8,17 @@ use think\Config;
 use image\Image;
 use pagination\Pagination;

-class Webuploader extends BaseController {
+class Webuploader extends BaseController
+{

+    private $docDir = '';
+    private $rootDir = '';
    private $basePath = '/';
    private $saveDirectory = 'default';
    private $num = '10';

-    public function __construct() {
+    public function __construct()
+    {
        parent::__construct();
        date_default_timezone_set("Asia/Shanghai");
        $this->docDir = $this->request->server('DOCUMENT_ROOT');
@@ -26,7 +30,8 @@ class Webuploader extends BaseController {
        header("Content-Type: text/html; charset=utf-8");
    }

-    public function show() {
+    public function show()
+    {
        $filter_name = $this->request->get('filter_name', '', 'urldecode');
        if (!empty($filter_name)) {
            $filter_name = trim(str_replace(['/../', '../', '*'], '', $filter_name), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
@@ -110,7 +115,11 @@ class Webuploader extends BaseController {
                $path = mb_substr($image, mb_strlen($this->docDir . $this->rootDir));
                $ext = strtolower(pathinfo($image, PATHINFO_EXTENSION));
                switch ($ext) {
-                    case 'jpg': case 'png': case 'gif': case 'bmp': case 'jpeg':
+                    case 'jpg':
+                    case 'png':
+                    case 'gif':
+                    case 'bmp':
+                    case 'jpeg':
                        $data['images'][] = array(
                            'thumb' => $path,
                            'name' => implode(' ', $name),
@@ -119,7 +128,11 @@ class Webuploader extends BaseController {
                            'href' => $this->request->domain() . $path
                        );
                        break;
-                    case 'html': case 'htm': case 'js': case 'php': case 'txt':
+                    case 'html':
+                    case 'htm':
+                    case 'js':
+                    case 'php':
+                    case 'txt':
                        $data['images'][] = array(
                            'thumb' => $path,
                            'name' => implode(' ', $name),
@@ -128,7 +141,13 @@ class Webuploader extends BaseController {
                            'href' => 'javascript:void(0);'
                        );
                        break;
-                    case 'avi': case 'mp4': case 'rmvb': case 'mkv': case 'wmv': case 'ogg': case 'webm':
+                    case 'avi':
+                    case 'mp4':
+                    case 'rmvb':
+                    case 'mkv':
+                    case 'wmv':
+                    case 'ogg':
+                    case 'webm':
                        $data['images'][] = array(
                            'thumb' => $path,
                            'name' => implode(' ', $name),
@@ -137,7 +156,13 @@ class Webuploader extends BaseController {
                            'href' => 'javascript:void(0);'
                        );
                        break;
-                    case 'zip': case 'rar': case 'gz': case 'tar': case 'tgz': case 'gz': case 'iso':
+                    case 'zip':
+                    case 'rar':
+                    case 'gz':
+                    case 'tar':
+                    case 'tgz':
+                    case 'gz':
+                    case 'iso':
                        $data['images'][] = array(
                            'thumb' => $path,
                            'name' => implode(' ', $name),
@@ -203,13 +228,14 @@ class Webuploader extends BaseController {
        return $this->fetch();
    }

-    public function modal() {
+    public function modal()
+    {
        $relativepath = $this->request->get('directory', '', 'urldecode');
        if (!empty($relativepath)) {
            $relativepath = trim(str_replace(['/../', '../', '*'], '', $relativepath), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        }
        $func = $this->request->get('func', 'undefined');
-        $num = $this->num;
+        $num = $this->request->get('num', $this->num);
        $type = $this->request->get('type', '');
        $target = $this->request->get('target', '');
        $thumb = $this->request->get('thumb', '');
@@ -252,14 +278,15 @@ class Webuploader extends BaseController {
        return $this->fetch();
    }

-    public function uploadiframe() {
+    public function uploadiframe()
+    {
        $relativepath = $this->request->get('directory', '', 'urldecode');
        if (!empty($relativepath)) {
            $relativepath = trim(str_replace(['/../', '../', '*'], '', $relativepath), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        }
        $func = $this->request->get('func', 'undefined');
        //$num = $this->request->get('num/d', 1);
-        $num = $this->num;
+        $num = $this->request->get('num', $this->num);
        $type = $this->request->get('type', '');
        $target = $this->request->get('target', '');
        $thumb = $this->request->get('thumb', '');
@@ -295,21 +322,24 @@ class Webuploader extends BaseController {
        return str_replace(array_keys($tpl_replace_string), array_values($tpl_replace_string), $content);
    }

-    public function imageupload() {
+    public function imageupload()
+    {
        // 上传图片框中的描述表单名称，
        $title = $this->request->get('pictitle');
        $relativepath = $this->request->get('directory', '', 'urldecode');
        if (!empty($relativepath)) {
            $relativepath = trim(str_replace(['/../', '../', '*'], '', $relativepath), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        }
-        $this->saveDirectory = $relativepath? : 'default';
+        $this->saveDirectory = $relativepath ?: 'default';
        // 获取表单上传文件 例如上传了001.jpg
        $file = request()->file('file');
-//        if (empty($file))
-//            $file = request()->file('upfile');
+        //        if (empty($file))
+        //            $file = request()->file('upfile');
        $image_upload_limit_size = Config::get('image_upload_limit_size');
        $result = $this->validate(
-                ['file' => $file], ['file' => 'image|fileSize:' . $image_upload_limit_size . '|fileExt:jpg,jpeg,gif,png'], ['file.image' => '上传文件必须为图片', 'file.fileSize' => '上传文件过大', 'file.fileExt' => '上传文件后缀名必须为jpg,jpeg,gif,png']
+            ['file' => $file],
+            ['file' => 'image|fileSize:' . $image_upload_limit_size . '|fileExt:jpg,jpeg,gif,png'],
+            ['file.image' => '上传文件必须为图片', 'file.fileSize' => '上传文件过大', 'file.fileExt' => '上传文件后缀名必须为jpg,jpeg,gif,png']
        );
        if (true !== $result || !$file) {
            $state = "ERROR " . $result;
@@ -332,25 +362,27 @@ class Webuploader extends BaseController {
        $return_data['original'] = ''; // 这里好像没啥用 暂时注释起来
        $return_data['state'] = $state;
        $return_data['directory'] = $this->saveDirectory;
-        echo json_encode($return_data);
-        exit;
+        return json_encode($return_data);
    }

-    public function fileupload() {
+    public function fileupload()
+    {
        // 上传图片框中的描述表单名称，
        $title = $this->request->get('pictitle');
        $relativepath = $this->request->get('directory', '', 'urldecode');
        if (!empty($relativepath)) {
            $relativepath = trim(str_replace(['/../', '../', '*'], '', $relativepath), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        }
-        $this->saveDirectory = $relativepath? : 'default';
+        $this->saveDirectory = $relativepath ?: 'default';
        // 获取表单上传文件 例如上传了001.jpg
        $file = request()->file('file');
-//        if (empty($file))
-//            $file = request()->file('upfile');
+        //        if (empty($file))
+        //            $file = request()->file('upfile');
        $file_upload_limit_size = Config::get('file_upload_limit_size');
        $result = $this->validate(
-                ['file' => $file], ['file' => 'fileSize:' . $file_upload_limit_size], ['file.fileSize' => '上传文件过大']
+            ['file' => $file],
+            ['file' => 'fileSize:' . $file_upload_limit_size],
+            ['file.fileSize' => '上传文件过大']
        );
        if (true !== $result || !$file) {
            $state = "ERROR " . $result;
@@ -377,12 +409,13 @@ class Webuploader extends BaseController {
      删除上传的图片
     */

-    public function deluploadimage() {
+    public function deluploadimage()
+    {
        $action = $this->request->get('action', 'del');
        $filename = $this->request->get('filename');
        $filename = empty($filename) ? $this->request->get('url') : $filename;
-//        $filename = str_replace('../', '', $filename);
-//        $filename = trim($filename, "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
+        //        $filename = str_replace('../', '', $filename);
+        //        $filename = trim($filename, "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        $filename = trim(str_replace('../', '', $filename), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        $filename = './' . $filename;
        if ($action == 'del' && !empty($filename) && is_file($filename)) {
@@ -404,12 +437,13 @@ class Webuploader extends BaseController {
      删除上传的文件
     */

-    public function deluploadfile() {
+    public function deluploadfile()
+    {
        $action = $this->request->get('action', 'del');
        $filename = $this->request->get('filename');
        $filename = empty($filename) ? $this->request->get('url') : $filename;
-//        $filename = str_replace('../', '', $filename);
-//        $filename = trim($filename, "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
+        //        $filename = str_replace('../', '', $filename);
+        //        $filename = trim($filename, "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        $filename = trim(str_replace('../', '', $filename), "\x20\x09\x0A\x0D\x00\x0B\x2E\x2F");
        $filename = './' . $filename;
        if ($action == 'del' && !empty($filename) && is_file($filename)) {
@@ -422,7 +456,8 @@ class Webuploader extends BaseController {
        exit;
    }

-    public function preview() {
+    public function preview()
+    {
        // 此页面用来协助 IE6/7 预览图片，因为 IE 6/7 不支持 base64
        $DIR = 'preview';
        // Create target dir
@@ -448,7 +483,10 @@ class Webuploader extends BaseController {
        $src = file_get_contents('php://input');
        if (preg_match("#^data:image/(\w+);base64,(.*)$#", $src, $matches)) {
            $previewUrl = sprintf(
-                    "%s://%s%s", isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http', $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI']
+                "%s://%s%s",
+                isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http',
+                $_SERVER['HTTP_HOST'],
+                $_SERVER['REQUEST_URI']
            );
            $previewUrl = str_replace("preview.php", "", $previewUrl);
            $base64 = $matches[2];
@@ -470,8 +508,9 @@ class Webuploader extends BaseController {
        }
    }

-    public function upload() {
-        $json = array();
+    public function upload()
+    {
+        $json = [];
        // Make sure we have the correct directory
        $relativepath = $this->request->get('directory', '', 'urldecode');
        if (!empty($relativepath)) {
@@ -482,46 +521,57 @@ class Webuploader extends BaseController {
        }
        // Check its a directory
        if (!is_dir($directory) || mb_substr($directory, 0, mb_strlen($this->basePath)) != $this->basePath) {
-            $json['error'] = '路径错误';
-        }
-        if (!$json) {
-            $file_upload_limit_size = Config::get('file_upload_limit_size');
-            // Check if multiple files are uploaded or just one
-            //获取上传的文件类型
-            //$type = $this->request->get('type', '');
-            // 获取表单上传文件
-            $files = $this->request->file('file');
-            foreach ($files as $k => $file) {
-                // 移动到框架应用根目录/public/uploads/ 目录下
-                $info = $file->validate(['size' => $file_upload_limit_size])->move($directory, false);
-                if ($info) {
-                    // 成功上传后 获取上传信息
-                    $ext = strtolower($info->getExtension());
-                    if (in_array($ext, ['gif', 'jpg', 'jpeg', 'png', 'bmp'])) {
-                        $image_upload_limit_size = Config::get('image_upload_limit_size');
-                        $chick = $info->getInfo();
-
-                        if ($chick['size']>=$image_upload_limit_size) {
-                            $json['success'] = "文件大小超过1M";
-                        } else {
-                            $this->watermark('/uploads/' . $relativepath . '/' . $info->getFilename());
-                        }
-                    }
-                } else {
-                    // 上传失败获取错误信息
-                    $json['error'] = '';
-                    $json['error'] .= '文件' . $k . $file->getError();
-                }
+            if (!mkdir($directory, 0755, true)) {
+                $json['error'] = '路径错误';
            }
        }
        if (!$json) {
-            $json['success'] = '文件上传成功';
+            $json = [
+                'success' => '文件上传成功'
+            ];
+
+            $file_upload_limit_size = Config::get('file_upload_limit_size');
+            $image_upload_limit_size = Config::get('image_upload_limit_size');
+            // 获取表单上传文件
+            $errors = [];
+            $files  = $this->request->file('file');
+            foreach ($files as $k => $file) {
+                $file_info = $file->getInfo();
+                $idx       = mb_strripos($file_info['name'], '.', 0, 'utf-8');
+                $file      = $file->validate(['size' => $file_upload_limit_size]);
+                if (false !== $idx) {
+                    $start = $idx;
+                    if (mb_strlen($file_info['name'], 'utf-8') > $idx) {
+                        $start = $idx + 1;
+                    }
+                    $ext = mb_substr($file_info['name'], $start);
+                    if (in_array($ext, ['gif', 'jpg', 'jpeg', 'png', 'bmp'])) {
+                        $file->validate(['size' => $image_upload_limit_size]);
+                    }
+                }
+                // 移动到框架应用根目录/public/uploads/ 目录下
+                $info = $file->move($directory, false);
+                if ($info) {
+                    // 成功上传后 获取上传信息
+                    $this->watermark('/uploads/' . $relativepath . '/' . $info->getFilename());
+                } else {
+                    // 上传失败获取错误信息
+                    $errors[] = '文件【' . $file->getInfo()['name'] . '】' . $file->getError();
+                }
+            }
+            if (count($errors) != 0) {
+                $json = [
+                    'success' => implode('\n', $errors)
+                ];
+            }
        }
+        
        echo json_encode($json);
        exit;
    }

-    public function folder() {
+    public function folder()
+    {
        $json = array();
        // Make sure we have the correct directory
        $relativepath = $this->request->get('directory', '', 'urldecode');
@@ -569,7 +619,8 @@ class Webuploader extends BaseController {
        exit;
    }

-    public function rename() {
+    public function rename()
+    {
        $json = array();
        // Make sure we have the correct directory
        $relativepath = $this->request->get('directory', '', 'urldecode');
@@ -617,7 +668,8 @@ class Webuploader extends BaseController {
        exit;
    }

-    public function delete() {
+    public function delete()
+    {
        $json = array();
        $paths = $this->request->post();
        if (isset($paths['path'])) {
@@ -677,7 +729,8 @@ class Webuploader extends BaseController {
        exit;
    }

-    public function watermark($return_url = '/uploads/nopic.jpg') {
+    public function watermark($return_url = '/uploads/nopic.jpg')
+    {
        $iswatermark = Config::get('watermark');
        $return_data = ['watermark' => $iswatermark];
        if ($iswatermark) {
@@ -707,7 +760,7 @@ class Webuploader extends BaseController {
                    $ttf = './hgzb.ttf';
                    if (file_exists($ttf)) {
                        $size = $wmconfig['mark_text_size'] ? $wmconfig['mark_text_size'] : 30;
-                        $color = $wmconfig['mark_text_color'] ? : '#000000';
+                        $color = $wmconfig['mark_text_color'] ?: '#000000';
                        if (!preg_match('/^#[0-9a-fA-F]{6}$/', $color)) {
                            $color = '#000000';
                        }
@@ -729,5 +782,4 @@ class Webuploader extends BaseController {
        }
        return $return_data;
    }
-
 }