Merge pull request #19 from dedetech/dev

调整目录结构

src/data/module/533c5b843ded8752b9857cc7c8e5b455-readme.php

@@ -1,23 +0,0 @@
-<p style='line-height:150%'><div style='padding-left:20px;line-height:150%'><br />
-<p>版权所有 (c)2003-2011，DedeCms.com 保留所有权利。 </p><br />
-<p>感谢您选择织梦内容管理系统（以下简称DedeCms），DedeCms是目前国内最强大、最稳定的中小型门户网站建设解决方案之一，居于 PHP + MySQL 的技术开发，全部源码开放。DedeCms 的官方网址是： www.dedecms.com  交流论坛： bbs.dedecms.com</p><br />
-<p>为了使你正确并合法的使用本软件，请你在使用前务必阅读清楚下面的协议条款：</p><br />
-<p><strong>一、本授权协议适用且仅适用于 DedeCms 5.x.x 版本，DedeCms官方对本授权协议的最终解释权。 </strong></p><br />
-<p><strong>二、协议许可的权利 </strong><br /><br />
-  1、您可以在完全遵守本最终用户授权协议的基础上，将本软件应用于非商业用途，而不必支付软件版权授权费用。 <br /><br />
-  2、您可以在协议规定的约束和限制范围内修改 DedeCms 源代码或界面风格以适应您的网站要求。 <br /><br />
-  3、您拥有使用本软件构建的网站全部内容所有权，并独立承担与这些内容的相关法律义务。 <br /><br />
-4、获得商业授权之后，您可以将本软件应用于商业用途，同时依据所购买的授权类型中确定的技术支持内容，自购买时刻起，在技术支持期限内拥有通过指定的方式获得指定范围内的技术支持服务。商业授权用户享有反映和提出意见的权力，相关意见将被作为首要考虑，但没有一定被采纳的承诺或保证。 </p><br />
-<p><strong>二、协议规定的约束和限制 </strong><br /><br />
-  1、未获商业授权之前，不得将本软件用于商业用途（包括但不限于企业网站、经营性网站、以营利为目的或实现盈利的网站）。购买商业授权请登陆 bbs.dedecms.com 了解最新说明。 <br /><br />
-  2、未经官方许可，不得对本软件或与之关联的商业授权进行出租、出售、抵押或发放子许可证。 <br /><br />
-  3、不管你的网站是否整体使用 DedeCms ，还是部份栏目使用 DedeCms，在你使用了 DedeCms 的网站主页上必须加上 DedeCms 官方网址(www.dedecms.com)的链接。 <br /><br />
-  4、未经官方许可，禁止在 DedeCms 的整体或任何部分基础上以发展任何派生版本、修改版本或第三方版本用于重新分发。 <br /><br />
-5、如果您未能遵守本协议的条款，您的授权将被终止，所被许可的权利将被收回，并承担相应法律责任。 </p><br />
-<p><strong>三、有限担保和免责声明 </strong><br /><br />
-  1、本软件及所附带的文件是作为不提供任何明确的或隐含的赔偿或担保的形式提供的。 <br /><br />
-  2、用户出于自愿而使用本软件，您必须了解使用本软件的风险，在尚未购买产品技术服务之前，我们不承诺对免费用户提供任何形式的技术支持、使用担保，也不承担任何因使用本软件而产生问题的相关责任。 <br /><br />
-  3、电子文本形式的授权协议如同双方书面签署的协议一样，具有完全的和等同的法律效力。您一旦开始确认本协议并安装 DedeCms，即被视为完全理解并接受本协议的各项条款，在享有上述条款授予的权力的同时，受到相关的约束和限制。协议许可范围以外的行为，将直接违反本授权协议并构成侵权，我们有权随时终止授权，责令停止损害，并保留追究相关责任的权力。 <br /><br />
-4、如果本软件带有其它软件的整合API示范例子包，这些文件版权不属于本软件官方，并且这些文件是没经过授权发布的，请参考相关软件的使用许可合法的使用。</p><br />
-<p>协议发布时间：  2007年12月1日 By DedeCms.com</p><br />
-<p></p></p>

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)

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)

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=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+   window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 function CheckSubmit(){
    if(document.form1.title.value==""){

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=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 function CheckSubmit(){
 	if(document.form1.title.value==""){

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);
 }
 </script>
 </head>

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=<?php echo urlencode($cfg_templets_dir.'/plus')?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+   window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir.'/plus')?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 </script>
 </head>

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);

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)
 {

src/dede/templets/sys_admin_user_tj.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>管理员帐号--绩效统计</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<script language='javascript' src='../include/js/dedeajax2.js'></script>
+<script language='javascript' src='../static/js/dedeajax2.js'></script>
 <script language='javascript'>
 	//gcontainer,mShowError,mShowWait,mErrCon,mErrDisplay,mWaitDisplay
 	function LoadUser(uid)

src/dede/templets/tag_test.htm

@@ -4,9 +4,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>主页更新向导</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" type="text/css" media="all" href="../include/calendar/calendar-win2k-1.css" title="win2k-1" />
+<link rel="stylesheet" type="text/css" media="all" href="../static/js/calendar/calendar-win2k-1.css" title="win2k-1" />
-<script type="text/javascript" src="../include/calendar/calendar.js"></script>
+<script type="text/javascript" src="../static/js/calendar/calendar.js"></script>
-<script type="text/javascript" src="../include/calendar/calendar-cn.js"></script>
+<script type="text/javascript" src="../static/js/calendar/calendar-cn.js"></script>
 <script language="javascript">
 function SelectTemplets(fname)
 {
@@ -18,7 +18,7 @@ function SelectTemplets(fname)
      var posLeft = 100;
      var posTop = 100;
    }
-   window.open("../include/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);
 }
 </script>
 <link rel="stylesheet" type="text/css" href="css/codemirror.css">

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';

src/install/module_autos.php

@@ -1,52 +0,0 @@
-<?php
-require_once(dirname(__FILE__).'/../include/common.inc.php');
-$moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc';
-include($moduleCacheFile);
-$modules = split(',',$selModule);
-$insLockfile = dirname(__FILE__).'/install_lock.txt';
-
-if(file_exists($insLockfile))
-{
-	echo <<<EOT
-<link href="style.css" rel="stylesheet" type="text/css" />
-<div class="over-link fs-14" style="padding:0px;">
-    <a href="../index.php?upcache=1" target='_top'>访问网站首页</a>
-    <a href="../dede" target='_top'>登录网站后台</a>
-</div>
-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."<br/>";
-    else $logs .= "成功初始化{$module_auto['title']}<br/>";
-}
-
-$fp = fopen($insLockfile,'w');
-fwrite($fp,'ok');
-fclose($fp);
-@unlink('./modules.tmp.inc');
-
-echo <<<EOT
-<link href="style.css" rel="stylesheet" type="text/css" />
-<div class="over-link fs-14" style="padding:0px;">
-    <a href="../index.php?upcache=1" target='_top'>访问网站首页</a>
-    <a href="../dede" target='_top'>登录网站后台</a>
-</div>
-EOT;
-?>

src/install/module_autos/changyan_autoreg.php

@@ -1,86 +0,0 @@
-<?php
-class Changyan_autoreg
-{
-    var $errmsg='';
-    function run($step=0)
-    {
-        global $dsql,$update_sqls,$cfg_db_language,$cfg_webname;
-        if(!file_exists(DEDEINC.'/helpers/changyan.helper.php'))
-        {
-            $this->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);
-        }
-    }
-}
-?>

src/install/templates/step-3.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $s_lang?>" />
 <title>安装程序 - 织梦内容管理系统<?php echo $verMsg; ?></title>
-<script src="../include/dedeajax2.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/dedeajax2.js" language="javascript" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
 <!--
     function $o(tid){

src/install/templates/step-5.html

@@ -46,9 +46,6 @@
 			<br />
 			<?php echo $errmsg; ?>
 		</div>
-		<div class="over-link fs-14">
-			<iframe src='module_autos.php' id='mainfra' name='mainfra' frameborder='0' width='100%' height='30px'></iframe>
-		</div>
 		<div class="install-msg">
 			或者访问织梦网站:<br />
 		</div>

src/member/templets/guestbook_admin.htm

@@ -6,7 +6,7 @@
 <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="templets/js/jquery.min.js"></script>
 <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-<script type="text/javascript" language="javascript" src="../include/dedeajax2.js"></script>
+<script type="text/javascript" language="javascript" src="../static/js/dedeajax2.js"></script>
 <script type="text/javascript" src="templets/js/table_function.js"></script>
 <script type="text/javascript" src="templets/js/leftmenu.js"></script>
 <script type="text/javascript">

src/member/templets/mail.htm

@@ -6,7 +6,7 @@
 <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="templets/js/jquery.min.js"></script>
 <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-<script type="text/javascript" language="javascript" src="../include/dedeajax2.js"></script>
+<script type="text/javascript" language="javascript" src="../static/js/dedeajax2.js"></script>
 <script type="text/javascript" src="templets/js/table_function.js"></script>
 <script type="text/javascript" src="templets/js/leftmenu.js"></script>
 </head>

src/member/templets/mail_drop.htm

@@ -6,7 +6,7 @@
 <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="templets/js/jquery.min.js"></script>
 <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-<script type="text/javascript" language="javascript" src="../include/dedeajax2.js"></script>
+<script type="text/javascript" language="javascript" src="../static/js/dedeajax2.js"></script>
 <script type="text/javascript" src="templets/js/table_function.js"></script>
 <script type="text/javascript" src="templets/js/leftmenu.js"></script>
 </head>

src/member/templets/myfriend.htm

@@ -6,7 +6,7 @@
 <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="templets/js/jquery.min.js"></script>
 <script type="text/javascript" src="templets/js/table_function.js"></script>
-<script type="text/javascript" src="../include/dedeajax2.js"></script>
+<script type="text/javascript" src="../static/js/dedeajax2.js"></script>
 <script type="text/javascript" src="templets/js/load.js"></script>
 <script type="text/javascript" src="templets/js/leftmenu.js"></script>
 <script type="text/javascript">

src/templets/default/ajaxfeedback.htm

@@ -1,4 +1,4 @@
-<!-- //主模板必须要引入{dede:global.cfg_cmsurl/}/include/dedeajax2.js -->
+<!-- //主模板必须要引入{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js -->
 <a name='postform'></a>
 <div class="mt1">
 		<dl class="tbox">

src/templets/default/ajaxfeedback2.htm

@@ -1,4 +1,4 @@
-<!-- //主模板必须要引入{dede:global.cfg_cmsurl/}/include/dedeajax2.js -->
+<!-- //主模板必须要引入{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js -->
 <a name='postform'></a>
 <div class="mt1">
   <dl class="tbox">

src/templets/default/article_article.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 
 <script language="javascript" type="text/javascript">
 <!--

src/templets/default/article_article1.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin(){

src/templets/default/article_article2.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin(){

src/templets/default/article_default.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin()

src/templets/default/article_default_sg.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 

src/templets/default/article_image.htm

@@ -9,7 +9,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/picture.css" rel="stylesheet" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin(){

src/templets/default/article_image_cl.htm

@@ -9,7 +9,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <SCRIPT language="javascript" type="text/javascript" src="{dede:global.cfg_templets_skin/}/images/photo/sinaflash.js"></SCRIPT>
 <SCRIPT language="javascript" type="text/javascript" src="{dede:global.cfg_templets_skin/}/images/photo/heiphoto.js"></SCRIPT>
 <script language="javascript" type="text/javascript">

src/templets/default/article_image_new.htm

@@ -12,7 +12,7 @@
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
 <script type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
 <script type="text/javascript" src="{dede:global.cfg_templets_skin/}/js/jcarousellite.js"></script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin(){

src/templets/default/article_infos.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 	function CheckLogin(){

src/templets/default/article_shop.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 	function CheckLogin(){

src/templets/default/article_soft.htm

@@ -8,7 +8,7 @@
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
 <script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 <!--
 function CheckLogin()

src/templets/default/article_spec.htm

@@ -40,7 +40,7 @@
 		</div>
 			
 <!-- //AJAX评论区 -->
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript">
 function CheckLogin()
 {

src/templets/default/index.htm

@@ -8,7 +8,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript" type="text/javascript" src="{dede:global.cfg_cmspath/}/static/js/jquery.min.js" ></script>
 <script language="javascript" type="text/javascript" src="{dede:global.cfg_templets_skin/}/js/pic_scroll.js"></script>
 <script language="javascript" type="text/javascript">

src/templets/default/tag.htm

@@ -6,7 +6,7 @@
 <meta name="keywords" content="{dede:field name='keywords'/}" />
 <meta name="description" content="{dede:field name='description' function='html2text(@me)'/}" />
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 </head>
 <body class="tagspage">
 {dede:include filename="head.htm"/}

src/templets/default/taglist.htm

@@ -6,7 +6,7 @@
 <meta name="keywords" content="{dede:field name='keywords'/}" />
 <meta name="description" content="{dede:field name='description' function='html2text(@me)'/}" />
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 </head>
 <body class="articlelist">
 {dede:include filename="head.htm"/}

src/templets/plus/comments_frame.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
 <title>comment</title>
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script>
 function CheckLogin(){
 	var taget_obj = document.getElementById('_ajax_feedback');

src/templets/plus/feedback_confirm.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
 <title>用户评论：{dede:global.title/}</title>
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<script language="javascript" type="text/javascript" src="../include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="../static/js/dedeajax2.js"></script>
 <script language="javascript">
 function postDigg(ftype,aid)
 {

src/templets/plus/feedback_templet.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
 <title>用户评论：{dede:global.title/}</title>
 <link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/include/dedeajax2.js"></script>
+<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
 <script language="javascript">
 function postBadGood(ftype,fid)
 {

src/templets/plus/post_diyform.htm

@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title><?php echo $diy->name;?> - powered by dedecms</title>
+<title><?php echo $diy->name;?> - Powered by DedeCMS</title>
 <link href="img/nspage.css" rel="stylesheet" type="text/css" />
-<script language="javascript" src="../include/dedeajax2.js"></script>
+<script language="javascript" src="../static/js/dedeajax2.js"></script>
 </head>
 <body>