diff --git a/.gitignore b/.gitignore
index 3202f424..3b0378bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ src/uploads/*.php
 src/data/time.lock.inc
 src/m/index.html
 src/uploads/userup
+src/uploads/20*
diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php
index d636c95a..69669e23 100755
--- a/src/dede/dialog/select_images.php
+++ b/src/dede/dialog/select_images.php
@@ -62,7 +62,7 @@ if (!empty($noeditor))
 <head>
 <meta http-equiv='Content-Type' content='text/html; charset=<?php echo $cfg_soft_lang; ?>'>
 <title>图片浏览器</title>
-<link href='../../images/img/base.css' rel='stylesheet' type='text/css'>
+<link href='../../static/img/base.css' rel='stylesheet' type='text/css'>
 <style>
 .linerow {border-bottom: 1px solid #CBD8AC;}
 .napisdiv {left:40;top:3;width:150px;height:100px;position:absolute;z-index:3;display:none;}
@@ -76,7 +76,7 @@ function ChangeImage(surl){ document.getElementById('picview').src = surl; }
 <div id="floater" class="napisdiv">
 <a href="javascript:nullLink();" onClick="document.getElementById('floater').style.display='none';"><img src='img/picviewnone.gif' id='picview' border='0' alt='单击关闭预览'></a>
 </div>
-<SCRIPT language=JavaScript src="js/float.js"></SCRIPT>
+<SCRIPT language=JavaScript src="../js/float.js"></SCRIPT>
 <SCRIPT language=JavaScript>
 function nullLink(){ return; }
 function ChangeImage(surl){ document.getElementById('floater').style.display='block';document.getElementById('picview').src = surl; }
@@ -191,7 +191,7 @@ while($file = $dh->read()) {
    </tr>";
         echo "$line";
     }
-    else if(preg_match("#\.(gif|png)#i", $file))
+    else if(preg_match("#\.(".$cfg_imgtype.")#i", $file))
     {
         $reurl = "$activeurl/$file";
         $reurl = preg_replace("#^\.\.#", "", $reurl);
diff --git a/src/dede/imagecut.php b/src/dede/imagecut.php
index 5b956698..2267305b 100755
--- a/src/dede/imagecut.php
+++ b/src/dede/imagecut.php
@@ -14,7 +14,7 @@ if(empty($action))
 {
     if(!@is_file($cfg_basedir.$file))
     {
-        ShowMsg("对不起，必须选择站内的图片才能进行裁剪！<br />点击'<a href='/include/dialog/select_images.php?f=form1.picname&imgstick=small'>站内选择</a>', 上传或选择一个图片，然后才能进行裁剪！", "../include/dialog/select_images.php?f=form1.picname&imgstick=small", 0 , 10000);
+        ShowMsg("对不起，必须选择站内的图片才能进行裁剪！<br />点击'<a href='./dialog/select_images.php?f=form1.picname&imgstick=small'>站内选择</a>', 上传或选择一个图片，然后才能进行裁剪！", "./dialog/select_images.php?f=form1.picname&imgstick=small", 0 , 10000);
         exit();
     }
     include DEDEADMIN.'/templets/imagecut.htm';
diff --git a/src/dede/js/main.js b/src/dede/js/main.js
index 9ad229d5..a2fe39ca 100755
--- a/src/dede/js/main.js
+++ b/src/dede/js/main.js
@@ -154,21 +154,21 @@ function SelectFlash()
 {
 	if($Nav()=='IE'){ var posLeft = window.event.clientX-300; var posTop = window.event.clientY; }
 	else{ var posLeft = 100; var posTop = 100; }
-	window.open("../include/dialog/select_media.php?f=form1.flashurl", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=500,height=350,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_media.php?f=form1.flashurl", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=500,height=350,left="+posLeft+", top="+posTop);
 }
 
 function SelectMedia(fname)
 {
 	if($Nav()=='IE'){ var posLeft = window.event.clientX-200; var posTop = window.event.clientY; }
 	else{ var posLeft = 100;var posTop = 100; }
-	window.open("../include/dialog/select_media.php?f="+fname, "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=500,height=350,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_media.php?f="+fname, "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=500,height=350,left="+posLeft+", top="+posTop);
 }
 
 function SelectSoft(fname)
 {
 	if($Nav()=='IE'){ var posLeft = window.event.clientX-200; var posTop = window.event.clientY-50; }
 	else{ var posLeft = 100; var posTop = 100; }
-	window.open("../include/dialog/select_soft.php?f="+fname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_soft.php?f="+fname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 
 function SelectImage(fname,stype,imgsel)
@@ -178,7 +178,7 @@ function SelectImage(fname,stype,imgsel)
 	if(!fname) fname = 'form1.picname';
 	if(imgsel) imgsel = '&noeditor=yes';
 	if(!stype) stype = '';
-	window.open("../include/dialog/select_images.php?f="+fname+"&noeditor=yes&imgstick="+stype+imgsel, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=650,height=400,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_images.php?f="+fname+"&noeditor=yes&imgstick="+stype+imgsel, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=650,height=400,left="+posLeft+", top="+posTop);
 }
 
 function imageCut(fname)
@@ -200,7 +200,7 @@ function SelectImageN(fname,stype,vname)
 	else{ var posLeft = 100; var posTop = 100; }
 	if(!fname) fname = 'form1.picname';
 	if(!stype) stype = '';
-	window.open("../include/dialog/select_images.php?f="+fname+"&imgstick="+stype+"&v="+vname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_images.php?f="+fname+"&imgstick="+stype+"&v="+vname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 
 function SelectKeywords(f)
diff --git a/src/dede/media_main.php b/src/dede/media_main.php
index 5d12cacb..d46e06af 100755
--- a/src/dede/media_main.php
+++ b/src/dede/media_main.php
@@ -72,7 +72,7 @@ function MediaType($tid,$nurl)
 {
     if($tid==1)
     {
-        return "图片<a href=\"javascript:;\" onClick=\"ChangeImage('$nurl');\"><img src='../include/dialog/img/picviewnone.gif' name='picview' border='0' alt='预览'></a>";
+        return "图片<a href=\"javascript:;\" onClick=\"ChangeImage('$nurl');\"><img src='./dialog/img/picviewnone.gif' name='picview' border='0' alt='预览'></a>";
     }
     else if($tid==2)
     {
diff --git a/src/dede/templets/group_edit.htm b/src/dede/templets/group_edit.htm
index 045a6176..752e1791 100755
--- a/src/dede/templets/group_edit.htm
+++ b/src/dede/templets/group_edit.htm
@@ -26,7 +26,7 @@ function SelectImage(fname,vlist){
      var posLeft = 100;
      var posTop = 100;
    }
-   window.open("../include/dialog/select_images.php?f="+fname+"&imgstick="+vlist, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+   window.open("./dialog/select_images.php?f="+fname+"&imgstick="+vlist, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 </script>
 </head>
diff --git a/src/dede/templets/media_main.htm b/src/dede/templets/media_main.htm
index 75c541bc..4066aad6 100755
--- a/src/dede/templets/media_main.htm
+++ b/src/dede/templets/media_main.htm
@@ -49,8 +49,8 @@ function DelSel(){
 </head>
 <body background="images/allbg.gif" leftmargin="8" topmargin="8">
 <div id="floater" class="napisdiv">
-<a href="javascript:;" onClick="ChangeImage('../include/dialog/img/picviewnone.gif');">
-	<img src='../include/dialog/img/picviewnone.gif' id='picview' name='picview' border='0' alt='单击关闭预览' style='z-index:10000'>
+<a href="javascript:;" onClick="ChangeImage('./dialog/img/picviewnone.gif');">
+	<img src='./dialog/img/picviewnone.gif' id='picview' name='picview' border='0' alt='单击关闭预览' style='z-index:10000'>
 </a>
 </div>
 <SCRIPT language=JavaScript src="js/float.js"></SCRIPT>
diff --git a/src/dede/templets/spec_add.htm b/src/dede/templets/spec_add.htm
index 227943ae..06ee72c0 100755
--- a/src/dede/templets/spec_add.htm
+++ b/src/dede/templets/spec_add.htm
@@ -40,7 +40,7 @@ function SelectArcList(fname){
 function SelectImage(fname,vlist){
 	var posLeft = 10;
 	var posTop = 10;
-	window.open("../include/dialog/select_images.php?f="+fname+"&imgstick="+vlist, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
+	window.open("./dialog/select_images.php?f="+fname+"&imgstick="+vlist, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
 }
 
 function SelectTemplets(fname){
