diff --git a/src/dede/config.php b/src/dede/config.php index 94a245ea..6d4a15c1 100755 --- a/src/dede/config.php +++ b/src/dede/config.php @@ -100,35 +100,6 @@ if($cfg_dede_log=='Y') } } -//启用远程站点则创建FTP类 -if($cfg_remote_site=='Y') -{ - require_once(DEDEINC.'/ftp.class.php'); - if(file_exists(DEDEDATA."/cache/inc_remote_config.php")) - { - require_once DEDEDATA."/cache/inc_remote_config.php"; - } - if(empty($remoteuploads)) $remoteuploads = 0; - if(empty($remoteupUrl)) $remoteupUrl = ''; - $config = array( - 'hostname' => $GLOBALS['cfg_ftp_host'], - 'username' => $GLOBALS['cfg_ftp_user'], - 'password' => $GLOBALS['cfg_ftp_pwd'], - 'debug' => 'TRUE' - ); - $ftp = new FTP($config); - - //初始化FTP配置 - if($remoteuploads==1){ - $ftpconfig = array( - 'hostname'=>$rmhost, - 'port'=>$rmport, - 'username'=>$rmname, - 'password'=>$rmpwd - ); - } -} - //管理缓存、管理员频道缓存 $cache1 = DEDEDATA.'/cache/inc_catalog_base.inc'; if(!file_exists($cache1)) UpDateCatCache(); diff --git a/src/dede/templets/catalog_menu2.htm b/src/dede/templets/catalog_menu2.htm index 804a15d1..8ccca236 100755 --- a/src/dede/templets/catalog_menu2.htm +++ b/src/dede/templets/catalog_menu2.htm @@ -3,6 +3,8 @@
@@ -175,19 +176,19 @@ body
-
-
+
+
- - - + + + |
|||||||||||
+ | - | 站点目录树 | +站点目录树 | ||||||||
diff --git a/src/dede/templets/content_list.htm b/src/dede/templets/content_list.htm index accfb398..80dfd68d 100755 --- a/src/dede/templets/content_list.htm +++ b/src/dede/templets/content_list.htm @@ -55,14 +55,14 @@ | |||||||||||
ID | 选择 | -文章标题 | +文章标题 | 更新时间 | 类目 | 点击 | HTML | 权限 | 发布人 | -操作 | +操作 |
{dede:field.mid function=GetMemberName(@me)/} | - | + | {dede:field.mediatype function="MediaType(@me,$fields['url'])"/} | 更改 - | 删除 | diff --git a/src/include/tpllib/plus_ask.php b/src/include/tpllib/plus_ask.php deleted file mode 100755 index 1dcc54e0..00000000 --- a/src/include/tpllib/plus_ask.php +++ /dev/null @@ -1,66 +0,0 @@ -SetQuery($query); - $dsql->Execute('an'); - $rearr = array(); - while($row = $dsql->GetArray('an')) - { - if($row['tid2'] != 0) - $row['typelink'] = $row['typedata'] = " {$row['tid2name']}\r\n"; - else - $row['typelink'] = $row['typedata'] = " {$row['tidname']}\r\n"; - $row['title'] = cn_substr($row['title'],$titlelen); - $rearr[] = $row; - } - return $rearr; -} \ No newline at end of file diff --git a/src/include/tpllib/plus_newvisitor.php b/src/include/tpllib/plus_newvisitor.php deleted file mode 100755 index b8b7415b..00000000 --- a/src/include/tpllib/plus_newvisitor.php +++ /dev/null @@ -1,15 +0,0 @@ -SetQuery($query); - $dsql->Execute("al"); - $artlist = ''; - $rearr = array(); - while($row = $dsql->GetArray("al")) - { - //处理一些特殊字段 - $row['infos'] = cn_substr($row['description'],$infolen); - $row['id'] = $row['id']; - - $row['arcurl'] = GetFileUrl($row['id'],$row['typeid'],$row['senddate'],$row['title'],$row['ismake'], - $row['arcrank'],$row['namerule'],$row['typedir'],$row['money'],$row['filename'],$row['moresite'],$row['siteurl'],$row['sitepath']); - - $row['typeurl'] = GetTypeUrl($row['typeid'],$row['typedir'],$row['isdefault'],$row['defaultname'],$row['ispart'], - $row['namerule2'],$row['moresite'],$row['siteurl'],$row['sitepath']); - - if($row['litpic']=='') - { - $row['litpic'] = '/static/defaultpic.gif'; - } - if(!preg_match("#^http:\/\/#i", $row['litpic'])) - { - $row['picname'] = $row['litpic'] = $GLOBALS['cfg_cmsurl'].$row['litpic']; - } - else - { - $row['picname'] = $row['litpic'] = $row['litpic']; - } - $row['stime'] = GetDateMK($row['pubdate']); - $row['typelink'] = "".$row['typename'].""; - $row['image'] = "<]#", "", $row['title'])."'>"; - $row['imglink'] = "".$row['image'].""; - $row['fulltitle'] = $row['title']; - $row['title'] = cn_substr($row['title'],$titlelen); - if($row['color']!='') { - $row['title'] = "".$row['title'].""; - } - if(preg_match('#b#', $row['flag'])) - { - $row['title'] = "".$row['title'].""; - } - //$row['title'] = "".$row['title'].""; - - $row['textlink'] = "".$row['title'].""; - - $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; - $row['memberurl'] = $GLOBALS['cfg_memberurl']; - $row['templeturl'] = $GLOBALS['cfg_templeturl']; - - $rearr[] = $row; - }//loop line - $dsql->FreeResult("al"); - return $rearr; -} \ No newline at end of file diff --git a/src/templets/default/index.htm b/src/templets/default/index.htm index 8e6d3056..97638d79 100755 --- a/src/templets/default/index.htm +++ b/src/templets/default/index.htm @@ -8,6 +8,7 @@ +