图片文档弹出层和文件管理与模板管理文件按名称排序

src/admin/dialog/select_images.php

@@ -155,10 +155,10 @@ a{text-decoration:none!important}
             <td class="linerow" colspan="4">点击图片预览，点击图片名选择图片，显示图片后点击该图片关闭预览</td>
         </tr>
         <?php
-        $dh = dir($inpath);
+        $dh = scandir($inpath);
         $ty1 = "";
         $ty2 = "";
-        while ($file = $dh->read()) {
+        foreach ($dh as $file) {
             //计算文件大小和创建时间
             if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
                 $filesize = filesize("$inpath/$file");
@@ -181,7 +181,7 @@ a{text-decoration:none!important}
                 $line = "<tr>
                 <td class='linerow' colspan='2'>
                 <a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode($tmp).$addparm."'><img src='../../static/web/img/dir2.gif'>上级目录</a></td>
-                <td colspan='2' class='linerow'>当前目录:$activepath</td>
+                <td colspan='2' class='linerow'>当前目录：$activepath</td>
                 </tr>";
                 echo $line;
             } else if (is_dir("$inpath/$file")) {
@@ -222,7 +222,6 @@ a{text-decoration:none!important}
                 echo "$line";
             }
         }//End Loop
-        $dh->close();
         ?>
         </tr>
     </table>

src/admin/dialog/select_media.php

@@ -90,10 +90,10 @@ a{text-decoration:none!important}
             <td width="30%" align="center" class="linerow">最后修改时间</td>
         </tr>
         <?php
-        $dh = dir($inpath);
+        $dh = scandir($inpath);
         $ty1 = "";
         $ty2 = "";
-        while ($file = $dh->read()) {
+        foreach ($dh as $file) {
             //计算文件大小和创建时间
             if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
                 $filesize = filesize("$inpath/$file");
@@ -178,7 +178,6 @@ a{text-decoration:none!important}
                 echo "$line";
             }
         }//End Loop
-        $dh->close();
         ?>
     </table>
 </body>

src/admin/dialog/select_soft.php

@@ -98,9 +98,9 @@ a{text-decoration:none!important}
                         <td width="30%" class="linerow">修改时间</td>
                     </tr>
                     <?php
-                    $dh = dir($inpath);
-                    $ty1 = $ty2 = '';
-                    while ($file = $dh->read()) {
+					$dh = scandir($inpath);
+					$ty1 = $ty2 = "";
+					foreach ($dh as $file) {
                         //计算文件大小和创建时间
                         if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
                             $filesize = filesize("$inpath/$file");
@@ -161,7 +161,6 @@ a{text-decoration:none!important}
                             echo "$line";
                         }
                     }//End Loop
-                    $dh->close();
                     ?>
                 </table>
             </td>

src/admin/dialog/select_templets.php

@@ -76,10 +76,10 @@ a{text-decoration:none!important}
             <td width="30%" class="linerow">修改时间</td>
         </tr>
         <?php
-        $dh = dir($inpath);
+        $dh = scandir($inpath);
         $ty1 = "";
         $ty2 = "";
-        while ($file = $dh->read()) {
+        foreach ($dh as $file) {
             //计算文件大小和创建时间
             if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
                 $filesize = filesize("$inpath/$file");
@@ -102,7 +102,7 @@ a{text-decoration:none!important}
                     $tmp = preg_replace("#[\/][^\/]*$#", "", $activepath);
                     $line = "<tr>
                     <td class='linerow'><a href='select_templets.php?f=$f&activepath=".urlencode($tmp)."'><img src='../../static/web/img/dir2.gif'>上级目录</a></td>
-                    <td colspan='2' class='linerow'>当前目录:$activepath</td>
+                    <td colspan='2' class='linerow'>当前目录：$activepath</td>
                     </tr>\r\n";
                       echo $line;
                 } else if (is_dir("$inpath/$file")) {
@@ -187,7 +187,6 @@ a{text-decoration:none!important}
                     echo "$line";
                 }
             }//End Loop
-            $dh->close();
             ?>
         </table>
     </body>

src/admin/templets/file_manage_main.htm

@@ -22,11 +22,11 @@
       <td width="30%" background="../static/web/img/wbg.gif">操作</td>
     </tr>
     <?php
-$dh = dir($inpath);
-$ty1="";
-$ty2="";
+$dh = scandir($inpath);
+$ty1 = "";
+$ty2 = "";
 $files = $dirs = array();
-while(($file = $dh->read()) !== false)
+foreach ($dh as $file)
 {
 	if($file!="." && $file!=".." && !is_dir("$inpath/$file"))
 	{
@@ -58,10 +58,7 @@ while(($file = $dh->read()) !== false)
   <td height='26'>
   <a href=file_manage_main.php?activepath=".urlencode($tmp)."><img src='../static/web/img/dir2.gif'>上级目录</a>
   </td>
-  <td colspan='3'>
-   当前目录:$activepath &nbsp;
-
-   </td>
+  <td colspan='3'>当前目录：$activepath</td>
   </tr>";
 		$dirs[] = $line;
 	}
@@ -72,8 +69,8 @@ while(($file = $dh->read()) !== false)
 		$line = "\n<tr height='26' onMouseMove=\"javascript:this.bgColor='#F8FCF1';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
    <td>
     <a href=file_manage_main.php?activepath=".urlencode("$activepath/$file")."><img src='../static/web/img/dir.gif'>$file</a></td>
-   <td>　</td>
-   <td>　</td>
+   <td></td>
+   <td></td>
    <td>
    <a href=file_manage_view.php?filename=".urlencode($file)."&activepath=".urlencode($activepath)."&fmdo=rename class='btn btn-success btn-sm'><i class='fa fa-address-card-o'></i> 改名</a>
    <a href=file_manage_view.php?filename=".urlencode($file)."&activepath=".urlencode($activepath)."&type=dir&fmdo=del class='btn btn-success btn-sm'><i class='fa fa-trash'></i> 删除</a>
@@ -300,7 +297,6 @@ while(($file = $dh->read()) !== false)
 		$files[] = $line;
 	}
 }
-$dh->close();
 foreach ($dirs as $dir)
 {
 	echo $dir;
@@ -317,7 +313,7 @@ foreach ($files as $file)
         <a href='file_manage_view.php?fmdo=newdir&activepath=<?php echo urlencode($activepath)?>' class="btn btn-success btn-sm">新建目录</a>
         <a href='file_manage_view.php?fmdo=upload&activepath=<?php echo urlencode($activepath)?>' class="btn btn-success btn-sm">文件上传</a>
         <a href='file_manage_control.php?fmdo=space&activepath=<?php echo urlencode($activepath)?>' class="btn btn-success btn-sm">空间检查</a>
-        &nbsp;&nbsp;</td>
+      </td>
     </tr>
   </table>
 </body>

src/admin/templets/templets_default.htm

@@ -27,8 +27,7 @@ function DelTpl(filename) {
 		<tr>
 			<td colspan="4" height="26" bgcolor="#f8f8f8">
 				<span style="float:left;line-height:26px">
-				当前位置：
-				<?php
+				当前位置：<?php
       			if($acdir=='plus') echo '插件模板';
       			else if($acdir=='system') echo '底层模板';
       			else echo '核心模板 &gt; '.$acdir;
@@ -43,8 +42,7 @@ function DelTpl(filename) {
 		<?php
 		$files = scandir($templetdird);
 		foreach ($files as $filename){
-			if(!preg_match("#\.htm#", $filename))
-			continue;
+			if(!preg_match("#\.htm#", $filename)) continue;
 			$filetime = filemtime($templetdird.'/'.$filename);
 			$filetime = MyDate("Y-m-d H:i",$filetime);
 			$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename]:'未知模板');