DedeBIZ
/
DedeV6
보기 2
좋아요 0
포크 0
코드 풀 리퀘스트 0 릴리즈 29 활동
소스 검색

修复

tags/6.3.2
叙述、别离 5 달 전
부모
684a1410b7
커밋
84dddbf5c3
5개의 변경된 파일과 68개의 추가작업 그리고 41개의 파일을 삭제
통합 보기
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -8
      src/admin/dialog/select_images.php
  2. +24
    -16
      src/admin/dialog/select_media.php
  3. +10
    -4
      src/admin/dialog/select_soft.php
  4. +17
    -12
      src/admin/dialog/select_templets.php
  5. +1
    -1
      src/user/content_list.php

+ 16
- 8
src/admin/dialog/select_images.php 파일 보기

@@ -126,11 +126,15 @@ if (!empty($iseditor)) {
</div>"; </div>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
$line = "<div class='list'> $line = "<div class='list'>
<a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle> <a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
<img src='$reurl' title='$file'> <img src='$reurl' title='$file'>
@@ -139,11 +143,15 @@ if (!empty($iseditor)) {
</div>"; </div>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(jpg)#i", $file)) { } else if (preg_match("#\.(jpg)#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
$line = "<div class='list'> $line = "<div class='list'>
<a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle> <a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
<img src='$reurl' title='$file'> <img src='$reurl' title='$file'>


+ 24
- 16
src/admin/dialog/select_media.php 파일 보기

@@ -115,11 +115,13 @@ if (!empty($noeditor)) {
</tr>"; </tr>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -127,11 +129,13 @@ if (!empty($noeditor)) {
</tr>"; </tr>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(wmv|avi)#i", $file)) { } else if (preg_match("#\.(wmv|avi)#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -139,11 +143,13 @@ if (!empty($noeditor)) {
</tr>"; </tr>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -151,11 +157,13 @@ if (!empty($noeditor)) {
</tr>"; </tr>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(mp3|wma)#", $file)) { } else if (preg_match("#\.(mp3|wma)#", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
$reurl = preg_replace("#^\.\.#", "", $reurl);
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>


+ 10
- 4
src/admin/dialog/select_soft.php 파일 보기

@@ -117,8 +117,11 @@ if (!empty($noeditor)) {
} else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = preg_replace("#^\.\.#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_zip.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_zip.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -128,8 +131,11 @@ if (!empty($noeditor)) {
} else { } else {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = preg_replace("#^\.\.#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
$reurl = $remoteupUrl.$reurl;
} else {
$reurl = $reurl;
}
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_exe.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_exe.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>


+ 17
- 12
src/admin/dialog/select_templets.php 파일 보기

@@ -106,9 +106,10 @@ if (empty($comeback)) {
echo "$line"; echo "$line";
} else if (preg_match("#\.(htm|html)#i", $file)) { } else if (preg_match("#\.(htm|html)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl);
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'"; if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_htm.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_htm.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -116,11 +117,11 @@ if (empty($comeback)) {
</tr>"; </tr>";
echo "$line"; echo "$line";
} else if (preg_match("#\.(css)#i", $file)) { } else if (preg_match("#\.(css)#i", $file)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl); $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_css.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_css.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -129,9 +130,10 @@ if (empty($comeback)) {
echo "$line"; echo "$line";
} else if (preg_match("#\.(js)#i", $file)) { } else if (preg_match("#\.(js)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl);
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'"; if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_js.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_js.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -140,9 +142,10 @@ if (empty($comeback)) {
echo "$line"; echo "$line";
} else if (preg_match("#\.(jpg)#i", $file)) { } else if (preg_match("#\.(jpg)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl);
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'"; if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -151,9 +154,10 @@ if (empty($comeback)) {
echo "$line"; echo "$line";
} else if (preg_match("#\.(gif|png)#i", $file)) { } else if (preg_match("#\.(gif|png)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl);
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'"; if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>
@@ -162,9 +166,10 @@ if (empty($comeback)) {
echo "$line"; echo "$line";
} else if (preg_match("#\.(txt)#i", $file)) { } else if (preg_match("#\.(txt)#i", $file)) {
$reurl = "$activeurl/$file"; $reurl = "$activeurl/$file";
$reurl = preg_replace("#^\.\.#", "", $reurl);
$reurl = preg_replace("#\.\.#", "", $reurl);
$reurl = preg_replace("#".$templetdir."/#", "", $reurl);
if ($file == $comeback) $lstyle = "class='text-danger'"; if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = "";
else $lstyle = '';
$line = "<tr> $line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_text.png'> $file</a></td> <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_text.png'> $file</a></td>
<td>$filesize KB</td> <td>$filesize KB</td>


+ 1
- 1
src/user/content_list.php 파일 보기

@@ -42,7 +42,7 @@ if ($cid == 0) {
$positionname = $row['typename']; $positionname = $row['typename'];
} }
} else { } else {
$positionname = str_replace($cfg_list_symbol, "", $tl->GetPositionName())." ";
$positionname = str_replace($cfg_list_symbol, " - ", $tl->GetPositionName())." ";
} }
$whereSql = " where arc.channel = '$channelid' And arc.mid='$mid' "; $whereSql = " where arc.channel = '$channelid' And arc.mid='$mid' ";
if ($keyword != '') { if ($keyword != '') {


쓰기 미리보기
불러오는 중...
취소
저장