From f4f59e4b9ff6ec230805d9241df149e9990bdf29 Mon Sep 17 00:00:00 2001 From: devil Date: Sat, 15 Aug 2020 11:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E9=A2=98=E3=80=81?= =?UTF-8?q?=E6=8F=92=E4=BB=B6+=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/default/pluginsadmin/upload.html | 4 ++-- .../admin/view/default/theme/index.html | 6 +++--- .../admin/view/default/theme/upload.html | 6 +++--- application/service/PluginsAdminService.php | 18 ++++++++++++++++++ application/service/ThemeService.php | 18 ++++++++++++++++-- public/static/admin/default/css/theme.css | 2 +- public/static/common/css/common.css | 1 + 7 files changed, 44 insertions(+), 11 deletions(-) diff --git a/application/admin/view/default/pluginsadmin/upload.html b/application/admin/view/default/pluginsadmin/upload.html index a2550931b..d6c68ba86 100755 --- a/application/admin/view/default/pluginsadmin/upload.html +++ b/application/admin/view/default/pluginsadmin/upload.html @@ -9,7 +9,7 @@
-
+
@@ -17,7 +17,7 @@
- +
diff --git a/application/admin/view/default/theme/index.html b/application/admin/view/default/theme/index.html index 278c05880..ec8edffaa 100755 --- a/application/admin/view/default/theme/index.html +++ b/application/admin/view/default/theme/index.html @@ -12,12 +12,12 @@
    {{foreach $data_list as $v}}
  • -
    - +
    + {{$v.name}}
    -

    +

    {{$v.name}}
    {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} diff --git a/application/admin/view/default/theme/upload.html b/application/admin/view/default/theme/upload.html index 7b334ef72..90a18b294 100755 --- a/application/admin/view/default/theme/upload.html +++ b/application/admin/view/default/theme/upload.html @@ -9,15 +9,15 @@
    -
    +
    上传一个zip压缩格式的主题安装包
    -
    - +
    +
    diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index f2bbd8865..3b64f27ac 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -26,6 +26,9 @@ class PluginsAdminService // 排除不能使用的名称 public static $plugins_exclude_verification = ['view', 'shopxo', 'www']; + // 排除的文件后缀 + private static $exclude_ext = ['.php']; + /** * 列表 * @author Devil @@ -1059,6 +1062,21 @@ php; { if(strpos($file, $dir_key) !== false) { + // 仅控制器模块支持php文件 + if($dir_key != '_controller_') + { + // 排除后缀文件 + $pos = strripos($file, '.'); + if($pos !== false) + { + if(in_array(substr($file, $pos), self::$exclude_ext)) + { + continue; + } + } + } + + // 匹配成功文件路径处理、跳出循环 $file = str_replace($plugins_name.'/'.$dir_key.'/', '', $dir_value.$file); $is_has_find = true; break; diff --git a/application/service/ThemeService.php b/application/service/ThemeService.php index 64af286fa..048dab1be 100755 --- a/application/service/ThemeService.php +++ b/application/service/ThemeService.php @@ -25,6 +25,9 @@ class ThemeService private static $html_path = 'application'.DS.'index'.DS.'view'.DS; private static $static_path = 'public'.DS.'static'.DS.'index'.DS; + // 排除的文件后缀 + private static $exclude_ext = ['.php']; + /** * 获取模板列表 * @author Devil @@ -109,11 +112,11 @@ class ThemeService // 目录是否有权限 if(!is_writable(ROOT.self::$html_path)) { - return DataReturn('视图目录没权限', -10); + return DataReturn('视图目录没权限['.ROOT.self::$html_path.']', -10); } if(!is_writable(ROOT.self::$static_path)) { - return DataReturn('资源目录没权限', -10); + return DataReturn('资源目录没权限['.self::$static_path.']', -10); } // 资源目录 @@ -140,6 +143,7 @@ class ThemeService { if(strpos($file, $dir_key) !== false) { + // 匹配成功文件路径处理、跳出循环 $file = str_replace($dir_key.'/', '', $dir_value.$file); $is_has_find = true; break; @@ -152,6 +156,16 @@ class ThemeService continue; } + // 排除后缀文件 + $pos = strripos($file, '.'); + if($pos !== false) + { + if(in_array(substr($file, $pos), self::$exclude_ext)) + { + continue; + } + } + // 截取文件路径 $file_path = substr($file, 0, strrpos($file, '/')); diff --git a/public/static/admin/default/css/theme.css b/public/static/admin/default/css/theme.css index 80a45c531..861cd585e 100755 --- a/public/static/admin/default/css/theme.css +++ b/public/static/admin/default/css/theme.css @@ -1,4 +1,4 @@ -.am-gallery-item-bottom { background: #f7f7f7; padding: 0px 8px 5px 8px; } +.am-gallery-item-bottom { background: #e6e6e6; padding: 5px 8px; } .am-gallery-desc * { font-size: 12px; } .am-gallery-item:hover { border: 1px solid #f60; } .theme-active { border: 3px solid #5eb95e !important; } diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 450deb4d6..180580d50 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -528,6 +528,7 @@ button.colorpicker-submit img { line-height: 20px; min-width: 160px; max-width: 160px; + word-break: break-all; } .am-table-scrollable-horizontal .am-table .am-nowrap-initial { white-space: initial;