diff --git a/docs/changelog.md b/docs/changelog.md index adb41269..da5b077e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,6 +10,10 @@ - 优化后台和前台资源整理一起方便维护； - 优化会员中心资料修改繁琐问题； - 优化默认模板和插件模板； +- 优化自定义表单搜索； +- 优化标签管理搜索； +- 优化列表分页省略号功能； +- 优化静态栏目时不生成目录文件夹； - 修正谷歌浏览器错误提示； - 修正伪静态栏目开启绝对链接问题； - 修正富文本的错误问题； diff --git a/src/admin/action_search.php b/src/admin/action_search.php index 3d814da0..e7552c21 100644 --- a/src/admin/action_search.php +++ b/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(); diff --git a/src/admin/ad_add.php b/src/admin/ad_add.php index 5ab66d7e..eba353f6 100644 --- a/src/admin/ad_add.php +++ b/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 = "{$normbody['title']}"; } 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 = ""; } else { if (empty($normbody['width'])) { - $width = ""; + $width = ''; } else { $width = " width=\"{$normbody['width']}\""; } if (empty($normbody['height'])) { - $height = ""; + $height = ''; } else { $height = "height=\"{$normbody['height']}\""; } diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 272a59f3..41d74227 100644 --- a/src/admin/album_add.php +++ b/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) == '') { diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index c52af627..2d2ec1c3 100644 --- a/src/admin/album_edit.php +++ b/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; diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index dee6b94e..cbb60839 100644 --- a/src/admin/article_description_main.php +++ b/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 != "") { diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index 83c59bd4..29d916a3 100644 --- a/src/admin/article_keywords_select.php +++ b/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"); diff --git a/src/admin/cards_manage.php b/src/admin/cards_manage.php index 675e14c2..4e606367 100644 --- a/src/admin/cards_manage.php +++ b/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' "; diff --git a/src/admin/cards_type.php b/src/admin/cards_type.php index 508ab1fc..97bfec9a 100644 --- a/src/admin/cards_type.php +++ b/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; diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 3c5445a1..4f842ca1 100644 --- a/src/admin/catalog_add.php +++ b/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 = ''; diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index f1a1ec82..7b85fdaa 100644 --- a/src/admin/catalog_do.php +++ b/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'; diff --git a/src/admin/content_list.php b/src/admin/content_list.php index 2ccba983..25722221 100644 --- a/src/admin/content_list.php +++ b/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); diff --git a/src/admin/content_sg_list.php b/src/admin/content_sg_list.php index 1196ed7a..94b0354e 100644 --- a/src/admin/content_sg_list.php +++ b/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); diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index 01636801..257fb48a 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -94,8 +94,8 @@ if (!empty($iseditor)) { $file @@ -147,7 +147,7 @@ if (!empty($iseditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; if ($file == $comeback) $lstyle = "text-danger"; - else $lstyle = ""; + else $lstyle = ''; $line = " $file $filesize KB diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 636cf9b7..375bda19 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -73,8 +73,8 @@ if (!empty($noeditor)) { $file $filesize KB @@ -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 = " $file $filesize KB @@ -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 = " $file $filesize KB @@ -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 = " $file $filesize KB diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 007aa709..84f5e2d0 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -76,7 +76,7 @@ if (!empty($noeditor)) { GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); - if (empty($job)) $job = ""; + if (empty($job)) $job = ''; //确认提示 if ($job == "") { $wintitle = "删除所有自定义表"; diff --git a/src/admin/feedback_edit.php b/src/admin/feedback_edit.php index def12503..cb3554ca 100644 --- a/src/admin/feedback_edit.php +++ b/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); diff --git a/src/admin/file_class.php b/src/admin/file_class.php index 1a740ea4..82a2a086 100644 --- a/src/admin/file_class.php +++ b/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; //初始化系统 diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index e9d89af4..d79e4c87 100644 --- a/src/admin/file_manage_control.php +++ b/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')); diff --git a/src/admin/file_manage_main.php b/src/admin/file_manage_main.php index 22c17153..52ba6085 100644 --- a/src/admin/file_manage_main.php +++ b/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; diff --git a/src/admin/file_manage_view.php b/src/admin/file_manage_view.php index 2f8f0d9e..c35ff352 100644 --- a/src/admin/file_manage_view.php +++ b/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 = "\r\n"; diff --git a/src/admin/friendlink_add.php b/src/admin/friendlink_add.php index d3419c27..2dbe1b65 100644 --- a/src/admin/friendlink_add.php +++ b/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)) { diff --git a/src/admin/friendlink_edit.php b/src/admin/friendlink_edit.php index 2cc732f8..bb50073a 100644 --- a/src/admin/friendlink_edit.php +++ b/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); diff --git a/src/admin/inc/inc_archives_all.php b/src/admin/inc/inc_archives_all.php index e007dcc3..e3598008 100644 --- a/src/admin/inc/inc_archives_all.php +++ b/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 .= "
".$ctag->GetAtt('itemname').""; $formitem .= GetEditor($fieldname, '', 350, 'Basic', 'string'); $formitem .= "
\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 = "\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 = "\r\n"; $formitem .= "\r\n"; diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index cce123fd..bf8e063c 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/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()."');"; diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index f466feef..2d8d8932 100644 --- a/src/admin/inc/inc_batchup.php +++ b/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); diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index 97f42a52..e9fd14e6 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -51,7 +51,7 @@ function GetMenus($userrank, $topos = 'main') } $link = "$link"; } else { - $link .= ""; + $link .= ''; } $itemtmp = str_replace('~link~', $link, $itemTemplet); echo $itemtmp; diff --git a/src/admin/index_body.php b/src/admin/index_body.php index c9915e31..8805d849 100644 --- a/src/admin/index_body.php +++ b/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 { diff --git a/src/admin/log_edit.php b/src/admin/log_edit.php index cbf462c8..5f34753f 100644 --- a/src/admin/log_edit.php +++ b/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' "; diff --git a/src/admin/log_list.php b/src/admin/log_list.php index 2bab78cb..bb63e910 100644 --- a/src/admin/log_list.php +++ b/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')) { diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php index de17518c..fa72521e 100644 --- a/src/admin/makehtml_spec.php +++ b/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(); diff --git a/src/admin/media_add.php b/src/admin/media_add.php index 770d2605..22f08f48 100644 --- a/src/admin/media_add.php +++ b/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(); diff --git a/src/admin/media_edit.php b/src/admin/media_edit.php index 0106c5ba..b14b6296 100644 --- a/src/admin/media_edit.php +++ b/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); diff --git a/src/admin/media_main.php b/src/admin/media_main.php index c45d79f2..b3fba2d6 100644 --- a/src/admin/media_main.php +++ b/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; diff --git a/src/admin/member_type.php b/src/admin/member_type.php index 6b3981fc..54495f70 100644 --- a/src/admin/member_type.php +++ b/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; diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 505decad..50f4d959 100644 --- a/src/admin/module_main.php +++ b/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 = "官方网址：{$devInfo['offurl']}
"; } diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 71d0eeb0..5a94b435 100644 --- a/src/admin/mychannel_edit.php +++ b/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"); diff --git a/src/admin/mytag_add.php b/src/admin/mytag_add.php index dc1b5573..cb9fafa4 100644 --- a/src/admin/mytag_add.php +++ b/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); diff --git a/src/admin/mytag_tag_guide_ok.php b/src/admin/mytag_tag_guide_ok.php index caca3464..5eb8fe59 100644 --- a/src/admin/mytag_tag_guide_ok.php +++ b/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."'"; diff --git a/src/admin/plus_edit.php b/src/admin/plus_edit.php index 648a9978..f22e13f9 100644 --- a/src/admin/plus_edit.php +++ b/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"); diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index fc8c7d00..9866c21d 100644 --- a/src/admin/spec_add.php +++ b/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); diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index ef71dfc0..0f269d5b 100644 --- a/src/admin/spec_edit.php +++ b/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); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index d889a03e..47d70a7e 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/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); diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index b71f979d..c71db521 100644 --- a/src/admin/sys_data_done.php +++ b/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; diff --git a/src/admin/sys_group.php b/src/admin/sys_group.php index 46da26da..0f1d5507 100644 --- a/src/admin/sys_group.php +++ b/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'); ?> \ No newline at end of file diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php index 10101e45..274740ee 100644 --- a/src/admin/sys_group_edit.php +++ b/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 "; diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 9d80be34..c67907b1 100644 --- a/src/admin/sys_info.php +++ b/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() diff --git a/src/admin/sys_info_mark.php b/src/admin/sys_info_mark.php index cd0caae3..7c37ae79 100644 --- a/src/admin/sys_info_mark.php +++ b/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)); diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 14e3fd1c..4930001e 100644 --- a/src/admin/sys_safetest.php +++ b/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)); diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index 17c9621c..cbb00b18 100644 --- a/src/admin/sys_sql_query.php +++ b/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); diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index 5ac3e88d..618ee285 100644 --- a/src/admin/tag_test_action.php +++ b/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"); diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 6d46c2a0..0eda4090 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -96,7 +96,7 @@ 上传图片 - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 21f86761..7954d898 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -92,7 +92,7 @@ 上传图片 - + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index ad7bdd52..f3366ca4 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -65,7 +65,7 @@ 上传图片 - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 96f39dfe..7644f1a6 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -91,7 +91,7 @@ 上传图片 - + diff --git a/src/admin/templets/article_result_same.htm b/src/admin/templets/article_result_same.htm index 63e4a266..6b282f32 100644 --- a/src/admin/templets/article_result_same.htm +++ b/src/admin/templets/article_result_same.htm @@ -53,7 +53,7 @@ diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm index 6208b271..b801f36d 100644 --- a/src/admin/templets/media_edit.htm +++ b/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; diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 9df58c31..0fc7c3c3 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -76,7 +76,7 @@
".$ctag->GetAtt('itemname')."\r\n".GetEditor($fieldname, $okfvalue, 350, 'Basic', 'string')."