更新

docs/changelog.md

@@ -10,6 +10,10 @@
 - 优化后台和前台资源整理一起方便维护；
 - 优化会员中心资料修改繁琐问题；
 - 优化默认模板和插件模板；
+- 优化自定义表单搜索；
+- 优化标签管理搜索；
+- 优化列表分页省略号功能；
+- 优化静态栏目时不生成目录文件夹；
 - 修正谷歌浏览器错误提示；
 - 修正伪静态栏目开启绝对链接问题；
 - 修正富文本的错误问题；

src/admin/action_search.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 require_once(dirname(__FILE__)."/actionsearch_class.php");
 //添加权限检查
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $keyword = empty($keyword) ? "" : RemoveXss($keyword);
 $actsearch = new ActionSearch($keyword);
 $asresult = $actsearch->Search();

src/admin/ad_add.php

@@ -11,7 +11,7 @@
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_广告管理');
 require_once DEDEINC."/typelink/typelink.class.php";
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == "save") {
     CheckCSRF();
     //timeset tagname typeid normbody expbody
@@ -30,24 +30,24 @@ if ($dopost == "save") {
         $normbody = "<a href=\"{$link}\" font-size=\"{$normbody['size']}\" color=\"{$normbody['color']}\">{$normbody['title']}</a>";
     } else if ($normbody['style'] == 'img') {
         if (empty($normbody['width'])) {
-            $width = "";
+            $width = '';
         } else {
             $width = " width=\"{$normbody['width']}\"";
         }
         if (empty($normbody['height'])) {
-            $height = "";
+            $height = '';
         } else {
             $height = "height=\"{$normbody['height']}\"";
         }
         $normbody = "<a href=\"{$link}\"><img src=\"{$normbody['url']}\"$width $height></a>";
     } else {
         if (empty($normbody['width'])) {
-            $width = "";
+            $width = '';
         } else {
             $width = " width=\"{$normbody['width']}\"";
         }
         if (empty($normbody['height'])) {
-            $height = "";
+            $height = '';
         } else {
             $height = "height=\"{$normbody['height']}\"";
         }

src/admin/album_add.php

@@ -46,7 +46,7 @@ if ($dopost != 'save') {
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
     if (!isset($ddisfirst)) $ddisfirst = 0;
-    if (!isset($albums)) $albums = "";
+    if (!isset($albums)) $albums = '';
     if (!isset($delzip)) $delzip = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
     if (trim($title) == '') {

src/admin/album_edit.php

@@ -58,7 +58,7 @@ if ($dopost != 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
-    if (!isset($albums)) $albums = "";
+    if (!isset($albums)) $albums = '';
     if (!isset($formzip)) $formzip = 0;
     if (!isset($ddisfirst)) $ddisfirst = 0;
     if (!isset($delzip)) $delzip = 0;

src/admin/article_description_main.php

@@ -31,7 +31,7 @@ if ($dojob == '') {
     //获取自动摘要
     if ($dojob == 'des') {
         if (empty($totalnum)) {
-            $addquery  = "";
+            $addquery  = '';
             if ($sid != 0) {
                 $addquery  .= " AND id>='$sid' ";
             }
@@ -43,7 +43,7 @@ if ($dojob == '') {
             $totalnum = $row['dd'];
         }
         if ($totalnum > 0) {
-            $addquery  = "";
+            $addquery  = '';
             if ($sid != 0) {
                 $addquery  .= " AND `#@__archives`.id>='$sid' ";
             }
@@ -92,7 +92,7 @@ if ($dojob == '') {
     //更新自动分页
     if ($dojob == 'page') {
         require_once(DEDEADMIN."/inc/inc_archives_functions.php");
-        $addquery  = "";
+        $addquery  = '';
         if ($sid != 0) {
             $addquery  .= " and aid>='$sid' ";
         }
@@ -111,7 +111,7 @@ if ($dojob == '') {
         } else if (($totalnum - $startdd) > 0) {
             $limitSql = " LIMIT $startdd,".($totalnum - $startdd);
         } else {
-            $limitSql = "";
+            $limitSql = '';
         }
         $tjnum = $startdd;
         if ($limitSql != "") {

src/admin/article_keywords_select.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php");
 require_once(DEDEINC."/datalistcp.class.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
 $f = RemoveXSS($f);
-if (empty($keywords)) $keywords = "";
+if (empty($keywords)) $keywords = '';
 $sql = "SELECT * FROM `#@__keywords` ORDER BY `rank` DESC";
 $dlist = new DataListCP();
 $dlist->SetTemplate(DEDEADMIN."/templets/article_keywords_select.htm");

src/admin/cards_manage.php

@@ -13,7 +13,7 @@ require_once(DEDEINC.'/datalistcp.class.php');
 $dopost = empty($dopost) ? "" : $dopost;
 if ($dopost == "delete") {
     $ids = explode('`', $aids);
-    $dquery = "";
+    $dquery = '';
     foreach ($ids as $id) {
         if ($dquery == "") $dquery .= "aid='$id' ";
         else $dquery .= " OR aid='$id' ";

src/admin/cards_type.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__).'/config.php');
 CheckPurview('member_Type');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 //保存修改
 if ($dopost == "save") {
     $startID = 1;

src/admin/catalog_add.php

@@ -137,7 +137,7 @@ if ($dopost == 'quick') {
         ShowMsg("跨站调用秘钥不能为空", "-1");
         exit();
     }
-    if ($ispart != 2) {
+    if ($ispart != 2 && $isdefault != -1) {
         //栏目的参照目录
         if ($referpath == 'cmspath') $nextdir = '{cmspath}';
         if ($referpath == 'basepath') $nextdir = '';

src/admin/catalog_do.php

@@ -63,7 +63,7 @@ else if ($dopost == "listArchives") {
         $row = $dsql->GetOne("SELECT typename,id,mancon FROM `#@__channeltype` WHERE id='$channelid'");
         $gurl = $row["mancon"];
         $channelid = $row["id"];
-        $typename = "";
+        $typename = '';
         $channelname = $row["typename"];
     }
     if (empty($gurl)) $gurl = 'content_list.php';

src/admin/content_list.php

@@ -168,7 +168,7 @@ $dlist->SetParameter('orderby', $orderby);
 $dlist->SetParameter('arcrank', $arcrank);
 $dlist->SetParameter('channelid', $channelid);
 $dlist->SetParameter('f', $f);
-$strTimerange = "";
+$strTimerange = '';
 if ($stime > 0 && $etime > 0) {
     $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime)));
     $dlist->SetParameter('timerange', $strTimerange);

src/admin/content_sg_list.php

@@ -80,7 +80,7 @@ $dlist->SetParameter("dopost", "listArchives");
 $dlist->SetParameter("keyword", $keyword);
 $dlist->SetParameter("cid", $cid);
 $dlist->SetParameter("channelid", $channelid);
-$strTimerange = "";
+$strTimerange = '';
 if ($stime > 0 && $etime > 0) {
     $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime)));
     $dlist->SetParameter('timerange', $strTimerange);

src/admin/dialog/select_images.php

@@ -94,8 +94,8 @@ if (!empty($iseditor)) {
                 </tr>
                 <?php
                 $dh = scandir($inpath);
-                $ty1 = "";
-                $ty2 = "";
+                $ty1 = '';
+                $ty2 = '';
                 foreach ($dh as $file) {
                     //计算文件大小和创建时间
                     if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
@@ -133,7 +133,7 @@ if (!empty($iseditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "text-danger";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td>
                             <a href='$reurl' onclick=\"ReturnImg('$reurl');\" class=\"tipsimg $lstyle\"><img src='$reurl' title='$file'> $file</a>
@@ -147,7 +147,7 @@ if (!empty($iseditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "text-danger";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td><a href='$reurl' onclick=\"ReturnImg('$reurl');\" class=\"tipsimg $lstyle\"><img src='$reurl' title='$file'> $file</a></td>
                         <td>$filesize KB</td>

src/admin/dialog/select_media.php

@@ -73,8 +73,8 @@ if (!empty($noeditor)) {
                 </tr>
                 <?php
                 $dh = scandir($inpath);
-                $ty1 = "";
-                $ty2 = "";
+                $ty1 = '';
+                $ty2 = '';
                 foreach ($dh as $file) {
                     //计算文件大小和创建时间
                     if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
@@ -113,7 +113,7 @@ if (!empty($noeditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td>
                         <td>$filesize KB</td>
@@ -125,7 +125,7 @@ if (!empty($noeditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td>
                         <td>$filesize KB</td>
@@ -137,7 +137,7 @@ if (!empty($noeditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td>
                         <td>$filesize KB</td>
@@ -149,7 +149,7 @@ if (!empty($noeditor)) {
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $line = "<tr>
                         <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td>
                         <td>$filesize KB</td>

src/admin/dialog/select_soft.php

@@ -76,7 +76,7 @@ if (!empty($noeditor)) {
                 </tr>
                 <?php
         		$dh = scandir($inpath);
-        		$ty1 = $ty2 = "";
+        		$ty1 = $ty2 = '';
         		foreach ($dh as $file) {
                     //计算文件大小和创建时间
                     if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
@@ -112,7 +112,7 @@ if (!empty($noeditor)) {
                         echo "$line";
                     } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#^\.\.#", "", $reurl);
                         $reurl = $reurl;

src/admin/dialog/select_templets.php

@@ -63,8 +63,8 @@ if (empty($comeback)) {
                 </tr>
                 <?php
                 $dh = scandir($inpath);
-                $ty1 = "";
-                $ty2 = "";
+                $ty1 = '';
+                $ty2 = '';
                 foreach ($dh as $file) {
                     //计算文件大小和创建时间
                     if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
@@ -100,7 +100,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(htm|html)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
@@ -112,7 +112,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(css)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
@@ -124,7 +124,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(js)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
@@ -136,7 +136,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(jpg)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
@@ -148,7 +148,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(gif|png)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
@@ -160,7 +160,7 @@ if (empty($comeback)) {
                         echo "$line";
                     } else if (preg_match("#\.(txt)#i", $file)) {
                         if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = "";
+                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
                         $reurl = preg_replace("#\.\.#", "", $reurl);
                         $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);

src/admin/dialog/select_templets_post.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 $cfg_txttype = "htm|html|tpl|txt";
 if (empty($uploadfile)) {
-    $uploadfile = "";
+    $uploadfile = '';
 }
 if (!is_uploaded_file($uploadfile)) {
     ShowMsg("您没有选择上传文件", "-1");

src/admin/diy_edit.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php");
 CheckPurview('c_Edit');
 require_once(DEDEINC."/dedetag.class.php");
 require_once(DEDEINC."/libraries/oxwindow.class.php");
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $diyid = (empty($diyid) ? 0 : intval($diyid));
 if ($dopost == "save") {
     $public = isset($public) && is_numeric($public) ? $public : 0;
@@ -25,7 +25,7 @@ if ($dopost == "save") {
     @set_time_limit(0);
     CheckPurview('c_Del');
     $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'");
-    if (empty($job)) $job = "";
+    if (empty($job)) $job = '';
     //确认提示
     if ($job == "") {
         $wintitle = "删除所有自定义表";

src/admin/feedback_edit.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Feedback');
 $id = isset($id) && is_numeric($id) ? $id : 0;
 $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "feedback_main.php" : $_COOKIE['ENV_GOBACK_URL'];
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == 'edit') {
     $msg = cn_substrR($msg, 3500);
     $adminmsg = trim($adminmsg);

src/admin/file_class.php

@@ -11,8 +11,8 @@ if (!defined('DEDEINC')) exit ('dedebiz');
  */
 class FileManagement
 {
-    var $baseDir = "";
-    var $activeDir = "";
+    var $baseDir = '';
+    var $activeDir = '';
     //是否允许文件管理器删除目录，默认为不允许0，如果希望管理整个目录，请把值设为1
     var $allowDeleteDir = 0;
     //初始化系统

src/admin/file_manage_control.php

@@ -14,7 +14,7 @@ require(DEDEINC."/libraries/oxwindow.class.php");
 require_once(DEDEADMIN.'/file_class.php');
 $activepath = str_replace("..", "", $activepath);
 $activepath = preg_replace("#^\/{1,}#", "/", $activepath);
-if ($activepath == "/") $activepath = "";
+if ($activepath == "/") $activepath = '';
 if ($activepath == "") $inpath = $cfg_basedir;
 else $inpath = $cfg_basedir.$activepath;
 $files = json_decode(file_get_contents(DEDEDATA.'/admin/files.txt'));

src/admin/file_manage_main.php

@@ -11,14 +11,14 @@
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_文件管理器');
 if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : '/';
-$inpath = "";
+$inpath = '';
 $activepath = str_replace("..", "", $activepath);
 $activepath = preg_replace("#^\/{1,}#", "/", $activepath);
 if (DEDEBIZ_SAFE_MODE && !preg_match("#^/static#",$activepath)) {
     ShowMsg("安全模式下仅允许查看修改static目录文档", -1);
     exit;
 }
-if ($activepath == "/") $activepath = "";
+if ($activepath == "/") $activepath = '';
 if ($activepath == "") $inpath = $cfg_basedir;
 else $inpath = $cfg_basedir.$activepath;
 $activeurl = $activepath;

src/admin/file_manage_view.php

@@ -13,7 +13,7 @@ CheckPurview('plus_文件管理器');
 require_once(DEDEINC."/libraries/oxwindow.class.php");
 $activepath = str_replace("..", "", $activepath);
 $activepath = preg_replace("#^\/{1,}#", "/", $activepath);
-if ($activepath == "/") $activepath = "";
+if ($activepath == "/") $activepath = '';
 if ($activepath == "") $inpath = $cfg_basedir;
 else $inpath = $cfg_basedir.$activepath;
 //修改文件名
@@ -87,12 +87,12 @@ else if ($fmdo == "del") {
 //修改文件
 else if ($fmdo == "edit") {
     if (!isset($backurl)) {
-        $backurl = "";
+        $backurl = '';
     }
     $activepath = str_replace("..", "", $activepath);
     $filename = str_replace("..", "", $filename);
     $file = "$cfg_basedir$activepath/$filename";
-    $content = "";
+    $content = '';
     if (is_file($file)) {
         $fp = fopen($file, "r");
         $content = fread($fp, filesize($file));
@@ -117,7 +117,7 @@ else if ($fmdo == "edit") {
 }
 //新建文件
 else if ($fmdo == "newfile") {
-    $content = "";
+    $content = '';
     $GLOBALS['filename'] = "newfile.txt";
     $GLOBALS['extension'] = 'text/html';
     $contentView = "<textarea id='str' name='str' class='admin-textarea-xl'></textarea>\r\n";

src/admin/friendlink_add.php

@@ -10,7 +10,7 @@
  */
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_友情链接');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == "add") {
     $dtime = time();
     if (is_uploaded_file($logoimg)) {

src/admin/friendlink_edit.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('plus_友情链接');
 $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? 'friendlink_main.php' : $_COOKIE['ENV_GOBACK_URL'];
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $id = isset($id)? intval($id) : 0;
 if (isset($allid)) {
     $aids = explode(',', $allid);

src/admin/inc/inc_archives_all.php

@@ -65,7 +65,7 @@ function GetFormItem($ctag)
         }
     }
     if ($ctag->GetAtt("type") == "htmltext" || $ctag->GetAtt("type") == "textdata") {
-        $formitem = "";
+        $formitem = '';
         $formitem .= "<table width=\"800\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td width=\"80\">".$ctag->GetAtt('itemname')."</td><td>";
         $formitem .= GetEditor($fieldname, '', 350, 'Basic', 'string');
         $formitem .= "</td></tr></table>\r\n";
@@ -109,7 +109,7 @@ function GetFormItem($ctag)
         return $formitem;
     } else {
         if ($ctag->GetAtt('default') != "") $dfvalue = $ctag->GetAtt('default');
-        else $dfvalue = "";
+        else $dfvalue = '';
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg' value='$dfvalue'>\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
@@ -178,7 +178,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '')
         $imgurl = "{dede:img text='' width='' height=''} ".$iurl." {/dede:img}";
         if (preg_match("#^(http|https):\/\/#i", $iurl) && $GLOBALS['isUrlOpen']) {
             //远程图片
-            $reimgs = "";
+            $reimgs = '';
             if ($isUrlOpen) {
                 $reimgs = GetRemoteImage($iurl, $GLOBALS['adminid']);
                 if (is_array($reimgs)) {
@@ -265,13 +265,13 @@ function GetFormItemValue($ctag, $fvalue)
     if ($ctag->GetAtt("type") == "textdata") {
         if (is_file($GLOBALS['cfg_basedir'].$fvalue)) {
             $fp = fopen($GLOBALS['cfg_basedir'].$fvalue, 'r');
-            $okfvalue = "";
+            $okfvalue = '';
             while (!feof($fp)) {
                 $okfvalue .= fgets($fp, 1024);
             }
             fclose($fp);
         } else {
-            $okfvalue = "";
+            $okfvalue = '';
         }
         $formitem  = "<table width=\"800\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td width=\"80\">".$ctag->GetAtt('itemname')."</td>\r\n";
         $formitem .= "<td>\r\n".GetEditor($fieldname, $okfvalue, 350, 'Basic', 'string')."</td>\r\n";

src/admin/inc/inc_archives_functions.php

@@ -482,7 +482,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all')
     $dtp = new DedeTagParse();
     $dtp->SetNameSpace("field", "<", ">");
     $dtp->LoadSource($fieldset);
-    $dede_addonfields = "";
+    $dede_addonfields = '';
     if (is_array($dtp->CTags)) {
         foreach ($dtp->CTags as $tid => $ctag) {
             if (
@@ -710,7 +710,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
         if ($isremote == 1 && preg_match("#^http[s]?:\/\/#i", $handurl)) {
             $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID());
             if (!is_array($ddinfos)) {
-                $litpic = "";
+                $litpic = '';
             } else {
                 $filename = $ddinfos[0];
             }
@@ -722,7 +722,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
     }
     $imgfile = $cfg_basedir.$filename;
     if (is_file($imgfile) && $isrm_up && $filename != '') {
-        $info = "";
+        $info = '';
         $imginfos = GetImageSize($imgfile, $info);
         //把新上传的图片信息保存到媒体文档管理文档中
         $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$title','$filename','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".time()."','".$cuserLogin->getUserID()."');";

src/admin/inc/inc_batchup.php

@@ -25,7 +25,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0)
     $aid = preg_replace("#[^0-9]#i", '', $aid);
     $arctitle = $arcurl = '';
     if ($recycle == 1) $whererecycle = "AND arcrank = '-2'";
-    else $whererecycle = "";
+    else $whererecycle = '';
     //查询表信息
     $query = "SELECT ch.maintable,ch.addtable,ch.nid,ch.issystem FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' ";
     $row = $dsql->GetOne($query);

src/admin/inc/inc_menu_func.php

@@ -51,7 +51,7 @@ function GetMenus($userrank, $topos = 'main')
                         }
                         $link = "$link<a href='".$ctag2->GetAtt('linkadd')."' class='submenu-right' target='".$ctag2->GetAtt('target')."'><span class='$addico'></span></a>";
                     } else {
-                        $link .= "";
+                        $link .= '';
                     }
                     $itemtmp = str_replace('~link~', $link, $itemTemplet);
                     echo $itemtmp;

src/admin/index_body.php

@@ -66,7 +66,7 @@ if (empty($dopost)) {
     exit;
 } elseif ($dopost == "system_info") {
     if (empty(trim($cfg_auth_code))) {
-        $indexHTML = "";
+        $indexHTML = '';
         if (file_exists(DEDEROOT."/index.html")) {
             $indexHTML = file_get_contents(DEDEROOT."/index.html");
         } else {

src/admin/log_edit.php

@@ -22,7 +22,7 @@ if ($dopost == "clear") {
 } else if ($dopost == "del") {
     $bkurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "log_list.php";
     $ids = explode('`', $ids);
-    $dquery = "";
+    $dquery = '';
     foreach ($ids as $id) {
         if ($dquery == "") {
             $dquery .= " lid='$id' ";

src/admin/log_list.php

@@ -13,9 +13,9 @@ CheckPurview('sys_Log');
 require_once(DEDEINC."/datalistcp.class.php");
 require_once(DEDEINC."/common.func.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
-$sql = $where = "";
+$sql = $where = '';
 if (empty($adminid)) $adminid = 0;
-if (empty($cip)) $cip = "";
+if (empty($cip)) $cip = '';
 if (empty($dtime)) $dtime = 0;
 if ($adminid > 0) $where .= " AND #@__log.adminid='$adminid' ";
 if ($cip != "") $where .= " AND #@__log.cip LIKE '%$cip%' ";
@@ -25,7 +25,7 @@ if ($dtime > 0) {
     $where .= " AND #@__log.dtime>'$starttime' ";
 }
 $sql = "SELECT `#@__log`.*,`#@__admin`.userid FROM `#@__log` LEFT JOIN `#@__admin` ON `#@__admin`.id=`#@__log`.adminid WHERE 1=1 $where ORDER BY `#@__log`.lid DESC";
-$adminlist = "";
+$adminlist = '';
 $dsql->SetQuery("SELECT id,uname FROM `#@__admin`");
 $dsql->Execute('admin');
 while ($myrow = $dsql->GetObject('admin')) {

src/admin/makehtml_spec.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_MakeHtml');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == "ok") {
     require_once(DEDEINC."/archive/specview.class.php");
     $sp = new SpecView();

src/admin/media_add.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 //添加权限检查
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 //上传
 if ($dopost == "upload") {
     CheckCSRF();

src/admin/media_edit.php

@@ -11,13 +11,13 @@
 require_once(dirname(__FILE__)."/config.php");
 //权限检查
 CheckPurview('sys_Upload,sys_MyUpload');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $backurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "javascript:history.go(-1);";
 //删除附件
 if ($dopost == 'del') {
     CheckPurview('sys_DelUpload');
     if (empty($ids)) {
-        $ids = "";
+        $ids = '';
     }
     if ($ids == "") {
         $myrow = $dsql->GetOne("SELECT url FROM `#@__uploads` WHERE aid='".$aid."'");
@@ -36,7 +36,7 @@ if ($dopost == 'del') {
         exit();
     } else {
         $ids = explode(',', $ids);
-        $idquery = "";
+        $idquery = '';
         foreach ($ids as $aid) {
             if ($idquery == "") {
                 $idquery .= " WHERE aid='$aid' ";
@@ -72,7 +72,7 @@ else if ($dopost == 'save') {
         CheckPurview('sys_Upload');
     }
     //检测文件类型
-    $addquery = "";
+    $addquery = '';
     if (is_uploaded_file($upfile)) {
         if ($mediatype == 1) {
             $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp");
@@ -130,7 +130,7 @@ else if ($dopost == 'save') {
         $imgw = 0;
         $imgh = 0;
         if ($mediatype == 1) {
-            $info = "";
+            $info = '';
             $sizes[0] = 0;
             $sizes[1] = 0;
             $sizes = @getimagesize($fullfilename, $info);

src/admin/media_main.php

@@ -23,7 +23,7 @@ if ($dopost == 'filemanager') {
     exit();
 }
 //数据库管理
-if (empty($keyword)) $keyword = "";
+if (empty($keyword)) $keyword = '';
 $addsql = " WHERE (u.title LIKE '%$keyword%' OR u.url LIKE '%$keyword%') ";
 if (empty($membertype)) {
     $membertype = 0;

src/admin/member_type.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('member_Type');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 //保存修改
 if ($dopost == "save") {
     $startID = 1;

src/admin/module_main.php

@@ -17,7 +17,7 @@ require_once(DEDEINC."/dedemodule.class.php");
 require_once(DEDEINC."/libraries/oxwindow.class.php");
 if (empty($action)) $action = '';
 $mdir = DEDEDATA.'/module';
-$mdurl = "";
+$mdurl = '';
 function TestWriteAble($d)
 {
     $tfile = '_dedet.txt';
@@ -80,7 +80,7 @@ if ($action == '') {
     $dhd->OpenUrl($devURL);
     $devContent = $dhd->GetHtml();
     $devInfo = (array)json_decode($devContent);
-    $offUrl = "";
+    $offUrl = '';
     if ($devInfo['dev_type'] == 1) {
         $offUrl = "官方网址：<code>{$devInfo['offurl']}</code><br>";
     }

src/admin/mychannel_edit.php

@@ -15,7 +15,7 @@ if (DEDEBIZ_SAFE_MODE) {
 CheckPurview('c_Edit');
 require_once(DEDEINC."/dedetag.class.php");
 require_once(DEDEINC."/libraries/oxwindow.class.php");
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $id = isset($id) && is_numeric($id) ? $id : 0;
 if ($dopost == "show") {
     $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=1 WHERE id='$id' ");
@@ -321,7 +321,7 @@ if ($dopost == "show") {
         ShowMsg("系统文档模型不允许删除", "mychannel_main.php");
         exit();
     }
-    if (empty($job)) $job = "";
+    if (empty($job)) $job = '';
     //确认提示
     if ($job == "") {
         require_once(DEDEINC."/libraries/oxwindow.class.php");

src/admin/mytag_add.php

@@ -14,7 +14,7 @@ if (DEDEBIZ_SAFE_MODE) {
 }
 CheckPurview('temp_Other');
 require_once(DEDEINC."/typelink/typelink.class.php");
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == "save") {
     CheckCSRF();
     $tagname = trim($tagname);

src/admin/mytag_tag_guide_ok.php

@@ -14,7 +14,7 @@ if (DEDEBIZ_SAFE_MODE) {
 }
 CheckPurview('temp_Other');
 //根据生成条件标记
-$attlist = "";
+$attlist = '';
 $attlist .= " row='".$row."'";
 $attlist .= " titlelen='".$titlelen."'";
 if ($orderby != 'senddate') $attlist .= " orderby='".$orderby."'";

src/admin/plus_edit.php

@@ -20,7 +20,7 @@ if ($dopost == "show") {
     ShowMsg("隐藏一个插件", "plus_main.php");
     exit();
 } else if ($dopost == "delete") {
-    if (empty($job)) $job = "";
+    if (empty($job)) $job = '';
     if ($job == "") {
         //确认
         require_once(DEDEINC."/libraries/oxwindow.class.php");

src/admin/spec_add.php

@@ -99,7 +99,7 @@ if ($dopost != 'save') {
             else $rownum = 0;
             $arcid = preg_replace("#[^0-9,]#", "", $arcid);
             $ids = explode(",", $arcid);
-            $okids = "";
+            $okids = '';
             if (is_array($ids)) {
                 foreach ($ids as $mid) {
                     $mid = trim($mid);

src/admin/spec_edit.php

@@ -132,7 +132,7 @@ if ($dopost != 'save') {
             if (isset(${'keywords'.$i})) {
                 $keywords = str_replace("'", "", trim(${'keywords'.$i}));
             } else {
-                $keywords = "";
+                $keywords = '';
             }
             if (!empty(${'typeid'.$i})) {
                 $ttypeid = trim(${'typeid'.$i});
@@ -146,7 +146,7 @@ if ($dopost != 'save') {
             }
             $arcid = preg_replace("#[^0-9,]#", "", $arcid);
             $ids = explode(",", $arcid);
-            $okids = "";
+            $okids = '';
             if (is_array($ids)) {
                 foreach ($ids as $mid) {
                     $mid = trim($mid);

src/admin/sys_admin_user_edit.php

@@ -47,7 +47,7 @@ if ($dopost == 'saveedit') {
     }
     $olduserid = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $olduserid);
     $userid = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $userid);
-    $usql = "";
+    $usql = '';
     if ($olduserid !== $userid) {
         $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' ");
         if (is_array($row)) {
@@ -72,7 +72,7 @@ if ($dopost == 'saveedit') {
     ShowMsg("成功修改一个账户", "sys_admin_user.php");
     exit();
 } else if ($dopost == 'delete') {
-    if (empty($userok)) $userok = "";
+    if (empty($userok)) $userok = '';
     if ($userok != "yes") {
         $randcode = mt_rand(10000, 99999);
         $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24);

src/admin/sys_data_done.php

@@ -189,7 +189,7 @@ else if ($dopost == 'redat') {
     $bakfilesTmp = $bakfiles;
     $bakfiles = explode(',', $bakfiles);
     if (empty($structfile)) {
-        $structfile = "";
+        $structfile = '';
     }
     if (empty($delfile)) {
         $delfile = 0;

src/admin/sys_group.php

@@ -10,6 +10,6 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Group');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 include DedeInclude('templets/sys_group.htm');
 ?>

src/admin/sys_group_edit.php

@@ -10,13 +10,13 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Group');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == 'save') {
     if ($rank == 10) {
         ShowMsg('超级管理员的权限不允许修改!', 'sys_group.php');
         exit();
     }
-    $purview = "";
+    $purview = '';
     if (is_array($purviews)) {
         foreach ($purviews as $p) {
             $purview .= "$p ";

src/admin/sys_info.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Edit');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $configfile = DEDEDATA.'/config.cache.inc.php';
 //更新配置函数
 function ReWriteConfig()

src/admin/sys_info_mark.php

@@ -16,7 +16,7 @@ if ($cfg_photo_support == '') {
     exit();
 }
 $ImageWaterConfigFile = DEDEDATA."/mark/inc_photowatermark_config.php";
-if (empty($action)) $action = "";
+if (empty($action)) $action = '';
 $allow_mark_types = array(
     'image/gif',
     'image/xpng',
@@ -24,7 +24,7 @@ $allow_mark_types = array(
 );
 if ($action == "save") {
     $vars = array('photo_markup', 'photo_markdown', 'photo_marktype', 'photo_wwidth', 'photo_wheight', 'photo_waterpos', 'photo_watertext', 'photo_fontsize', 'photo_fontcolor', 'photo_marktrans', 'photo_diaphaneity');
-    $configstr = $shortname = "";
+    $configstr = $shortname = '';
     foreach ($vars as $v) {
         $tmp = stripslashes(${'get_'.$v});
         ${$v} = addslashes(str_replace("'", "", $tmp));

src/admin/sys_safetest.php

@@ -22,7 +22,7 @@ $offFiles = array();
 foreach ($filelist as $key => $ff) {
     $offFiles[$ff->filename] = $ff->hash;
 }
-$alter = "";
+$alter = '';
 if (count($offFiles) == 0) {
     $alter = DedeAlert('官方文件服务器通信失败，无法保证本地文件和同官方文件服务器是否一致', ALERT_DANGER);
 }
@@ -83,7 +83,7 @@ if ($action == 'test') {
     $del->OpenUrl($baseFile);
     $base = $del->GetHTML();
     $file = "$cfg_basedir/$filename";
-    $new = "";
+    $new = '';
     if (is_file($file)) {
         $fp = fopen($file, "r");
         $new = fread($fp, filesize($file));

src/admin/sys_sql_query.php

@@ -13,7 +13,7 @@ if (DEDEBIZ_SAFE_MODE) {
     die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER));
 }
 CheckPurview('sys_Data');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 //查看表结构
 if ($dopost == "viewinfo") {
     CheckCSRF();
@@ -119,7 +119,7 @@ else if ($dopost == "query") {
         //普通的SQL语句
         $sqlquery = str_replace("\r", "", $sqlquery);
         $sqls = preg_split("#;[ \t]{0,}\n#", $sqlquery);
-        $nerrCode = "";
+        $nerrCode = '';
         $i = 0;
         foreach ($sqls as $q) {
             $q = trim($q);

src/admin/tag_test_action.php

@@ -21,7 +21,7 @@ if (empty($partcode)) {
 }
 $partcode = stripslashes($partcode);
 if (empty($typeid)) $typeid = 0;
-if (empty($showsource)) $showsource = "";
+if (empty($showsource)) $showsource = '';
 if ($typeid > 0) $pv = new PartView($typeid);
 else $pv = new PartView();
 $pv->SetTemplet($partcode, "string");

src/admin/templets/album_add.htm

@@ -96,7 +96,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-sm btn-success delete">清空</button>
 								</td>
 								<td><img src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/archives_add.htm

@@ -92,7 +92,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success delete">清空</button>
 								</td>
 								<td><img src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/archives_sg_add.htm

@@ -65,7 +65,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
 								</td>
 								<td><img src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/article_add.htm

@@ -91,7 +91,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
 								</td>
 								<td><img src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/article_result_same.htm

@@ -53,7 +53,7 @@
 		<script>
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.arcTitle.value) return document.form2.arcTitle.value;
 				for (i = 0; i < document.form2.arcTitle.length; i++) {
 					if (document.form2.arcTitle[i].checked) {

src/admin/templets/cards_manmage.htm

@@ -60,7 +60,7 @@
 		<script>
 			//获得选中项
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form1.aids.value) return document.form1.aids.value;
 				for (i = 0; i < document.form1.aids.length; i++) {
 					if (document.form1.aids[i].checked) {

src/admin/templets/content_select_list.htm

@@ -68,7 +68,7 @@
 		<script>
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.arcID.value) return document.form2.arcID.value;
 				for (i = 0; i < document.form2.arcID.length; i++) {
 					if (document.form2.arcID[i].checked) {

src/admin/templets/diy_field_add.htm

@@ -130,7 +130,7 @@
 					ShowMsg("您选择的select或radio、checkbox类型，必须默认值设置选择的项目（用英文逗号）");
 					return false;
 				}
-				if (spage=="no") spage = "";
+				if (spage=="no") spage = '';
 				revalue =  "<field:"+fieldname+" itemname=\""+itemname+"\" autofield=\"1\" type=\""+dtype+"\" isnull=\""+sisnull+"\" default=\""+vdefault+"\" ";
 				revalue += " maxlength=\""+maxlength+"\" page=\""+spage+"\">"+vinnertext+"</field:"+fieldname+">";
 				document.form1.fieldstring.value = revalue;

src/admin/templets/diy_field_edit.htm

@@ -121,7 +121,7 @@
 					ShowMsg("您选择的select或radio、checkbox类型，必须默认值设置选择的项目（用英文逗号）");
 					return false;
 				}
-				if (spage=="no") spage = "";
+				if (spage=="no") spage = '';
 				revalue =  "<field:"+fieldname+" itemname=\""+itemname+"\" autofield=\"1\" type=\""+dtype+"\"";
 				revalue += " isnull=\""+sisnull+"\" default=\""+vdefault+"\" ";
 				revalue += " maxlength=\""+maxlength+"\" page=\""+spage+"\">"+vinnertext+"</field:"+fieldname+">";

src/admin/templets/erradd.htm

@@ -51,7 +51,7 @@
 		</form>
 		<script>
 			function getOneItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.id.value) return document.form2.id.value;
 				for (i = 0; i < document.form2.id.length; i++) {
 					if (document.form2.id[i].checked) {
@@ -62,7 +62,7 @@
 				return allSel;
 			}
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.id.value) return document.form2.id.value;
 				for (i = 0; i < document.form2.id.length; i++) {
 					if (document.form2.id[i].checked) {

src/admin/templets/feedback_main.htm

@@ -78,7 +78,7 @@
 		<script>
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (typeof document.feedback.fid === "undefined") {
 					return "";
 				}

src/admin/templets/file_manage_main.htm

@@ -21,8 +21,8 @@
 			</tr>
 			<?php
 			$dh = scandir($inpath);
-			$ty1 = "";
-			$ty2 = "";
+			$ty1 = '';
+			$ty2 = '';
 			$files = $dirs = array();
 			foreach ($dh as $file) {
 				if ($file!="." && $file!=".." && !is_dir("$inpath/$file")) {

src/admin/templets/log_list.htm

@@ -70,7 +70,7 @@
 		<script>
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form1.logs.value) return document.form1.logs.value;
 				for (i = 0; i < document.form1.logs.length; i++) {
 					if (document.form1.logs[i].checked) {

src/admin/templets/makehtml_all.htm

@@ -54,11 +54,11 @@
 				var ob2 = document.getElementById("uptype2");
 				var ob3 = document.getElementById("uptype3");
 				if (ob1.checked) {
-					document.getElementById("seltime").style.display = "";
+					document.getElementById("seltime").style.display = '';
 					document.getElementById("selid").style.display = "none";
 				} else if (ob2.checked) {
 					document.getElementById("seltime").style.display = "none";
-					document.getElementById("selid").style.display = "";
+					document.getElementById("selid").style.display = '';
 				} else {
 					document.getElementById("seltime").style.display = "none";
 					document.getElementById("selid").style.display = "none";

src/admin/templets/media_add.htm

@@ -84,7 +84,7 @@
 			}
 			function ResetUpload() {
 				var upfield = document.getElementById("uploadfield");
-				upfield.innerHTML = "";
+				upfield.innerHTML = '';
 				startNum = 2;
 			}
 		</script>

src/admin/templets/media_edit.htm

@@ -52,7 +52,7 @@
 				if ($myrow['mediatype'] == 1) {
 					$fullfilename = $cfg_basedir.$myrow['url'];
 					if (file_exists($fullfilename)) {
-						$info = "";
+						$info = '';
 						$sizes = getimagesize($fullfilename,$info);
 						if (is_array($sizes)) {
 							if ($sizes[0]>200) $w=200;

src/admin/templets/media_main.htm

@@ -76,7 +76,7 @@
 		<script>
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form1.aids.value) return document.form1.aids.value;
 				for (i = 0; i < document.form1.aids.length; i++) {
 					if (document.form1.aids[i].checked) {

src/admin/templets/member_operations.htm

@@ -66,7 +66,7 @@
 		<script>
 			//获得选中项
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form1.aids.value) return document.form1.aids.value;
 				for (i = 0; i < document.form1.aids.length; i++) {
 					if (document.form1.aids[i].checked) {

src/admin/templets/mychannel_field_add.htm

@@ -176,8 +176,8 @@
 					ShowMsg("自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德");
 					return false;
 				}
-				if (spage=="no") spage = "";
-				relstr = "";
+				if (spage=="no") spage = '';
+				relstr = '';
 				if (dtype==="relation") {
 				  relstr = " automake=\""+automake+"\" channel=\""+$("#channeltype").val()+"\"";
 				}

src/admin/templets/mychannel_field_edit.htm

@@ -169,8 +169,8 @@
 					ShowMsg("自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德");
 					return false;
 				}
-				if (spage == "no") spage = "";
-				relstr = "";
+				if (spage == "no") spage = '';
+				relstr = '';
 				if (dtype==="relation") {
 					relstr = " automake=\""+automake+"\" channel=\""+$("#channeltype").val()+"\"";
 				}

src/admin/templets/recycling.htm

@@ -63,7 +63,7 @@
 			}
 			//获得选中文件的文件名
 			function getCheckboxItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.arcID.value) return document.form2.arcID.value;
 				for (i = 0; i < document.form2.arcID.length; i++) {
 					if (document.form2.arcID[i].checked) {
@@ -77,7 +77,7 @@
 			}
 			//获得选中其中一个的id
 			function getOneItem() {
-				var allSel = "";
+				var allSel = '';
 				if (document.form2.arcID.value) return document.form2.arcID.value;
 				for (i = 0; i < document.form2.arcID.length; i++) {
 					if (document.form2.arcID[i].checked) {

src/admin/templets/soft_add.htm

@@ -108,7 +108,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
 								</td>
 								<td><img src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/spec_add.htm

@@ -112,7 +112,7 @@
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
 									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程图片</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
-									<button type="button" name="submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
+									<button type="button" name="submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
 								</td>
 								<td><img id="litPic" src="/static/web/img/thumbnail.jpg" id="litPic" class="thumbnail-md"></td>

src/admin/templets/stepselect_main.htm

@@ -149,7 +149,7 @@
 						$selgroup = '';
 						foreach($etypes as $arr)
 						{
-							$stylecolor = "";
+							$stylecolor = '';
 							if ($arr['issystem']==1) $stylecolor = " style='color:#999' ";
 							if ($egroup==$arr['egroup']) {
 								$selgroup = $arr['itemname'];

src/admin/templets/sys_data.htm

@@ -161,7 +161,7 @@
 			//获得选中文件的数据表
 			function getCheckboxItem() {
 				var myform = document.form1;
-				var allSel = "";
+				var allSel = '';
 				if (myform.tables.value) return myform.tables.value;
 				for (i = 0; i < myform.tables.length; i++) {
 					if (myform.tables[i].checked) {

src/admin/templets/sys_data_revert.htm

@@ -64,7 +64,7 @@
 			//获得选中文件的数据表
 			function getCheckboxItem() {
 				var myform = document.form1;
-				var allSel = "";
+				var allSel = '';
 				if (myform.bakfile.value) return myform.bakfile.value;
 				for (i = 0; i < myform.bakfile.length; i++) {
 					if (myform.bakfile[i].checked) {

src/admin/templets/sys_info.htm

@@ -199,7 +199,7 @@
 				}).catch((error) => {
 					$Obj("_search").innerHTML = errMsg;
 				});
-				$Obj("_mainsearch").innerHTML = "";
+				$Obj("_mainsearch").innerHTML = '';
 				searchconfig = true;
 			}
 			function resetCookieEncode() {

src/admin/templets_one_add.php

@@ -10,7 +10,7 @@
  */
 require(dirname(__FILE__)."/config.php");
 CheckPurview('temp_One');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if ($dopost == "save") {
     require_once(DEDEINC."/archive/partview.class.php");
     $uptime = time();

src/admin/templets_one_edit.php

@@ -10,7 +10,7 @@
  */
 require(dirname(__FILE__)."/config.php");
 CheckPurview('temp_One');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $aid = isset($aid) && is_numeric($aid) ? $aid : 0;
 if ($dopost == "saveedit") {
     include_once(DEDEINC."/archive/sgpage.class.php");

src/admin/vote_add.php

@@ -12,13 +12,13 @@ require(dirname(__FILE__)."/config.php");
 require_once(DEDEINC."/dedevote.class.php");
 require_once(DEDEINC."/helpers/filter.helper.php");
 CheckPurview('plus_投票管理');
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 if (empty($isarc))  $isarc = 0;
 if ($dopost == "save" && $isarc == 0) {
     CheckCSRF();
     $starttime = GetMkTime($starttime);
     $endtime = GetMkTime($endtime);
-    $voteitems = "";
+    $voteitems = '';
     $j = 0;
     for ($i = 1; $i <= 15; $i++) {
         if (!empty(${"voteitem".$i})) {
@@ -43,7 +43,7 @@ if ($dopost == "save" && $isarc == 0) {
 } else if ($dopost == "save" && $isarc == 1) {
     $starttime = GetMkTime($starttime);
     $endtime = GetMkTime($endtime);
-    $voteitems = "";
+    $voteitems = '';
     $j = 0;
     for ($i = 1; $i <= 15; $i++) {
         if (!empty(${"voteitem".$i})) {

src/admin/vote_edit.php

@@ -11,7 +11,7 @@
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_投票管理');
 require_once(DEDEINC."/dedetag.class.php");
-if (empty($dopost)) $dopost = "";
+if (empty($dopost)) $dopost = '';
 $aid = isset($aid) && is_numeric($aid) ? $aid : 0;
 $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "vote_main.php" : $_COOKIE['ENV_GOBACK_URL'];
 if ($dopost == "delete") {

src/apps/showphoto.php

@@ -41,7 +41,7 @@ if (is_array($arcRow)) {
     exit();
 }
 if (empty($mx)) $mx = $cfg_album_width;
-$pageGuide = "";
+$pageGuide = '';
 //获取上下幅图片链接
 $row = $dsql->GetOne("SELECT imgurls FROM `#@__addonimages` WHERE aid='{$aid}'");
 $i = 0;

src/install/index.php

@@ -259,7 +259,7 @@ else if ($step==10) {
     header("Cache-Control:no-cache\r\n");
     header("Expires:0\r\n");
     $conn = @mysql_connect($dbhost, $dbuser, $dbpwd);
-    $info = "";
+    $info = '';
     if ($conn) {
 		if (empty($dbname)) {
 			$info = "数据库连接正确";

src/static/web/js/admin.list.js

@@ -59,7 +59,7 @@ function QuickEdit(aid, e, obj) {
 	ChangeFullDiv('show');
 }
 function getCheckboxItem() {
-	var allSel = "";
+	var allSel = '';
 	if (document.form2.arcID.value) return document.form2.arcID.value;
 	for (i = 0;i<document.form2.arcID.length;i++) {
 		if (document.form2.arcID[i].checked) {

src/static/web/js/admin.main.js

@@ -171,7 +171,7 @@ function ShowUrlTrEdit() {
 	ShowUrlTr();
 	var jumpTest = $Obj("isjump");
 	var rurl = $Obj("redirecturl");
-	if (!jumpTest.checked) rurl.value = "";
+	if (!jumpTest.checked) rurl.value = '';
 }
 function LoadQuickDiv(e, surl, oname, w, h) {
 	var newobj = $Obj(oname);
@@ -273,8 +273,8 @@ function DedeConfirm(content = "", title = "确认提示") {
 //函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
 	title = "系统提示";
-	size = "";
-	if (typeof content == "undefined") content = "";
+	size = '';
+	if (typeof content == "undefined") content = '';
 	modalID = guid();
 	var footer = `<button type="button" class="btn btn-primary btn-sm" onclick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
 	var noClose = false;
@@ -320,9 +320,9 @@ function CloseModal(modalID) {
 	})
 }
 //获取缩略图
-var litpicImgSrc = "";
-var litpicImg = "";
-var mdlCropperID = "";
+var litpicImgSrc = '';
+var litpicImg = '';
+var mdlCropperID = '';
 var optCropper = {
 	preview: ".pv",
 	crop: function(e) {

src/static/web/js/enums.js

@@ -74,9 +74,9 @@ function ChangeSon() {
     }
     if (j > 0) {
         document.getElementById('span_' + emname + '_sec').appendChild(oj);
-        document.getElementById('span_' + emname + '_sec').style.display = "initial"
+        document.getElementById('span_' + emname + '_sec').style.display = "initial";
     } else {
-        document.getElementById('span_' + emname + '_sec').innerHTML = "";
+        document.getElementById('span_' + emname + '_sec').innerHTML = '';
     }
 }
 //改变第三级的事件
@@ -135,10 +135,10 @@ function selNextSon() {
         count = count + 1;
     }
     if (count > 0) {
-        document.getElementById('span_' + emname + '_son').style.display = "initial"
+        document.getElementById('span_' + emname + '_son').style.display = "initial";
         document.getElementById('span_' + emname + '_son').appendChild(oj);
     } else {
-        document.getElementById('span_' + emname + '_son').style.display = "none"
+        document.getElementById('span_' + emname + '_son').style.display = "none";
     }
     
 }

src/static/web/js/style.js

@@ -60,7 +60,7 @@ function DedeConfirm(content = "", title = "确认提示") {
 //函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
 	title = "系统提示";
-	if (typeof content == "undefined") content = "";
+	if (typeof content == "undefined") content = '';
 	modalID = guid();
 	var footer = `<button type="button" class="btn btn-success btn-sm" onClick="CloseModal(\'DedeModal${modalID}\')">确定</button>`;
 	var noClose = false;

src/system/archive/archives.class.php

@@ -703,7 +703,7 @@ class Archives
                 $this->PreNext['preimg'] = "<a href='$mlink'><img src=\"{$preRow['litpic']}\" alt=\"{$preRow['title']}\" title=\"{$preRow['title']}\"></a> ";
             } else {
                 $this->PreNext['pre'] = "上一篇：暂无";
-                $this->PreNext['preimg'] = "";
+                $this->PreNext['preimg'] = '';
             }
             if (is_array($nextRow)) {
                 $mlink = GetFileUrl(
@@ -731,7 +731,7 @@ class Archives
                 $this->PreNext['nextimg'] = "<a href='$mlink'><img src=\"{$nextRow['litpic']}\" alt=\"{$nextRow['title']}\" title=\"{$nextRow['title']}\"></a> ";
             } else {
                 $this->PreNext['next'] = "下一篇：暂无";
-                $this->PreNext['nextimg'] = "";
+                $this->PreNext['nextimg'] = '';
             }
         }
         if ($gtype=='diy') {
@@ -767,7 +767,7 @@ class Archives
         }
         $i = 1;
         if ($styleName == 'link') {
-            $revalue = "";
+            $revalue = '';
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
                     $revalue .= "<a href='".$this->NameFirst.".".$this->ShortName."'>$v</a>\r\n";
@@ -867,7 +867,7 @@ class Archives
         $i = 1;
         $aid = $this->ArcID;
         if ($styleName == 'link') {
-            $revalue = "";
+            $revalue = '';
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
                     if ($cfg_rewrite == 'Y') {

src/system/archive/freelist.class.php

@@ -193,7 +193,7 @@ class FreeList
     function MakeHtml($startpage = 1, $makepagesize = 0)
     {
         $this->LoadTemplet();
-        $murl = "";
+        $murl = '';
         if (empty($startpage)) {
             $startpage = 1;
         }
@@ -444,7 +444,7 @@ class FreeList
         $orderby = $this->ListObj->GetAtt('orderby');
         $orderWay = $this->ListObj->GetAtt('orderway');
         //排序方式
-        $ordersql = "";
+        $ordersql = '';
         if ($orderby == "senddate") {
             $ordersql = " ORDER BY arc.senddate $orderWay";
         } else if ($orderby == "pubdate") {
@@ -463,13 +463,13 @@ class FreeList
             $ordersql = " ORDER BY arc.sortrank $orderWay";
         }
         //获得附加表的相关信息
-        $addField = "";
-        $addJoin = "";
+        $addField = '';
+        $addJoin = '';
         if (is_object($this->ChannelUnit)) {
             $addtable  = $this->ChannelUnit->ChannelInfos['addtable'];
             if ($addtable != "") {
                 $addJoin = " LEFT JOIN $addtable ON arc.id = ".$addtable.".aid ";
-                $addField = "";
+                $addField = '';
                 $fields = explode(",", $this->ChannelUnit->ChannelInfos['listfields']);
                 foreach ($fields as $k => $v) {
                     $nfields[$v] = $k;
@@ -488,7 +488,7 @@ class FreeList
         $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid $addField FROM {$this->maintable} arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addJoin WHERE $orwhere $ordersql LIMIT $limitstart,".$this->pagesize;
         $this->dsql->SetQuery($query);
         $this->dsql->Execute("al");
-        $artlist = "";
+        $artlist = '';
         if ($col > 1) {
             $artlist = "<table width='$tablewidth'>\r\n";
         }
@@ -597,7 +597,7 @@ class FreeList
                     $artlist .= $indtp->GetResult();
                 } //if hasRow
                 else {
-                    $artlist .= "";
+                    $artlist .= '';
                 }
                 if ($col > 1) {
                     $artlist .= "</td>\r\n";
@@ -626,8 +626,8 @@ class FreeList
      */
     function GetPageListST($list_len, $listitem = "info,index,end,pre,next,pageno")
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("#[^0-9]#", $list_len)) {
@@ -673,7 +673,7 @@ class FreeList
         }
         $optionlist .= "</select>";
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -694,7 +694,7 @@ class FreeList
                 $listdd .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $j, $tnamerule)."'>".$j."</a></li>\r\n";
             }
         }
-        $plist = "";
+        $plist = '';
         if (preg_match('#info#i', $listitem)) {
             $plist .= $maininfo.' ';
         }
@@ -728,8 +728,8 @@ class FreeList
      */
     function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno")
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -762,7 +762,7 @@ class FreeList
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;

src/system/archive/listview.class.php

@@ -303,7 +303,9 @@ class ListView
         if ($totalpage == 0) {
             $totalpage = 1;
         }
-        CreateDir(MfTypedir($this->Fields['typedir']));
+        if ($this->TypeLink->TypeInfos['isdefault'] != -1) {
+            CreateDir(MfTypedir($this->Fields['typedir']));
+        }     
         $murl = '';
         if ($makepagesize > 0) {
             $endpage = $startpage + $makepagesize;
@@ -427,7 +429,7 @@ class ListView
         }
         //获得附加表的相关信息
         $addtable = $this->ChannelUnit->ChannelInfos['addtable'];
-        $filtersql = "";
+        $filtersql = '';
         if ($addtable!="")
         {
             $addJoin = " LEFT JOIN `$addtable` ON arc.id = ".$addtable.'.aid ';
@@ -587,7 +589,9 @@ class ListView
             //跳转网址
             return $this->Fields['typedir'];
         }
-        CreateDir(MfTypedir($this->Fields['typedir']));
+        if ($this->TypeLink->TypeInfos['isdefault'] != -1) {
+            CreateDir(MfTypedir($this->Fields['typedir']));
+        }
         $makeUrl = $this->GetMakeFileRule($this->Fields['id'], "index", MfTypedir($this->Fields['typedir']), $this->Fields['defaultname'], $this->Fields['namerule2']);
         $makeUrl = preg_replace("/\/{1,}/", "/", $makeUrl);
         $makeFile = $this->GetTruePath().$makeUrl;
@@ -628,7 +632,9 @@ class ListView
             header("Location:$gotourl");
             exit();
         }
-        CreateDir(MfTypedir($this->Fields['typedir']));
+        if ($this->TypeLink->TypeInfos['isdefault'] != -1) {
+            CreateDir(MfTypedir($this->Fields['typedir']));
+        }
         $makeUrl = $this->GetMakeFileRule($this->Fields['id'], "index", MfTypedir($this->Fields['typedir']), $this->Fields['defaultname'], $this->Fields['namerule2']);
         $makeFile = $this->GetTruePath().$makeUrl;
         if ($nmfa == 0) {
@@ -837,7 +843,7 @@ class ListView
         }
         //获得附加表的相关信息
         $addtable = $this->ChannelUnit->ChannelInfos['addtable'];
-        $filtersql = "";
+        $filtersql = '';
         if ($addtable!="")
         {
             $addJoin = " LEFT JOIN `$addtable` ON arc.id = ".$addtable.'.aid ';
@@ -1056,8 +1062,23 @@ class ListView
         }
         $optionlist .= "</select></li>\r\n";
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
+        //获得省略号
+        if ($totalpage > $total_list) {
+            $half = floor(($total_list-4) / 2);
+            $half_start = $this->PageNo-$half + 1;
+        if ($total_list % 2 !== 0) --$half_start;
+            $half_end = $this->PageNo + $half;
+        }
+        if (($totalpage-$this->PageNo) < ($total_list-3)) {
+            $half_start = $totalpage-$total_list + 3;
+            unset($half_end);
+        }
+        if ($this->PageNo <= ($total_list-3)) {
+            $half_end = $total_list-2;
+            unset($half_start);
+        }
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
             $total_list = $this->PageNo + $list_len;
@@ -1070,7 +1091,15 @@ class ListView
                 $total_list = $totalpage;
             }
         }
-        for ($j; $j <= $total_list; $j++) {
+        for ($j = 1; $j <= $totalpage; $j++) {
+            if (isset($half_start) && $j < $half_start && $j > 1) {
+            if ($j == 2) $listdd .= "<li class='page-item'><span class='page-link'>...</span></li>";
+                continue;
+            }
+            if (isset($half_end) && $j > $half_end && $j < $totalpage) {
+            if ($j == ($half_end + 1)) $listdd .= "<li class='page-item'><span class='page-link'>...</span></li>";
+                continue;
+            }
             if ($j == $this->PageNo) {
                 $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>\r\n";
             } else {
@@ -1124,7 +1153,7 @@ class ListView
         $purl .= '?'.$geturl;
         $optionlist = '';
         //添加联动单筛选
-        $pageaddurl = "";
+        $pageaddurl = '';
         foreach($_GET as $key => $value) {
             $pageaddurl .= ($key!="tid" && $key!="TotalResult" && $key!="PageNo" && $key!="PageSize" && $key!="mod") ? "&".string_filter($key)."=".string_filter($value) : '';
         }
@@ -1142,8 +1171,23 @@ class ListView
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
+        //获得省略号
+        if ($totalpage > $total_list) {
+            $half = floor(($total_list-4) / 2);
+            $half_start = $this->PageNo-$half + 1;
+        if ($total_list % 2 !== 0) --$half_start;
+            $half_end = $this->PageNo + $half;
+        }
+        if (($totalpage-$this->PageNo) < ($total_list-3)) {
+            $half_start = $totalpage-$total_list + 3;
+            unset($half_end);
+        }
+        if ($this->PageNo <= ($total_list-3)) {
+            $half_end = $total_list-2;
+            unset($half_start);
+        }
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
             $total_list = $this->PageNo + $list_len;
@@ -1156,14 +1200,22 @@ class ListView
                 $total_list = $totalpage;
             }
         }
-        for ($j; $j <= $total_list; $j++) {
+        for ($j = 1; $j <= $totalpage; $j++) {
+            if (isset($half_start) && $j < $half_start && $j > 1) {
+            if ($j == 2) $listdd .= "<li class='page-item'><span class='page-link'>...</span></li>";
+                continue;
+            }
+            if (isset($half_end) && $j > $half_end && $j < $totalpage) {
+            if ($j == ($half_end + 1)) $listdd .= "<li class='page-item'><span class='page-link'>...</span></li>";
+                continue;
+            }
             if ($j == $this->PageNo) {
                 $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>\r\n";
             } else {
                 $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j".$pageaddurl."' class='page-link'>".$j."</a></li>\r\n";
             }
         }
-        $plist = "";
+        $plist = '';
         if (preg_match('/index/i', $listitem)) $plist .= $indexpage;
         if (preg_match('/pre/i', $listitem)) $plist .= $prepage;
         if (preg_match('/pageno/i', $listitem)) $plist .= $listdd;

src/system/archive/searchview.class.php

@@ -277,7 +277,7 @@ class SearchView
                 } else if ($row['count'] > 300) {
                     $fstyle = " style='color:green'";
                 } else {
-                    $style = "";
+                    $style = '';
                 }
                 $likeword .= "　<a href='search.php?keyword=".urlencode($row['keyword'])."&searchtype=titlekeyword'".$style.">".$row['keyword']."</a> ";
             }
@@ -526,7 +526,7 @@ class SearchView
         $query = "SELECT arc.*,act.typedir,act.typename,act.isdefault,act.defaultname,act.namerule,act.namerule2,act.ispart,act.moresite,act.siteurl,act.sitepath,mb.uname,mb.face,mb.userid FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` act ON arc.typeid=act.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE {$this->AddSql} $ordersql LIMIT $limitstart,$row";
         $this->dsql->SetQuery($query);
         $this->dsql->Execute("al");
-        $artlist = "";
+        $artlist = '';
         if ($col > 1) {
             $artlist = "<table width='$tablewidth'>\r\n";
         }
@@ -604,7 +604,7 @@ class SearchView
                     $artlist .= $this->dtp2->GetResult();
                 } //if hasRow
                 else {
-                    $artlist .= "";
+                    $artlist .= '';
                 }
                 if ($col > 1) $artlist .= "</td>\r\n";
             } //Loop Col
@@ -629,8 +629,8 @@ class SearchView
     function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno")
     {
         global $oldkeyword;
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -676,7 +676,7 @@ class SearchView
             $endpage = "<li class='page-item'><a class='page-link'>末页</a></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -697,7 +697,7 @@ class SearchView
                 $listdd .= "<li class='page-item'><a class='page-link' href='".$purl."PageNo=$j'>".$j."</a></li>\r\n";
             }
         }
-		$plist = "";
+		$plist = '';
         $plist .= "<form name='pagelist' action='".$this->GetCurUrl()."' class='d-flex'>$hidenform";
         $plist .= preg_match('/info/i', $listitem)? $infos : "";
         $plist .= preg_match('/index/i', $listitem)? $indexpage : "";

src/system/archive/sglistview.class.php

@@ -843,8 +843,8 @@ class SgListView
      */
     function GetPageListST($list_len, $listitem = "index,end,pre,next,pageno")
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -876,9 +876,9 @@ class SgListView
             $endpage = "<li class='page-item'><a class='page-link'>末页</a></li>";
         }
         //option链接
-        $optionlist = "";
+        $optionlist = '';
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -899,7 +899,7 @@ class SgListView
                 $listdd .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $j, $tnamerule)."'>".$j."</a></li>\r\n";
             }
         }
-        $plist = "";
+        $plist = '';
         if (preg_match('/info/i', $listitem)) {
             $plist .= $maininfo.' ';
         }
@@ -979,7 +979,7 @@ class SgListView
             $endpage = "<li class='page-item disabled'><a class='page-link'>末页</a></li>";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;

src/system/archive/specview.class.php

@@ -108,7 +108,7 @@ class SpecView
             if ($this->StartTime > 0) {
                 $timesql = " AND #@__archives.senddate>'".$this->StartTime."'";
             } else {
-                $timesql = "";
+                $timesql = '';
             }
             $row = $this->dsql->GetOne("SELECT count(*) AS dd FROM `#@__archives` WHERE `#@__archives`.arcrank > -1 AND channel=-1 $timesql");
             if (is_array($row)) {
@@ -185,7 +185,7 @@ class SpecView
             $totalpage = 1;
         }
         CreateDir($GLOBALS['cfg_special']);
-        $murl = "";
+        $murl = '';
         for ($this->PageNo = 1; $this->PageNo <= $totalpage; $this->PageNo++) {
             foreach ($this->dtp->CTags as $tagid => $ctag) {
                 if ($ctag->GetName() == "list") {
@@ -405,7 +405,7 @@ class SpecView
                     $artlist .= $this->dtp2->GetResult();
                 }//if hasRow
                 else {
-                    $artlist .= "";
+                    $artlist .= '';
                 }
                 if ($col > 1) {
                     $artlist .= "</td>\r\n";
@@ -430,8 +430,8 @@ class SpecView
      */
     function GetPageListST($list_len)
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -460,7 +460,7 @@ class SpecView
             $endpage = "<li><a>末页</a></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -494,8 +494,8 @@ class SpecView
 
     function GetPageListDM($list_len)
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -527,7 +527,7 @@ class SpecView
             $endpage = "<li><a>末页</a></li>";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;

src/system/archive/taglist.class.php

@@ -399,8 +399,8 @@ class TagList
      */
     function GetPageListDM($list_len, $listitem = "info,index,end,pre,next,pageno")
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = $this->PageNo - 1;
         $nextpagenum = $this->PageNo + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -430,7 +430,7 @@ class TagList
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -474,8 +474,8 @@ class TagList
     }
     function GetPageListST($list_len, $listitem = "info,index,end,pre,next,pageno")
     {
-        $prepage = "";
-        $nextpage = "";
+        $prepage = '';
+        $nextpage = '';
         $prepagenum = intval($this->PageNo) - 1;
         $nextpagenum = intval($this->PageNo) + 1;
         if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) {
@@ -504,7 +504,7 @@ class TagList
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
         //获得数字链接
-        $listdd = "";
+        $listdd = '';
         $total_list = $list_len * 2 + 1;
         if ($this->PageNo >= $total_list) {
             $j = $this->PageNo - $list_len;
@@ -525,7 +525,7 @@ class TagList
                 $listdd .= "<li class='page-item'><a href='".$purl."/$j/' class='page-link'>".$j."</a></li>\r\n";
             }
         }
-        $plist = "";
+        $plist = '';
         if (preg_match('/info/i', $listitem)) {
             $plist .= $maininfo.' ';
         }

src/system/channelunit.class.php

@@ -138,7 +138,7 @@ class ChannelUnit
             if (empty($GLOBALS["stNowPage"])) $NowPage = 1;
             else $NowPage = intval($GLOBALS["stNowPage"]);
         }
-        $revalue = "";
+        $revalue = '';
         $dtp = new DedeTagParse();
         $dtp->LoadSource($fvalue);
         if (!is_array($dtp->CTags)) {

src/system/common.func.php

@@ -489,7 +489,7 @@ function GetUpdateSQL()
     $sql4tmp = "ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language;
     $fp = fopen(DEDEROOT.'/install/update.txt','r');
     $sqls = array();
-    $current_ver = "";
+    $current_ver = '';
     while(!feof($fp))
     {
         $line = rtrim(fgets($fp,1024));