diff --git a/README.md b/README.md index 9e51cef7..2a97a53f 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Sockets：支持接入DedeBIZ商业组件模块 ..../a 默认HTML文件存放目录[必须可写入] ..../admin 默认后台管理目录[可任意改名] ..../apps 插件扩展程序目录[不可写入，可执行] -..../data 系统缓存或其它可写入数据存放目录[必须可写入，但不可执行] +..../data 系统缓存或其它可写入数据存放目录[必须可写入，但不可执行，建议关闭对外访问权限] ..../install 安装程序目录，安装完后可删除[安装时必须有可写入权限] ..../static 静态资源存放目录[必须可写入，无需执行] ..../system 类库文件目录[建议关闭对外访问权限] diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 49c559be..ba650067 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -25,35 +25,37 @@ if ($dopost == "view") { $client->key = $cfg_bizcore_key; $data = $client->AdminPWDExists(); $data = json_decode($data->data); - $rs = (array)($data->result); - if ($rs["admin_pwd_exists"] == "false") { - //设定dedebiz admin密码 - if ($dedebiz_admin == "" || $dedebiz_admin !== $re_dedebiz_admin) { - echo ""; - echo "
DedeBIZ操作密码为空或两次指定的密码不符

"; - $client->Close(); - exit; - } - $data = $client->AdminPWDCreate($dedebiz_admin); - if ($data->data != "ok") { - echo ""; - echo "
DedeBIZ设定操作密码失败：${$data}

"; - $client->Close(); - exit; - } - } else { - if ($dedebiz_admin == "") { - echo ""; - echo "
DedeBIZ操作密码为空

"; - $client->Close(); - exit; - } - $data = $client->AdminSetIndexLockState($dedebiz_admin, $lockindex); - if ($data->data != "ok") { - echo ""; - echo "
DedeBIZ操作密码失败，填写正确的操作密码

"; - $client->Close(); - exit; + if ($data) { + $rs = (array)($data->result); + if ($rs["admin_pwd_exists"] == "false") { + //设定dedebiz admin密码 + if ($dedebiz_admin == "" || $dedebiz_admin !== $re_dedebiz_admin) { + echo ""; + echo "
DedeBIZ操作密码为空或两次指定的密码不符

"; + $client->Close(); + exit; + } + $data = $client->AdminPWDCreate($dedebiz_admin); + if ($data->data != "ok") { + echo ""; + echo "
DedeBIZ设定操作密码失败：${$data}

"; + $client->Close(); + exit; + } + } else { + if ($dedebiz_admin == "") { + echo ""; + echo "
DedeBIZ操作密码为空

"; + $client->Close(); + exit; + } + $data = $client->AdminSetIndexLockState($dedebiz_admin, $lockindex); + if ($data->data != "ok") { + echo ""; + echo "
DedeBIZ操作密码失败，填写正确的操作密码

"; + $client->Close(); + exit; + } } } $client->Close(); diff --git a/src/admin/makehtml_taglist.php b/src/admin/makehtml_taglist.php index 5db7030c..3912d271 100644 --- a/src/admin/makehtml_taglist.php +++ b/src/admin/makehtml_taglist.php @@ -28,7 +28,11 @@ if ($action == "search") { ); echo json_encode($result); } - + $result = array( + "code" => 200, + "data" => null, + ); + echo json_encode($result); exit; } diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index ab673c7f..cabf48a9 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -69,7 +69,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
 系统信息
+
 系统信息
"; ?> diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index ac994a17..b9401a7a 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -74,9 +74,17 @@ $client->appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $data = $client->AdminPWDExists(); - $data = json_decode($data->data); - $rs = (array)($data->result); - if($rs["admin_pwd_exists"] == "false") { + if($data->code == -1){ + ?> + + 尚未开启DedeBIZ商业组件 如何启动组件 + + + data); + $rs = (array)($data->result); + if($rs["admin_pwd_exists"] == "false") { ?> 设置操作密码： @@ -105,7 +113,8 @@ diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html index 5de3a6f3..712c7518 100755 --- a/src/install/templates/step-1.html +++ b/src/install/templates/step-1.html @@ -2,7 +2,7 @@ - 安装程序 + DedeCMSV6安装程序 @@ -101,7 +101,7 @@
在根目录安装时不必理会
- 安装即表示您同意站点授权协议 + 安装即表示您同意《站点授权协议》
diff --git a/src/static/ckeditor/plugins/mimage/plugin.js b/src/static/ckeditor/plugins/mimage/plugin.js index c5db4d95..c2eb36e2 100644 --- a/src/static/ckeditor/plugins/mimage/plugin.js +++ b/src/static/ckeditor/plugins/mimage/plugin.js @@ -4,7 +4,17 @@ CKEDITOR.plugins.add("mimage", { a.addCommand("openMImageDialog", { exec: function (a) { - var posLeft = 100; var posTop = 100; + var w = 800; + var h = 600; + var dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : window.screenX; + var dualScreenTop = window.screenTop !== undefined ? window.screenTop : window.screenY; + + var width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width; + var height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height; + + var systemZoom = width / window.screen.availWidth; + var posLeft = (width - w) / 2 / systemZoom + dualScreenLeft; + var posTop = (height - h) / 2 / systemZoom + dualScreenTop; window.open("./dialog/select_mimages.php?f=" + a.name, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + posLeft + ", top=" + posTop); } }); diff --git a/src/system/database/dedesqli.class.php b/src/system/database/dedesqli.class.php index 5aeaa7e2..446c3166 100755 --- a/src/system/database/dedesqli.class.php +++ b/src/system/database/dedesqli.class.php @@ -492,6 +492,7 @@ EOT; { $errorTrackFile = DEDEDATA.'/mysqli_error_trace.inc'; if ($this->showError) { + $msg = str_replace(array("\r","\n"),"",addslashes($msg)); ShowMsg("{$msg}", "javascript:;", -1); exit; } diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php index 76e9a262..1bd48a80 100755 --- a/src/system/database/dedesqlite.class.php +++ b/src/system/database/dedesqlite.class.php @@ -505,6 +505,7 @@ EOT; { $errorTrackFile = DEDEDATA.'/sqlite_error_trace.inc'; if ($this->showError) { + $msg = str_replace(array("\r","\n"),"",addslashes($msg)); ShowMsg("{$msg}", "javascript:;", -1); exit; }