From 1c329ff8092ab822e0a4a7dafa6e66843c481d61 Mon Sep 17 00:00:00 2001 From: llgoer Date: Wed, 6 May 2020 21:31:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=95=85=E8=A8=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...33c5b843ded8752b9857cc7c8e5b455-readme.php | 23 ----- src/install/module-install.php | 2 +- src/install/module_autos.php | 52 ----------- src/install/module_autos/changyan_autoreg.php | 86 ------------------- 4 files changed, 1 insertion(+), 162 deletions(-) delete mode 100755 src/data/module/533c5b843ded8752b9857cc7c8e5b455-readme.php delete mode 100755 src/install/module_autos.php delete mode 100755 src/install/module_autos/changyan_autoreg.php diff --git a/src/data/module/533c5b843ded8752b9857cc7c8e5b455-readme.php b/src/data/module/533c5b843ded8752b9857cc7c8e5b455-readme.php deleted file mode 100755 index bf37b534..00000000 --- a/src/data/module/533c5b843ded8752b9857cc7c8e5b455-readme.php +++ /dev/null @@ -1,23 +0,0 @@ -


-

版权所有 (c)2003-2011，DedeCms.com 保留所有权利。


-

感谢您选择织梦内容管理系统（以下简称DedeCms），DedeCms是目前国内最强大、最稳定的中小型门户网站建设解决方案之一，居于 PHP + MySQL 的技术开发，全部源码开放。DedeCms 的官方网址是： www.dedecms.com 交流论坛： bbs.dedecms.com


-

为了使你正确并合法的使用本软件，请你在使用前务必阅读清楚下面的协议条款：


-

一、本授权协议适用且仅适用于 DedeCms 5.x.x 版本，DedeCms官方对本授权协议的最终解释权。


-

二、协议许可的权利

- 1、您可以在完全遵守本最终用户授权协议的基础上，将本软件应用于非商业用途，而不必支付软件版权授权费用。

- 2、您可以在协议规定的约束和限制范围内修改 DedeCms 源代码或界面风格以适应您的网站要求。

- 3、您拥有使用本软件构建的网站全部内容所有权，并独立承担与这些内容的相关法律义务。

-4、获得商业授权之后，您可以将本软件应用于商业用途，同时依据所购买的授权类型中确定的技术支持内容，自购买时刻起，在技术支持期限内拥有通过指定的方式获得指定范围内的技术支持服务。商业授权用户享有反映和提出意见的权力，相关意见将被作为首要考虑，但没有一定被采纳的承诺或保证。


-

二、协议规定的约束和限制

- 1、未获商业授权之前，不得将本软件用于商业用途（包括但不限于企业网站、经营性网站、以营利为目的或实现盈利的网站）。购买商业授权请登陆 bbs.dedecms.com 了解最新说明。

- 2、未经官方许可，不得对本软件或与之关联的商业授权进行出租、出售、抵押或发放子许可证。

- 3、不管你的网站是否整体使用 DedeCms ，还是部份栏目使用 DedeCms，在你使用了 DedeCms 的网站主页上必须加上 DedeCms 官方网址(www.dedecms.com)的链接。

- 4、未经官方许可，禁止在 DedeCms 的整体或任何部分基础上以发展任何派生版本、修改版本或第三方版本用于重新分发。

-5、如果您未能遵守本协议的条款，您的授权将被终止，所被许可的权利将被收回，并承担相应法律责任。


-

三、有限担保和免责声明

- 1、本软件及所附带的文件是作为不提供任何明确的或隐含的赔偿或担保的形式提供的。

- 2、用户出于自愿而使用本软件，您必须了解使用本软件的风险，在尚未购买产品技术服务之前，我们不承诺对免费用户提供任何形式的技术支持、使用担保，也不承担任何因使用本软件而产生问题的相关责任。

- 3、电子文本形式的授权协议如同双方书面签署的协议一样，具有完全的和等同的法律效力。您一旦开始确认本协议并安装 DedeCms，即被视为完全理解并接受本协议的各项条款，在享有上述条款授予的权力的同时，受到相关的约束和限制。协议许可范围以外的行为，将直接违反本授权协议并构成侵权，我们有权随时终止授权，责令停止损害，并保留追究相关责任的权力。

-4、如果本软件带有其它软件的整合API示范例子包，这些文件版权不属于本软件官方，并且这些文件是没经过授权发布的，请参考相关软件的使用许可合法的使用。


-

协议发布时间： 2007年12月1日 By DedeCms.com


-

\ No newline at end of file diff --git a/src/install/module-install.php b/src/install/module-install.php index 643da742..db85f702 100755 --- a/src/install/module-install.php +++ b/src/install/module-install.php @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/../include/common.inc.php'); @set_time_limit(0); -$verMsg = ' V5.7 GBK'; +$verMsg = ' V5.8 UTF-8'; $errmsg = ''; $insLockfile = dirname(__FILE__).'/install_lock.txt'; $moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc'; diff --git a/src/install/module_autos.php b/src/install/module_autos.php deleted file mode 100755 index a1cd1561..00000000 --- a/src/install/module_autos.php +++ /dev/null @@ -1,52 +0,0 @@ - -
- 访问网站首页 - 登录网站后台 -
-EOT; - exit(); -} - -$module_autos=array( - '606c658db048ea7328ffe1c7ae2a732f'=>array( - 'name'=>'changyan_autoreg', - 'title'=>'畅言模块' - ) -); -$logs = ''; - -foreach($module_autos as $hh=>$module_auto) -{ - if(!in_array($hh, $modules)) continue; - $autofile = dirname(__FILE__).'/module_autos/'.$module_auto['name'].'.php'; - if(file_exists($autofile)) require_once($autofile); - else continue; - $clsname = ucfirst($module_auto['name']); - $macls = new $clsname(); - if(!$macls->run()) $logs .= "初始化{$module_auto['title']}出错：".$macls->errmsg."
"; - else $logs .= "成功初始化{$module_auto['title']}
"; -} - -$fp = fopen($insLockfile,'w'); -fwrite($fp,'ok'); -fclose($fp); -@unlink('./modules.tmp.inc'); - -echo << -
- 访问网站首页 - 登录网站后台 -
-EOT; -?> \ No newline at end of file diff --git a/src/install/module_autos/changyan_autoreg.php b/src/install/module_autos/changyan_autoreg.php deleted file mode 100755 index f3e7d816..00000000 --- a/src/install/module_autos/changyan_autoreg.php +++ /dev/null @@ -1,86 +0,0 @@ -errmsg = '未成功安装畅言模块文件'; - return FALSE; - } - helper('changyan'); - if( !$dsql->IsTable("#@__plus_changyan_setting") ) - { - $this->errmsg = '未成功初始化畅言模块所需数据库'; - return FALSE; - } - - if (empty($version)) $version = '0.0.1'; - if (version_compare($version, CHANGYAN_VER, '<')) { - $mysql_version = $dsql->GetVersion(TRUE); - - foreach ($update_sqls as $ver => $sqls) { - if (version_compare($ver, $version,'<')) { - continue; - } - foreach ($sqls as $sql) { - $sql = preg_replace("#ENGINE=MyISAM#i", 'TYPE=MyISAM', $sql); - $sql41tmp = 'ENGINE=MyISAM DEFAULT CHARSET='.$cfg_db_language; - - if($mysql_version >= 4.1) - { - $sql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $sql); - } - $dsql->ExecuteNoneQuery($sql); - } - changyan_set_setting('version', $ver); - $version=changyan_get_setting('version'); - } - $isv_app_key = changyan_get_isv_app_key(); - } - - $db_user = changyan_get_setting('user'); - if(!empty($db_user)) - { - $this->errmsg = '已经初始化畅言账号，无需再进行初始化'; - return FALSE; - } - - $sign=changyan_gen_sign(CHANGYAN_CLIENT_ID); - $url = $_SERVER['SERVER_NAME']; - $isv_name = cn_substr($cfg_webname,20); - $paramsArr=array( - 'client_id'=>CHANGYAN_CLIENT_ID, - 'isv_name'=>changyan_autoCharset($isv_name), - 'url'=>'http://'.$url, - 'sign'=>$sign); - - $rs=changyan_http_send(CHANGYAN_API_AUTOREG,0,$paramsArr); - $result=json_decode($rs,TRUE); - - if($result['status']==0) - { - // 保存appid,id信息 - changyan_set_setting('user', $result['user']); - changyan_set_setting('appid', $result['appid']); - changyan_set_setting('id', $result['id']); - changyan_set_setting('isv_app_key', $result['isv_app_key']); - changyan_set_setting('isv_id', $result['isv_id']); - changyan_clearcache(); - $passwd = changyan_mchStrCode($result['passwd'], 'ENCODE'); - changyan_set_setting('pwd', $passwd); - return TRUE; - } else { - if($step > 3) - { - $this->errmsg = '无法成功初始化畅言模块'; - return FALSE; - } - $step++; - return $this->run($step); - } - } -} -?> \ No newline at end of file From ea665aadd1cfaa380ba4d390e1a9aeb50a7e64ae Mon Sep 17 00:00:00 2001 From: llgoer Date: Wed, 6 May 2020 21:40:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?dedeajax=E7=9B=AE=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/templets/sys_admin_user_tj.htm | 2 +- src/install/templates/step-3.html | 2 +- src/install/templates/step-5.html | 3 --- src/member/templets/guestbook_admin.htm | 2 +- src/member/templets/mail.htm | 2 +- src/member/templets/mail_drop.htm | 2 +- src/member/templets/myfriend.htm | 2 +- src/templets/default/ajaxfeedback.htm | 2 +- src/templets/default/ajaxfeedback2.htm | 2 +- src/templets/default/article_article.htm | 2 +- src/templets/default/article_article1.htm | 2 +- src/templets/default/article_article2.htm | 2 +- src/templets/default/article_default.htm | 2 +- src/templets/default/article_default_sg.htm | 2 +- src/templets/default/article_image.htm | 2 +- src/templets/default/article_image_cl.htm | 2 +- src/templets/default/article_image_new.htm | 2 +- src/templets/default/article_infos.htm | 2 +- src/templets/default/article_shop.htm | 2 +- src/templets/default/article_soft.htm | 2 +- src/templets/default/article_spec.htm | 2 +- src/templets/default/index.htm | 2 +- src/templets/default/tag.htm | 2 +- src/templets/default/taglist.htm | 2 +- src/templets/plus/comments_frame.htm | 2 +- src/templets/plus/feedback_confirm.htm | 2 +- src/templets/plus/feedback_templet.htm | 2 +- src/templets/plus/post_diyform.htm | 4 ++-- 28 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/dede/templets/sys_admin_user_tj.htm b/src/dede/templets/sys_admin_user_tj.htm index 4c5a9184..a8fec29e 100755 --- a/src/dede/templets/sys_admin_user_tj.htm +++ b/src/dede/templets/sys_admin_user_tj.htm @@ -4,7 +4,7 @@ 管理员帐号--绩效统计 - + + - + + + + {dede:include filename="head.htm"/} diff --git a/src/templets/default/taglist.htm b/src/templets/default/taglist.htm index 154c865b..f6ca87db 100755 --- a/src/templets/default/taglist.htm +++ b/src/templets/default/taglist.htm @@ -6,7 +6,7 @@ - + {dede:include filename="head.htm"/} diff --git a/src/templets/plus/comments_frame.htm b/src/templets/plus/comments_frame.htm index 8b82ff84..0bceb07a 100755 --- a/src/templets/plus/comments_frame.htm +++ b/src/templets/plus/comments_frame.htm @@ -4,7 +4,7 @@ comment - + + + + From a1c0f0d4dde537f443dca87bdb11a7ac9f892ab3 Mon Sep 17 00:00:00 2001 From: llgoer Date: Wed, 6 May 2020 21:51:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/templets/catalog_add.htm | 2 +- src/dede/templets/catalog_edit.htm | 2 +- src/dede/templets/freelist_add.htm | 2 +- src/dede/templets/freelist_edit.htm | 2 +- src/dede/templets/makehtml_homepage.htm | 2 +- src/dede/templets/makehtml_js.htm | 2 +- src/dede/templets/spec_add.htm | 2 +- src/dede/templets/spec_edit.htm | 2 +- src/dede/templets/tag_test.htm | 8 ++++---- src/{include => static/js}/calendar/calendar-cn.js | 0 .../js}/calendar/calendar-win2k-1.css | 0 src/{include => static/js}/calendar/calendar.js | 0 src/{include => static/js}/calendar/img.gif | Bin src/{include => static/js}/calendar/menuarrow.gif | Bin 14 files changed, 12 insertions(+), 12 deletions(-) rename src/{include => static/js}/calendar/calendar-cn.js (100%) rename src/{include => static/js}/calendar/calendar-win2k-1.css (100%) rename src/{include => static/js}/calendar/calendar.js (100%) rename src/{include => static/js}/calendar/img.gif (100%) rename src/{include => static/js}/calendar/menuarrow.gif (100%) diff --git a/src/dede/templets/catalog_add.htm b/src/dede/templets/catalog_add.htm index 9e74b159..ff92d29a 100755 --- a/src/dede/templets/catalog_add.htm +++ b/src/dede/templets/catalog_add.htm @@ -29,7 +29,7 @@ function SelectTemplets(fname){ var posLeft = 100; var posTop = 100; } - window.open("../include/dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function ShowHide(objname) diff --git a/src/dede/templets/catalog_edit.htm b/src/dede/templets/catalog_edit.htm index be3f0b3a..b3ba9916 100755 --- a/src/dede/templets/catalog_edit.htm +++ b/src/dede/templets/catalog_edit.htm @@ -24,7 +24,7 @@ function SelectTemplets(fname) { var posLeft = 200; var posTop = 300; - window.open("../include/dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function ShowHide(objname) diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm index e8c8b6f6..5152fc8a 100755 --- a/src/dede/templets/freelist_add.htm +++ b/src/dede/templets/freelist_add.htm @@ -33,7 +33,7 @@ function SelectTemplets(fname) var posLeft = 100; var posTop = 100; } - window.open("/include/dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function CheckSubmit(){ if(document.form1.title.value==""){ diff --git a/src/dede/templets/freelist_edit.htm b/src/dede/templets/freelist_edit.htm index ac1580e6..a980b410 100755 --- a/src/dede/templets/freelist_edit.htm +++ b/src/dede/templets/freelist_edit.htm @@ -33,7 +33,7 @@ function SelectTemplets(fname) var posLeft = 100; var posTop = 100; } - window.open("/include/dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function CheckSubmit(){ if(document.form1.title.value==""){ diff --git a/src/dede/templets/makehtml_homepage.htm b/src/dede/templets/makehtml_homepage.htm index ecacfac6..2fe753b1 100755 --- a/src/dede/templets/makehtml_homepage.htm +++ b/src/dede/templets/makehtml_homepage.htm @@ -12,7 +12,7 @@ function SelectTemplets(fname) { var posLeft = 200; var posTop = 300; - window.open("../include/dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } diff --git a/src/dede/templets/makehtml_js.htm b/src/dede/templets/makehtml_js.htm index 7a0f0ceb..59f4118b 100755 --- a/src/dede/templets/makehtml_js.htm +++ b/src/dede/templets/makehtml_js.htm @@ -15,7 +15,7 @@ function SelectTemplets(fname) var posLeft = 100; var posTop = 100; } - window.open("../include/dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?&activepath=&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } diff --git a/src/dede/templets/spec_add.htm b/src/dede/templets/spec_add.htm index f1dbeb83..227943ae 100755 --- a/src/dede/templets/spec_add.htm +++ b/src/dede/templets/spec_add.htm @@ -46,7 +46,7 @@ function SelectImage(fname,vlist){ function SelectTemplets(fname){ var posLeft = 10; var posTop = 10; - window.open("../include/dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function CheckVal(id){ var notename = $DE('notename'+id); diff --git a/src/dede/templets/spec_edit.htm b/src/dede/templets/spec_edit.htm index 760ad803..1f094926 100755 --- a/src/dede/templets/spec_edit.htm +++ b/src/dede/templets/spec_edit.htm @@ -24,7 +24,7 @@ function SelectTemplets(fname) var posLeft = 100; var posTop = 100; } - window.open("../include/dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); + window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop); } function SelectArcList(fname) { diff --git a/src/dede/templets/tag_test.htm b/src/dede/templets/tag_test.htm index e6c6ad55..a5eb59f8 100755 --- a/src/dede/templets/tag_test.htm +++ b/src/dede/templets/tag_test.htm @@ -4,9 +4,9 @@ 主页更新向导 - - - + + + diff --git a/src/include/calendar/calendar-cn.js b/src/static/js/calendar/calendar-cn.js similarity index 100% rename from src/include/calendar/calendar-cn.js rename to src/static/js/calendar/calendar-cn.js diff --git a/src/include/calendar/calendar-win2k-1.css b/src/static/js/calendar/calendar-win2k-1.css similarity index 100% rename from src/include/calendar/calendar-win2k-1.css rename to src/static/js/calendar/calendar-win2k-1.css diff --git a/src/include/calendar/calendar.js b/src/static/js/calendar/calendar.js similarity index 100% rename from src/include/calendar/calendar.js rename to src/static/js/calendar/calendar.js diff --git a/src/include/calendar/img.gif b/src/static/js/calendar/img.gif similarity index 100% rename from src/include/calendar/img.gif rename to src/static/js/calendar/img.gif diff --git a/src/include/calendar/menuarrow.gif b/src/static/js/calendar/menuarrow.gif similarity index 100% rename from src/include/calendar/menuarrow.gif rename to src/static/js/calendar/menuarrow.gif