Merge pull request #24 from dedetech/dev

常规更新合并

.gitignore

@@ -9,7 +9,7 @@ src/install/install_lock.txt
 src/install/index.php.bak
 src/install/index.html
 src/install/module-install.php.bak
-src/a/*
+src/a/*/
 src/uploads/allimg/*
 src/.txt
 src/data/enums/

src/a/.dede

@@ -0,0 +1 @@
+dedecms

src/dede/templets/article_add.htm

@@ -25,14 +25,12 @@ body { background-image: url(images/allbg.gif); }
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
 <script language='javascript' src="js/main.js"></script>
 <script type="text/javascript"src="js/handlers.js"></script>
-<script type="text/javascript" src="../images/swfupload/swfupload.js"></script>
 <script language="javascript" src="../static/js/jquery/jquery.js"></script>
 <script language="javascript" src="../static/js/jquery/ui.core.js"></script>
 <script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
 <script lang='javascript' src='js/tb-box.js'></script>
 <script language="javascript">
 <!--
-var swfu = null;
 var arctype = 'article';
 function checkSubmit()
 {
@@ -69,90 +67,9 @@ function viewVote()
 }
 window.onload = function ()
 {
-	swfu = new SWFUpload(
-	{
-		// Backend Settings
-		upload_url: "swfupload.php",
-		post_params: {"PHPSESSID": "<?php echo session_id(); ?>", "dopost" : "", "arctype" : arctype},
-
-		// File Upload Settings
-		file_size_limit : "2 MB",	// 2MB
-		file_types : "*.jpg; *.gif; *.png",
-		file_types_description : "选择 JPEG/GIF/PNG 格式图片",
-		file_upload_limit : "0",
-
-		file_queue_error_handler : fileQueueError,
-		file_dialog_complete_handler : fileDialogComplete,
-		upload_progress_handler : uploadProgress,
-		upload_error_handler : uploadError,
-		upload_success_handler : uploadSuccess,
-		upload_complete_handler : uploadComplete,
-
-		button_image_url : "../static/SmallSpyGlassWithTransperancy_17x18.png",
-		button_placeholder_id : "spanButtonPlaceholder",
-		button_width: '100%',
-		button_height: 26,
-		button_text : '<div class="button" style="background-color:#E5F1CF; height:26px; text-align:center; line-height:26px">上传图片(可多选)</div>',
-		button_text_style : '',
-		button_text_top_padding: 0,
-		button_text_left_padding: 10,
-		button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
-		button_cursor: SWFUpload.CURSOR.HAND,
-		
-		// Flash Settings
-		flash_url : "../static/swfupload/swfupload.swf",
 
-		custom_settings : {
-			upload_target : "divFileProgressContainer"
-		},
-		
-		// Debug Settings
-		debug: false
-	});
 };
 
-function addtoEdit(pid)
-{
-	jQuery.get('swfupload.php?dopost=addtoedit&id=' + pid, function(data)
-	{
-		var picTitle = jQuery('input[name="picinfook'+pid+'"]').val();
-		var picHTML = '<img src="'+data+'" alt="'+picTitle+'"/>';
-		CKEDITOR.instances.body.insertHtml(picHTML);
-	});
-}
-
-//删除已经上传的图片
-function delAlbPic(pid){
-	// 同步删除编辑器中插入的图片
-	jQuery("#__tmpbody").html();
-	jQuery.get('swfupload.php?dopost=addtoedit&id=' + pid, function(data)
-	{
-		var iptbody = CKEDITOR.instances.body.getData();
-		jQuery("#__tmpbody").html(iptbody);
-		jQuery("#__tmpbody").find('img').each(function()
-		{
-			if(jQuery(this).attr('src') == data)
-			{
-				//alert(data);
-				jQuery(this).remove();
-			}
-		});
-		CKEDITOR.instances.body.setData(jQuery("#__tmpbody").html()); 
-		jQuery("#__tmpbody").html();
-		var tgobj = $Obj('albCtok'+pid);
-		var myajax = new DedeAjax(tgobj);
-		myajax.SendGet2('swfupload.php?dopost=del&id='+pid);
-		$Obj('thumbnails').removeChild(tgobj);
-	});
-}
-
-//删除已经上传的图片(编辑时用)
-function delAlbPicOld(picfile, pid){
-	var tgobj = $Obj('albold'+pid);
-	var myajax = new DedeAjax(tgobj);
-	myajax.SendGet2('swfupload.php?dopost=delold&picfile='+picfile);
-	$Obj('thumbnailsEdit').removeChild(tgobj);
-}
 -->
 </script>
 </head>
@@ -427,13 +344,7 @@ function delAlbPicOld(picfile, pid){
         GetEditor("body",$body,450);
 	     ?>
 	    </td>
-      <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"><div class="multipic">
-      <div style="display: block;background-color:#E5F1CF; height:26px">
-								<span id="spanButtonPlaceholder"></span>
-	  </div>
-      <div id="divFileProgressContainer"></div>
-      <div id="thumbnails" style="width: 254px; height: 535px; background-color: rgb(255, 255, 255); overflow-y: scroll;"></div>
-      </div></td>
+      <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
     </tr>
   </table>
   <!-- //插入投票 -->

src/dede/templets/article_edit.htm

@@ -16,7 +16,6 @@ body {
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
 <script language="javascript" src="js/main.js"></script>
 <script type="text/javascript"src="js/handlers.js"></script>
-<script type="text/javascript" src="../static/swfupload/swfupload.js"></script>
 <script language="javascript" src="../static/js/jquery/jquery.js"></script>
 <script language="javascript" src="../static/js/jquery/ui.core.js"></script>
 <script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
@@ -58,111 +57,7 @@ function viewVote()
 }
 window.onload = function ()
 {
-	swfu = new SWFUpload(
-	{
-		// Backend Settings
-		upload_url: "swfupload.php",
-		post_params: {"PHPSESSID": "<?php echo session_id(); ?>", "dopost" : "", "arctype" : arctype,
-		"arcid":<?php echo $arcRow['id']?>},
-
-		// File Upload Settings
-		file_size_limit : "2 MB",	// 2MB
-		file_types : "*.jpg; *.gif; *.png",
-		file_types_description : "选择 JPEG/GIF/PNG 格式图片",
-		file_upload_limit : "0",
-
-		file_queue_error_handler : fileQueueError,
-		file_dialog_complete_handler : fileDialogComplete,
-		upload_progress_handler : uploadProgress,
-		upload_error_handler : uploadError,
-		upload_success_handler : uploadSuccess,
-		upload_complete_handler : uploadComplete,
-
-		button_image_url : "../static/SmallSpyGlassWithTransperancy_17x18.png",
-		button_placeholder_id : "spanButtonPlaceholder",
-		button_width: '100%',
-		button_height: 26,
-		button_text : '<div class="button" style="background-color:#E5F1CF; height:26px; text-align:center; line-height:26px">上传图片(可多选)</div>',
-		button_text_style : '',
-		button_text_top_padding: 0,
-		button_text_left_padding: 10,
-		button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
-		button_cursor: SWFUpload.CURSOR.HAND,
-		
-		// Flash Settings
-		flash_url : "../static/swfupload/swfupload.swf",
-
-		custom_settings : {
-			upload_target : "divFileProgressContainer"
-		},
-		
-		// Debug Settings
-		debug: false
-	});
 };
-
-function addtoEditOld(picurl,pid)
-{
-	var picTitle = jQuery('input[name="picinfook'+pid+'"]').val();
-	var picHTML = '<img src="'+picurl+'" alt="'+picTitle+'"/>';
-	CKEDITOR.instances.body.insertHtml(picHTML);
-}
-
-//删除已经上传的图片
-function delAlbPic(pid){
-	// 同步删除编辑器中插入的图片
-	jQuery("#__tmpbody").html();
-	jQuery.get('swfupload.php?dopost=addtoedit&id=' + pid, function(data)
-	{
-		var iptbody = CKEDITOR.instances.body.getData();
-		jQuery("#__tmpbody").html(iptbody);
-		jQuery("#__tmpbody").find('img').each(function()
-		{
-			if(jQuery(this).attr('src') == data)
-			{
-				//alert(data);
-				jQuery(this).remove();
-			}
-		});
-		CKEDITOR.instances.body.setData(jQuery("#__tmpbody").html()); 
-		jQuery("#__tmpbody").html();
-		var tgobj = $Obj('albCtok'+pid);
-		var myajax = new DedeAjax(tgobj);
-		myajax.SendGet2('swfupload.php?dopost=del&id='+pid);
-		$Obj('thumbnails').removeChild(tgobj);
-	});
-}
-
-function addtoEdit(pid)
-{
-	jQuery.get('swfupload.php?dopost=addtoedit&id=' + pid, function(data)
-	{
-		var picTitle = jQuery('input[name="picinfook'+pid+'"]').val();
-		var picHTML = '<img src="'+data+'" alt="'+picTitle+'"/>';
-		CKEDITOR.instances.body.insertHtml(picHTML);
-	});
-}
-
-//删除已经上传的图片(编辑时用)
-function delAlbPicOld(picfile, pid){
-	var iptbody = CKEDITOR.instances.body.getData();
-	jQuery("#__tmpbody").html(iptbody);
-	jQuery("#__tmpbody").find('img').each(function()
-	{
-		if(jQuery(this).attr('src') == picfile)
-		{
-			//alert(data);
-			jQuery(this).remove();
-		}
-	});
-	CKEDITOR.instances.body.setData(jQuery("#__tmpbody").html()); 
-	jQuery("#__tmpbody").html();
-	
-	var tgobj = $Obj('albold'+pid);
-	var myajax = new DedeAjax(tgobj);
-	myajax.SendGet2('swfupload.php?dopost=delold&picfile='+picfile);
-	$Obj('thumbnailsEdit').removeChild(tgobj);
-}
 -->
 </script>
 </head>
@@ -345,31 +240,7 @@ if($cfg_need_typeid2=='Y') {
     </tr>
     <tr>
       <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
-      <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"><div class="multipic">
-          <div style="display: block;background-color:#E5F1CF; height:26px"> <span id="spanButtonPlaceholder"></span> </div>
-          <div id="divFileProgressContainer"></div>
-          
-          
-          <div id="thumbnailsEdit" style="width: 254px; height: 535px; background-color: rgb(255, 255, 255); overflow-y: scroll;">
-          <?php
-           //var_dump("SELECT * FROM `#@__uploads` WHERE arcid = {$addRow['aid']}");
-            $dsql->SetQuery("SELECT * FROM `#@__uploads` WHERE arcid = {$addRow['aid']}");
-            $dsql->Execute();
-            while($trow = $dsql->GetArray())
-            {
-          ?>
-            <div class="albCt" id="albold<?php echo $trow['aid'];?>"><img width="120" onclick="addtoEditOld('<?php echo $trow['url'];?>',<?php echo $trow['aid'];?>)" src="<?php echo $trow['url'];?>" style="cursor:pointer"><a href="javascript:delAlbPicOld('<?php echo $trow['url'];?>', <?php echo $trow['aid'];?>)">[删除]</a>
-              <div style="margin-top:10px">注释：
-                <input type="text" style="width:100px;" value="<?php echo $trow['title'];?>" name="picinfook<?php echo $trow['aid'];?>">
-              </div>
-            </div>
-            <?php
-            }
-            ?>
-            <div id="thumbnails"></div>
-          </div>
-          
-        </div></td>
+      <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
     </tr>
   </table>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="votehead" style="margin-top:10px;">

src/install/index.php

@@ -414,17 +414,3 @@ else if($step==10)
     @mysql_close($conn);
     exit();
 }
-else if($step==11)
-{
-	require_once('../data/admin/config_update.php');
-	$rmurl = UPDATEHOST."dedecms/demodata.{$s_lang}.txt";
-	$sql_content = file_get_contents($rmurl);
-	$fp = fopen(INSTALL_DEMO_NAME,'w');
-	if(fwrite($fp,$sql_content))
-		echo '&nbsp; <font color="green">[√]</font> 存在(您可以选择安装进行体验)';
-	else
-		echo '&nbsp; <font color="red">[×]</font> 远程获取失败';
-	unset($sql_content);
-	fclose($fp);
-	exit();
-}

src/install/templates/step-1.html

@@ -44,7 +44,7 @@
 		<div class="pr-agreement">
 				<p>版权所有 (c)2003-2020，DedeCMS.com 保留所有权利。 </p>
 				<p>感谢您选择织梦内容管理系统（以下简称DedeCMS），DedeCMS是目前国内最强大、最稳定的中小型门户网站建设解决方案之一，基于 PHP + MySQL   的技术开发，全部源码开放。</p>
-				<p>DedeCMS 的官方网址是： <a href="http://www.dedecms.com" target="_blank">www.dedecms.com</a> 交流论坛：<a href="http://bbs.dedecms.com" target="_blank"> bbs.dedecms.com</a></p>
+				<p>DedeCMS 的官方网址是： <a href="http://www.dedecms.com" target="_blank">www.dedecms.com</a> 交流论坛：<a href="http://bbs.dedecms.com" target="_blank"> bbs.dedecms.com</a> 代码托管：<a href="https://www.zhelixie.com/DesDev" target="_blank">www.zhelixie.com/DesDev（国内）</a>、<a href="https://github.com/dedetech" target="_blank">github.com/dedetech（国外）</a></p>
 				<p>为了使你正确并合法的使用本软件，请你在使用前务必阅读清楚下面的协议条款：</p>
 			<strong>一、本授权协议适用且仅适用于 DedeCMS 5.x.x 版本，DedeCMS官方对本授权协议的最终解释权。</strong>
 			<strong>二、协议许可的权利 </strong>
@@ -64,7 +64,7 @@
 				<p>3、电子文本形式的授权协议如同双方书面签署的协议一样，具有完全的和等同的法律效力。您一旦开始确认本协议并安装   DedeCMS，即被视为完全理解并接受本协议的各项条款，在享有上述条款授予的权力的同时，受到相关的约束和限制。协议许可范围以外的行为，将直接违反本授权协议并构成侵权，我们有权随时终止授权，责令停止损害，并保留追究相关责任的权力。</p>
 				<p>4、如果本软件带有其它软件的整合API示范例子包，这些文件版权不属于本软件官方，并且这些文件是没经过授权发布的，请参考相关软件的使用许可合法的使用。</p>
 				<p><b>协议发布时间：</b> 2008年1月18日</p>
-				<p><b>版本最新更新：</b> 2011年2月21日 By DedeCMS.com</p>
+				<p><b>版本最新更新：</b> 2020年6月3日 By DedeCMS.com</p>
 		</div>
 		<div class="btn-box">
 			<input name="readpact" type="checkbox" id="readpact" value="" /><label for="readpact"><strong class="fc-690 fs-14">我已经阅读并同意此协议</strong></label>

src/install/templates/step-3.html

@@ -31,15 +31,6 @@
         myajax.SendGet2('index.php?step=10&dbhost='+dbhost+'&dbuser='+dbuser+'&dbpwd='+dbpwd+'&dbname='+dbname);
 		DedeXHTTP = null;
     }
-    
-	function GetRemoteDemo()
-	{
-		
-		$o('_remotesta').innerHTML='<img src=\'images/ajax-loader.gif\'>';
-		var myajax = new DedeAjax($o('_remotesta'),false,true,'-','-','...');
-		myajax.SendGet2('index.php?step=11');
-		DedeXHTTP = null;
-	}
 	
     function DoInstall()
     {
@@ -97,7 +88,7 @@
             <tr>
                 <td style='line-height:180%'>
                     <b>默认已安装模块(不需要可在后台卸载)：</b><br />
-                    百度新闻、文件管理器、挑错管理、德得广告管理、投票模块、友情链接<br />
+                    百度新闻、文件管理器、挑错管理、投票模块、友情链接<br />
                     <b>已下载并可选安装的：（不能选中的为未下载）</b><br />
                     <div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'0a7bea5dbe571d35def883cbec796437')){?>disabled = 'true'<?php }?> value='0a7bea5dbe571d35def883cbec796437' /> 留言簿模块</div>
                     <div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'59155be87ea60c5c65ec1f7a46a0fc9d')){?>disabled = 'true'<?php }?> value='59155be87ea60c5c65ec1f7a46a0fc9d' /> 手机WAP浏览</div>
@@ -213,31 +204,6 @@
             </tr>
         </table>
         
-      <div class="pr-title"><h3>安装测试体验数据</h3></div>
-        <table width="726" border="0" align="center" cellpadding="0" cellspacing="0" class="twbox">
-			<tr>
-				<td width="168"><strong> 
-			      初始化数据体验包</strong>：</td>
-                 <?php
-                   if($isdemosign == 0)
-                   {
-                  ?>
-				<td width="558"><div class="olink" id="_remotesta"><div style="float:left">&nbsp; <font color="red">[×]</font> 不存在</div><a href="javascript:GetRemoteDemo()">远程获取</a></div></td>
-				<?php
-                   } else {
-                 ?>
-                <td width="558">&nbsp; <font color="green">[√]</font> 存在(您可以选择安装进行体验)</td>   
-                 <?php
-                 }
-                 ?>
-          </tr>
-            <tr>
-                <td colspan="2"><label for="installdemo"><strong> 
-                    <input name="installdemo" type="checkbox" id="installdemo" value="1" />
-                安装初始化数据进行体验</strong>(体验数据将含带DedeCMS大部分功能的应用操作示例)</label></td>
-          </tr>
-        </table>
-
         <div class="btn-box">
     <input type="button" class="btn-back" value="后退" onclick="window.location.href='index.php?step=2';" />
             <input type="button" class="btn-next" value="开始安装" onclick="DoInstall();" />

src/install/templates/step-5.html

@@ -47,8 +47,8 @@
 			<?php echo $errmsg; ?>
 		</div>
 		<div class="over-link">
-			<a href="../dede/">访问后台</a>
-			<a href="../index.php?upcache=1">查看站点</a>
+			<a href="../dede" target="_blank">管理后台</a>
+			<a href="../index.php?upcache=1" target="_blank">网站首页</a>
 		</div>
 		<div class="install-msg">
 			或者访问织梦网站:<br />
@@ -57,6 +57,7 @@
 			<a href="http://www.dedecms.com" target="_blank">织梦官方网站</a>
 			<a href="http://bbs.dedecms.com" target="_blank">织梦论坛</a>
 			<a href="http://help.dedecms.com" target="_blank">帮助中心</a>
+			<a href="https://www.zhelixie.com/DesDev" target="_blank">DedeCMS代码（国内）</a>
 		</div>
 	</div>
 </div>

src/plus/vdimgck.php

@@ -35,7 +35,7 @@ if (!echo_validate_image($config))
     // 如果不成功则初始化一个默认验证码
     @session_start();
     $_SESSION['securimage_code_value'] = strtolower('abcd');
-    $im = @imagecreatefromjpeg(dirname(__FILE__).'/data/vdcode.jpg');
+    $im = @imagecreatefromjpeg(DEDEINC.'/data/vdcode.jpg');
     header("Pragma:no-cache\r\n");
     header("Cache-Control:no-cache\r\n");
     header("Expires:0\r\n");