diff --git a/src/admin/css/menu.css b/src/admin/css/menu.css index 244cbd23..b6a9f2fd 100644 --- a/src/admin/css/menu.css +++ b/src/admin/css/menu.css @@ -1 +1 @@ -*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}body.showmenu .body-left{display:block}body.hidemenu .body-left{display:none}body.showmenu .body-right{left:260px;transition:all .2s}body.hidemenu .body-right{left:0;transition:all .2s}a,a:hover{text-decoration:none}ul,li{list-style:none}input[type=text]{padding:.2rem;width:140px;height:26px;line-height:26px;font-size:12px;background:#fff;border:0;border-radius:.2rem;vertical-align:middle}input[type=text]:focus{box-shadow:none;outline:none}.body-left{position:absolute;top:60px;width:260px;left:0;bottom:0;z-index:7}.body-right{position:absolute;right:0;top:60px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:100%;height:100%;z-index:20}.menu{height:100%}.menu iframe{width:100%;height:100%;z-index:20}.head{position:relative;width:100%;height:60px;overflow:hidden;z-index:8}.top{width:100%;height:60px;background:linear-gradient(45deg,#008e38,#57960f 50%);box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075)}.top .top-logo{float:left;width:230px;margin-left:30px}.top .top-dedebiz a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}.top .top-dedebiz a img{width:100px}.top .top-version a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}.top .top-version{float:left;margin-top:20px;margin-left:10px;color:#fff}.top .btn-primary{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .btn-warning{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .top-item ul li{float:left;padding-left:30px;height:60px;line-height:60px}.top .top-item ul li a{color:#fff}.top .top-item ul li a:hover{color:#dee2e6}.search{margin-left:-20px;height:20px;line-height:20px;font-size:12px;color:#424b51;background:0;border-radius:.2rem;border:0;cursor:pointer}.top .top-admin{float:right;height:60px;line-height:60px;margin-right:30px}.top .top-admin img{margin-right:10px;width:30px;height:30px;border-radius:50%}.top .top-admin ul li{float:left;padding-left:30px;height:60px;line-height:60px}.top .top-admin ul li a{color:#fff}.top .top-admin ul li a:hover{color:#dee2e6}.menu-box{margin:0;padding:0 6px;background:#f8f8f8;overflow:scroll;overflow-x:hidden}.menu-left{padding-top:1rem}.menu-right{width:100%;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:0 0 .2rem .2rem}a.menu-item div{margin-bottom:6px;padding:6px 0;width:56px;color:#424b51;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;cursor:pointer;text-align:center;transition:all .2s}a.menu-item:hover div{color:#fff;background:#424b51}a.menu-active div{margin-bottom:6px;padding:6px 0;width:56px;color:#fff;background:#424b51;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;text-align:center}dl.bitem{margin:1rem 0 10px 0;padding:0 10px}dl.bitem dt{margin-bottom:10px;padding-left:10px;height:28px;line-height:28px;background:#f8f8f8;border-radius:.2rem;cursor:pointer}dl.bitem dt b{color:#424b51}dl.bitem dt b i{margin-right:10px;width:10px}.sitemu li{padding:0 0 0 30px;display:block;height:26px;line-height:26px}.fllct{float:left}.flrct{float:right}.fa-minus-circle{color:#dc3545}.fa-plus-circle{color:#28a745} \ No newline at end of file +*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}body.showmenu .body-left{display:block}body.hidemenu .body-left{display:none}body.showmenu .body-right{left:260px;transition:all .2s}body.hidemenu .body-right{left:0;transition:all .2s}a,a:hover{text-decoration:none}ul,li{list-style:none}input[type=text]{padding:.2rem;width:140px;height:26px;line-height:26px;font-size:12px;background:#fff;border:0;border-radius:.2rem;vertical-align:middle}input[type=text]:focus{box-shadow:none;outline:none}.body-left{position:absolute;top:60px;width:260px;left:0;bottom:0;z-index:7}.body-right{position:absolute;right:0;top:60px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:100%;height:100%;z-index:20}.menu{height:100%}.menu iframe{width:100%;height:100%;z-index:20}.head{position:relative;width:100%;height:60px;overflow:hidden;z-index:8}.top{width:100%;height:60px;background:linear-gradient(45deg,#008e38,#57960f 50%);box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075)}.top .top-logo{float:left;width:230px;margin-left:30px}.top .top-dedebiz a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}.top .top-dedebiz a img{width:100px}.top .top-version a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}.top .top-version{float:left;margin-top:20px;margin-left:10px;color:#fff}.top .btn-primary{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .btn-warning{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .top-item ul li{float:left;padding-left:30px;height:60px;line-height:60px}.top .top-item ul li a{color:#fff}.top .top-item ul li a:hover{color:#dee2e6}.search{margin-left:-20px;height:20px;line-height:20px;font-size:12px;color:#424b51;background:0;border-radius:.2rem;border:0;cursor:pointer}.top .top-admin{float:right;height:60px;line-height:60px;margin-right:30px}.top .top-admin img{margin-right:10px;width:30px;height:30px;border-radius:50%}.top .top-admin ul li{float:left;padding-left:30px;height:60px;line-height:60px}.top .top-admin ul li a{color:#fff}.top .top-admin ul li a:hover{color:#dee2e6}.menu-box{margin:0;padding:0 6px;background:#f8f8f8;overflow:scroll;overflow-x:hidden}.menu-left{padding-top:1rem}.menu-right{width:100%;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:0 0 .2rem .2rem}a.menu-item div{margin-bottom:6px;padding:6px 0;width:56px;color:#424b51;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;cursor:pointer;text-align:center;transition:all .2s}a.menu-item:hover div{color:#fff;background:#424b51}a.menu-active div{margin-bottom:6px;padding:6px 0;width:56px;color:#fff;background:#424b51;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;text-align:center}dl.bitem{margin:1rem 0 10px 0;padding:0 10px}dl.bitem dt{margin-bottom:10px;padding-left:10px;height:28px;line-height:28px;background:#f8f8f8;border-radius:.2rem;cursor:pointer}dl.bitem dt b{color:#424b51}dl.bitem dt b i{margin-right:10px;width:10px}.sitemu li{padding:0 0 0 30px;display:block;height:26px;line-height:26px}.fllct{float:left}.flrct{float:right}.fa{font-size:14px!important}.fa-minus-circle{color:#dc3545}.fa-plus-circle{color:#28a745} \ No newline at end of file diff --git a/src/admin/js/menu.js b/src/admin/js/menu.js deleted file mode 100644 index 6055c04e..00000000 --- a/src/admin/js/menu.js +++ /dev/null @@ -1,16 +0,0 @@ -$(function () { - //左侧菜单开关 - LeftMenuToggle(); -}); -function LeftMenuToggle() { - //左侧菜单开关 - $("#togglemenu").click(function () { - if ($("body").attr("class") == "showmenu") { - $("body").attr("class", "hidemenu"); - $(this).html(''); - } else { - $("body").attr("class", "showmenu"); - $(this).html(''); - } - }); -} \ No newline at end of file diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 001df61b..85a26652 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -10,7 +10,6 @@ -
@@ -75,10 +72,20 @@ \ No newline at end of file diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 4e537bf6..b8535d1d 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -22,7 +22,7 @@
-
流量统计表
+
流量统计表
@@ -111,7 +111,7 @@
-
流量统计图
+
流量统计图
diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm index 63eb0620..d1de5648 100644 --- a/src/admin/templets/index_menu.htm +++ b/src/admin/templets/index_menu.htm @@ -29,18 +29,14 @@
会员
 - getUserType()>=10) { - ?> + getUserType()>=10){ ?>
模板
系统
 - +
{/dede:datalist} diff --git a/src/apps/flink.php b/src/apps/flink.php index 94c30986..95610a90 100755 --- a/src/apps/flink.php +++ b/src/apps/flink.php @@ -9,13 +9,13 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -require_once(dirname(__FILE__) . "/../system/common.inc.php"); +require_once(dirname(__FILE__)."/../system/common.inc.php"); if (empty($dopost)) $dopost = ''; if ($dopost == 'save') { $validate = isset($validate) ? strtolower(trim($validate)) : ''; $svali = GetCkVdValue(); if ($validate == '' || $validate != $svali) { - ShowMsg('验证码不正确!', '-1'); + ShowMsg('验证码不正确', '-1'); exit(); } $msg = RemoveXSS(dede_htmlspecialchars($msg)); @@ -28,12 +28,12 @@ if ($dopost == 'save') { $query = "INSERT INTO `#@__flink`(sortrank,url,webname,logo,msg,email,typeid,dtime,ischeck) VALUES('50','$url','$webname','$logo','$msg','$email','$typeid','$dtime','0')"; $dsql->ExecuteNoneQuery($query); - ShowMsg('成功增加一个链接，但需要审核后才能显示!', 'flink.php'); + ShowMsg('成功增加一个链接，但需要审核后才能显示', 'flink.php'); exit; } elseif ($dopost == 'add') { //显示模板(简单PHP文件) - include_once(DEDETEMPLATE . '/plus/flink-add.htm'); + include_once(DEDETEMPLATE.'/plus/flink-add.htm'); exit; } //显示模板简单PHP文件 -include_once(DEDETEMPLATE . '/plus/flink-list.htm'); +include_once(DEDETEMPLATE.'/plus/flink-list.htm'); diff --git a/src/system/common.inc.php b/src/system/common.inc.php index c296f757..67774474 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -7,8 +7,8 @@ * @link https://www.dedebiz.com */ //V6安全模式，如果启用安全模式，后台将禁用例如：模板管理、标签管理、数据库管理等存在较高安全风险的功能 -define('DEDEBIZ_SAFE_MODE', TRUE); //启用安全模式 -//define('DEDEBIZ_SAFE_MODE', FALSE); //关闭安全模式 +//define('DEDEBIZ_SAFE_MODE', TRUE); //启用安全模式 +define('DEDEBIZ_SAFE_MODE', FALSE); //关闭安全模式 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，便于开发调试 if (!defined('DEDE_ENVIRONMENT')) { define('DEDE_ENVIRONMENT', 'production'); diff --git a/src/system/helpers/image.helper.php b/src/system/helpers/image.helper.php index 94d1d6ad..0abd6ca8 100755 --- a/src/system/helpers/image.helper.php +++ b/src/system/helpers/image.helper.php @@ -141,8 +141,8 @@ if (!function_exists('gdversion')) { if (!function_exists('WaterImg')) { function WaterImg($srcFile, $fromGo = 'up') { - include(DEDEDATA . '/mark/inc_photowatermark_config.php'); - require_once(DEDEINC . '/image.class.php'); + include(DEDEDATA.'/mark/inc_photowatermark_config.php'); + require_once(DEDEINC.'/image.class.php'); if (isset($GLOBALS['needwatermark'])) { $photo_markup = $photo_markdown = empty($GLOBALS['needwatermark']) ? '0' : '1'; } @@ -162,7 +162,7 @@ if (!function_exists('WaterImg')) { if ($fromGo == 'down' && $photo_markdown == '0') { return; } - $TRUEMarkimg = DEDEDATA . '/mark/' . $photo_markimg; + $TRUEMarkimg = DEDEDATA.'/mark/'.$photo_markimg; if (!file_exists($TRUEMarkimg) || empty($photo_markimg)) { $TRUEMarkimg = ""; } @@ -171,8 +171,8 @@ if (!function_exists('WaterImg')) { } $cfg_watermarktext = array(); if ($photo_marktype == '2') { - if (file_exists(DEDEDATA . '/mark/simhei.ttf')) { - $cfg_watermarktext['fontpath'] = DEDEDATA . '/mark/simhei.ttf'; + if (file_exists(DEDEDATA.'/mark/simhei.ttf')) { + $cfg_watermarktext['fontpath'] = DEDEDATA.'/mark/simhei.ttf'; } else { return; } diff --git a/src/system/image.class.php b/src/system/image.class.php index 6e8c109d..0a665544 100755 --- a/src/system/image.class.php +++ b/src/system/image.class.php @@ -132,7 +132,7 @@ class image $thumb['width'] = ceil($y_ratio * $imagewidth); $thumb['height'] = $thumbheight; } - $targetfile = !$preview ? ($this->thumbstatus == 1 ? $this->targetfile . '.thumb.jpg' : $this->targetfile) : './watermark_tmp.jpg'; + $targetfile = !$preview ? ($this->thumbstatus == 1 ? $this->targetfile.'.thumb.jpg' : $this->targetfile) : './watermark_tmp.jpg'; $thumb_photo = imagecreatetruecolor($thumb['width'], $thumb['height']); $alpha = imagecolorallocatealpha($thumb_photo, 0, 0, 0, 127); imagefill($thumb_photo, 0, 0, $alpha); @@ -162,7 +162,7 @@ class image $imagefunc = $this->imagefunc; list($imagewidth, $imageheight) = $this->attachinfo; if ($this->watermarktype < 2) { - $watermark_file = $this->watermarktype == 1 ? DEDEDATA . '/mark/mark.png' : DEDEDATA . '/mark/mark.gif'; + $watermark_file = $this->watermarktype == 1 ? DEDEDATA.'/mark/mark.png' : DEDEDATA.'/mark/mark.gif'; $watermarkinfo = @getimagesize($watermark_file); $watermark_logo = $this->watermarktype == 1 ? @imagecreatefrompng($watermark_file) : @imagecreatefromgif($watermark_file); if (!$watermark_logo) { diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index f0c6acd2..ef014f07 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -120,7 +120,7 @@ class TypeUnit echo "
getUserRank(),'main'); ?>
diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index c00229dc..66ac316d 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -354,7 +354,7 @@ li{float:left;padding-right:10px;line-height:26px} 		{dede:field.egroup /} 更新缓存 - 查看子分类 + 查看子分类
{$nss}".$typeName."[ID:".$id."]（文档：".$this->GetTotalArc($id)."）"; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; @@ -133,7 +133,7 @@ class TypeUnit echo "
{$nss}".$typeName."[ID:".$id."] "; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; @@ -205,7 +205,7 @@ class TypeUnit echo "$step{$nss}".$typeName."[ID:".$id."]（文档：".$this->GetTotalArc($id)."）"; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; @@ -219,7 +219,7 @@ class TypeUnit echo "$step{$nss}".$typeName."[ID:".$id."]"; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo "";