diff --git a/.gitignore b/.gitignore index 7a78c524..33e74142 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ src/special/ src/data/backupdata/* src/a/*.html src/data/mkall_cache_*.php +src/data/payment/cod.php diff --git a/src/dede/css/base.css b/src/dede/css/base.css index af62d39a..247fec98 100755 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -1,5 +1,5 @@ * { - font-size: 12px; + font-size: 13px; font-family: "宋体"; } @@ -8,7 +8,7 @@ td { } body { - font-size: 12px; + font-size: 13px; line-height: 1.5; font-family: "宋体"; background-color: #FFF; diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css index aab3118b..164966ba 100755 --- a/src/dede/css/frame.css +++ b/src/dede/css/frame.css @@ -11,7 +11,7 @@ body { body { height: 100%; - font-size: 12px; + font-size: 13px; font-family: Verdana, Arial, Helvetica, sans-serif; overflow: hidden; z-index: 1; @@ -36,16 +36,16 @@ form { .head { width: 100%; - height: 66px; + height: 76px; overflow: hidden; z-index: 8; position: relative; } .top { - height: 37px; + height: 47px; width: 100%; - background-color: rgb(94, 149, 0); + background-image: linear-gradient(135deg, #008E38 0%, #639709 100%); overflow: hidden; clear: both; } @@ -53,12 +53,13 @@ form { .top .top_logo { width: 170px; height: 37px; + margin-top: 5px; float: left; } .top .top_link { float: right; - padding: 5px 10px 0px 0px; + padding: 10px 10px 0px 0px; } .top .top_link ul { @@ -283,7 +284,7 @@ body.hidemenu .right { .left { position: absolute; - top: 66px; + top: 76px; width: 212px; left: 0px; bottom: 0px; @@ -303,6 +304,10 @@ body.hidemenu .right { height: 100%; } +.top_link { + font-size: 13px; +} + .menu iframe { height: 100%; width: 99.99%; @@ -312,7 +317,7 @@ body.hidemenu .right { .right { position: absolute; right: 0; - top: 66px; + top: 76px; bottom: 0px; z-index: 7; } diff --git a/src/dede/freelist_main.php b/src/dede/freelist_main.php index e204b3df..16062f2f 100755 --- a/src/dede/freelist_main.php +++ b/src/dede/freelist_main.php @@ -89,8 +89,8 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') {$row['templet']} {$row['click']} ".MyDate("y-m-d",$row['edtime'])." - 更改 | - 更新 | + 更改 + 更新 删除 "; diff --git a/src/dede/images/style2/style.css b/src/dede/images/style2/style.css index bd3faf38..219bf947 100755 --- a/src/dede/images/style2/style.css +++ b/src/dede/images/style2/style.css @@ -1,7 +1,7 @@ .top { height:37px; width:100%; - background-color:#3C86C5 ; + background-image: linear-gradient(135deg, #6561FE 0%, #1C6F93 100%); overflow:hidden; clear:both; } diff --git a/src/dede/images/style3/style.css b/src/dede/images/style3/style.css index 9da8feaf..88ea00f6 100755 --- a/src/dede/images/style3/style.css +++ b/src/dede/images/style3/style.css @@ -1,7 +1,7 @@ .top { height:37px; width:100%; - background-color:#9E8560; + background-image: linear-gradient(135deg, #856404 0%, #8B7859 100%); overflow:hidden; clear:both; } diff --git a/src/dede/images/style4/style.css b/src/dede/images/style4/style.css index e5052346..34693b21 100755 --- a/src/dede/images/style4/style.css +++ b/src/dede/images/style4/style.css @@ -1,7 +1,7 @@ .top { height:37px; width:100%; - background:rgb(231, 236, 239); + background-image: linear-gradient(135deg, #E2E3E5 0%, #83888C 100%); overflow:hidden; clear:both; } diff --git a/src/dede/inc/inc_archives_functions.php b/src/dede/inc/inc_archives_functions.php index af243750..205bc9b2 100755 --- a/src/dede/inc/inc_archives_functions.php +++ b/src/dede/inc/inc_archives_functions.php @@ -734,7 +734,7 @@ function Replace_Links( &$body, $allow_urls=array() ) $host_rule = preg_replace("#[\n\r]#", '', $host_rule); $host_rule = str_replace('.', "\\.", $host_rule); $host_rule = str_replace('/', "\\/", $host_rule); - $arr = ''; + $arr = array(); preg_match_all("#]*)>(.*)<\/a>#iU", $body, $arr); if( is_array($arr[0]) ) { @@ -857,7 +857,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='') $filename = $fullUrl; //水印 - @WaterImg($imgfile, 'up'); + @WaterImg($cfg_basedir.$fullUrl, 'up'); $isrm_up = TRUE; } @@ -870,7 +870,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='') } //远程图片并要求本地化 - if($isremote==1 && preg_match("#^http:\/\/#i", $handurl)) + if($isremote==1 && preg_match("#^http[s]?:\/\/#i", $handurl)) { $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID()); if(!is_array($ddinfos)) @@ -898,7 +898,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='') //把新上传的图片信息保存到媒体文档管理档案中 $inquery = " - INSERT INTO #@__uploads(title,url,mediatype,width,height,playtime,filesize,uptime,mid) + 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()."'); "; $dsql->ExecuteNoneQuery($inquery); diff --git a/src/dede/index_body.php b/src/dede/index_body.php index d366e449..26562f07 100755 --- a/src/dede/index_body.php +++ b/src/dede/index_body.php @@ -216,12 +216,6 @@ else if ($dopost == 'getRightSide') { - +
 自定义属性： 自定义属性： SetQuery("Select * From `#@__arcatt` order by sortid asc"); $dsql->Execute(); @@ -152,7 +152,7 @@ - + @@ -202,7 +202,7 @@
 TAG标签： Tag标签： (','号分开，单个标签小于12字节) - +
 图集主栏目： 图集主栏目： - + @@ -358,7 +358,7 @@
 表现方式： 表现方式： /> @@ -325,12 +325,12 @@ - + +
 压缩包文件： 压缩包文件： - - 处理后删除压缩文件
- +
 手工上传： 手工上传： diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm index 4ea63703..9c7ec903 100755 --- a/src/dede/templets/album_edit.htm +++ b/src/dede/templets/album_edit.htm @@ -112,7 +112,7 @@ body {
- +
 自定义属性： 自定义属性： SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC"); $dsql->Execute(); @@ -140,7 +140,7 @@ body {
- + @@ -186,7 +186,7 @@ body {
 TAG标签： Tag标签： (','号分开，单个标签小于12字节) 权重：
- +
 图集主栏目： 图集主栏目： getUserChannel(),$channelid); echo "
- + @@ -404,7 +404,7 @@ if($cfg_need_typeid2=='Y') {
 图集副栏目： 图集副栏目： ' style='width:200px;' /> 选择副栏目