diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index 96175976..df7538db 100644 --- a/src/admin/actionsearch_class.php +++ b/src/admin/actionsearch_class.php @@ -1,13 +1,11 @@ asarray[$key]['soniterm'])) { foreach ($this->asarray[$key]['soniterm'] as $k => $val) { //进行权限判断 - if (UserLogin::TestPurview($val['purview'])) { + if (TestPurview($val['purview'])) { //如果有操作权限 if ($this->_strpos($val['title'], $this->keyword) !== false || $this->_strpos($val['description'], $this->keyword) !== false) { //一级项目匹配 @@ -77,7 +75,7 @@ class ActionSearch if (is_array($text)) { foreach ($text as $key => $value) { if ($key == 'title' || $key == 'description') { - //仅对title，description进行数组替换 + //仅对title,description进行数组替换 $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); } } diff --git a/src/admin/ad_add.php b/src/admin/ad_add.php index ac6366c4..68b6cd07 100644 --- a/src/admin/ad_add.php +++ b/src/admin/ad_add.php @@ -8,16 +8,17 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_广告管理'); +CheckPurview('plus_广告管理'); +require_once DEDEINC."/typelink/typelink.class.php"; if (empty($dopost)) $dopost = ""; if ($dopost == "save") { CheckCSRF(); + //timeset tagname typeid normbody expbody $tagname = trim($tagname); $row = $dsql->GetOne("SELECT typeid FROM `#@__myad` WHERE typeid='$typeid' AND tagname LIKE '$tagname'"); if (is_array($row)) { - ShowMsg(Lang("mytag_add_err_same"), "-1"); + ShowMsg("在相同栏目下已经存在同名的标记", "-1"); exit(); } $starttime = GetMkTime($starttime); @@ -52,10 +53,9 @@ if ($dopost == "save") { } $normbody = ""; } - $query = "INSERT INTO #@__myad(clsid,typeid,tagname,adname,timeset,starttime,endtime,normbody,expbody) - VALUES ('$clsid','$typeid','$tagname','$adname','$timeset','$starttime','$endtime','$normbody','$expbody');"; + $query = "INSERT INTO `#@__myad` (clsid,typeid,tagname,adname,timeset,starttime,endtime,normbody,expbody) VALUES ('$clsid','$typeid','$tagname','$adname','$timeset','$starttime','$endtime','$normbody','$expbody');"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("ad_success_add"), "ad_main.php"); + ShowMsg("成功增加一个广告", "ad_main.php"); exit(); } $dsql->Execute('dd', 'SELECT * FROM `#@__myadtype` ORDER BY id DESC'); diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php index 2021dbce..95a87c62 100644 --- a/src/admin/ad_edit.php +++ b/src/admin/ad_edit.php @@ -8,29 +8,37 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_广告管理'); +CheckPurview('plus_广告管理'); +require_once(DEDEINC.'/typelink/typelink.class.php'); if (empty($dopost)) $dopost = ''; $aid = preg_replace("#[^0-9]#", '', $aid); $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "ad_main.php" : $_COOKIE['ENV_GOBACK_URL']; if ($dopost == 'delete') { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__myad` WHERE aid='$aid'"); - ShowMsg(Lang("ad_success_delete"), $ENV_GOBACK_URL); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__myad` WHERE aid='$aid' "); + ShowMsg("成功删除一则广告代码", $ENV_GOBACK_URL); exit(); } else if ($dopost == "gettag") { + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $jscode = ""; $showhtml = "\r\n\r\n$jscode\r\n\r\n"; - $showhtml .= Lang('view')."："; - $row = $dsql->GetOne("SELECT tagname FROM `#@__myad` WHERE aid='$aid'"); + $showhtml .= "预览："; + $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' "); $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}'; - $info = Lang("ad_info"); - $wintitle = Lang("ad_title"); - $wecome_info = "".Lang('ad_main')."::".Lang('ad_main_getjs'); - DedeWin::Instance()->Init()->GetWindow("hand", $info)->AddTitle(Lang("ad_edit_title1")) - ->GetWindow("hand", $showtag)->SetMyWinItem("") - ->AddTitle(Lang("ad_edit_title2"))->GetWindow("hand", $showhtml)->Display(); + $info = "说明：如果嵌入的是织梦CMS广告标签，那将会解析成标签中的内容到页面，广告修改后需要重新生成
+ 如果不希望重新生成所有页面，则直接调用JS代码即可 + "; + $wintitle = "广告管理-获取广告标签"; + $wecome_info = "广告管理::获取JS"; + $win = new OxWindow(); + $win->Init(); + $winform = $win->GetWindow("hand", $info); + $win->AddTitle("织梦CMS标签调用代码："); + $winform = $win->GetWindow("hand", $showtag); + $win->myWinItem = ''; + $win->AddTitle("以下为选定广告的js调用代码："); + $winform = $win->GetWindow("hand", $showhtml); + $win->Display(); exit(); } else if ($dopost == 'testjs') { echo ""; @@ -41,7 +49,7 @@ if ($dopost == 'delete') { $endtime = GetMkTime($endtime); $query = "UPDATE `#@__myad` SET clsid='$clsid',typeid='$typeid',adname='$adname',timeset='$timeset',starttime='$starttime',endtime='$endtime',normbody='$normbody',expbody='$expbody' WHERE aid='$aid'"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("ad_success_edit"), $ENV_GOBACK_URL); + ShowMsg("成功修改一则广告代码", $ENV_GOBACK_URL); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__myad` WHERE aid='$aid'"); diff --git a/src/admin/ad_main.php b/src/admin/ad_main.php index 87db6156..a2524721 100644 --- a/src/admin/ad_main.php +++ b/src/admin/ad_main.php @@ -8,11 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); +require_once(DEDEINC.'/datalistcp.class.php'); require_once(DEDEINC.'/common.func.php'); -UserLogin::CheckPurview('plus_广告管理'); setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); $clsid = isset($clsid) ? intval($clsid) : 0; $keyword = isset($keyword) ? addslashes($keyword) : ''; @@ -28,7 +26,7 @@ while ($arr = $dsql->GetArray('dd')) { $where_sql = ' 1=1'; if ($clsid != 0) $where_sql .= " AND clsid = $clsid"; if ($keyword != '') $where_sql .= " AND (ad.adname like '%$keyword%') "; -$sql = "SELECT ad.aid,ad.clsid,ad.tagname,tp.typename as typename,ad.adname,ad.timeset,ad.endtime,ap.typename as clsname FROM `#@__myad` ad LEFT JOIN `#@__arctype` tp on tp.id=ad.typeid LEFT JOIN `#@__myadtype` ap on ap.id=ad.clsid WHERE $where_sql ORDER BY ad.aid DESC"; +$sql = "SELECT ad.aid,ad.clsid,ad.tagname,tp.typename as typename,ad.adname,ad.timeset,ad.endtime,ap.typename as clsname FROM `#@__myad` ad LEFT JOIN `#@__arctype` tp on tp.id=ad.typeid LEFT JOIN `#@__myadtype` ap on ap.id=ad.clsid WHERE $where_sql ORDER BY ad.aid desc"; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN."/templets/ad_main.htm"); $dlist->SetSource($sql); @@ -36,7 +34,7 @@ $dlist->display(); function TestType($tname, $type = "") { if ($tname == "") { - return ($type == 1) ? Lang("ad_main_testtype_1") : Lang("ad_main_testtype_0"); + return ($type == 1) ? "默认分类" : "所有栏目"; } else { return $tname; } @@ -44,9 +42,9 @@ function TestType($tname, $type = "") function TimeSetValue($ts) { if ($ts == 0) { - return Lang("ad_main_timeset_0"); + return "不限时间"; } else { - return Lang("ad_main_timeset_1"); + return "限时标记"; } } ?> \ No newline at end of file diff --git a/src/admin/adtype_main.php b/src/admin/adtype_main.php index 35898b22..f241e62a 100644 --- a/src/admin/adtype_main.php +++ b/src/admin/adtype_main.php @@ -20,21 +20,21 @@ if ($dopost == "save") { $pname = ${'pname_'.$startID}; if (isset(${'check_'.$startID})) { if ($pname != '') { - $query = "UPDATE `#@__myadtypee` SET typename='$pname' WHERE id='$tid'"; + $query = "UPDATE `#@__myadtypee` SET typename='$pname' WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } } else { - $query = "DELETE FROM `#@__myadtype` WHERE id='$tid'"; + $query = "DELETE FROM `#@__myadtype` WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } } //增加新记录 if (isset($check_new) && $pname_new != '') { - $query = "INSERT INTO `#@__myadtype`(typename) VALUES ('{$pname_new}');"; + $query = "INSERT INTO `#@__myadtype` (typename) VALUES ('{$pname_new}');"; $dsql->ExecuteNoneQuery($query); } - header("Content-Type: text/html; charset=utf-8"); - ShowMsg(Lang("adtype_success_edit"), 'adtype_main.php'); + header("Content-Type: text/html; charset={$cfg_soft_lang}"); + ShowMsg("成功更新广告分类列表", 'adtype_main.php'); exit; } include DedeInclude('templets/adtype_main.htm'); diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 960a0c98..c18d8db4 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -8,36 +8,39 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\libraries\zip; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_New,a_AccNew'); +CheckPurview('a_New,a_AccNew'); +require_once(DEDEINC."/customfields.func.php"); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { + require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEADMIN."/inc/inc_catalog_options.php"); - UserLogin::ClearMyAddon(); + ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得频道模型ID if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; } else { if ($channelid == 0) $channelid = 2; } //获得频道模型信息 - $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'"); + $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 $maxWright = $dsql->GetOne("SELECT id+1 AS cc FROM `#@__archives` ORDER BY id DESC LIMIT 1"); - $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; + $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude("templets/album_add.htm"); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); @@ -53,23 +56,23 @@ else if ($dopost == 'save') { if (!isset($delzip)) $delzip = 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); if ($typeid == 0) { - ShowMsg(Lang('content_error_typeid_isempty'), "-1"); + ShowMsg("请指定文档的栏目", "-1"); exit(); } if (empty($channelid)) { - ShowMsg(Lang('content_error_channelid_isempty'), "-1"); + ShowMsg("文档为非指定的类型，请检查您发布内容的表单是否合法", "-1"); exit(); } if (!CheckChannel($typeid, $channelid)) { - ShowMsg(Lang('content_error_channelid_check_failed'), "-1"); + ShowMsg("您所选择的栏目与当前模型不相符，请选择白色的选项", "-1"); exit(); } - if (!UserLogin::TestPurview('a_New')) { - UserLogin::CheckCatalog($typeid, Lang('content_error_channelid_check_failed',array('typeid'=>$typeid))); + if (!TestPurview('a_New')) { + CheckCatalog($typeid, "对不起，您没有操作栏目 {$typeid} 的权限"); } //对保存的内容进行处理 - if (empty($writer)) $writer = $cUserLogin->getUserName(); - if (empty($source)) $source = Lang('unknow'); + if (empty($writer)) $writer = $cuserLogin->getUserName(); + if (empty($source)) $source = '未知'; $pubdate = GetMkTime($pubdate); $senddate = time(); $sortrank = AddDay($pubdate, $sortup); @@ -84,23 +87,27 @@ else if ($dopost == 'save') { $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); $userip = GetIP(); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) $ddisremote = 0; $litpic = GetDDImage('none', $picname, $ddisremote); //生成文档id $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid); if (empty($arcID)) { - ShowMsg(Lang("content_error_id_is_empty"), "-1"); + ShowMsg("无法获得主键，因此无法进行后续操作", "-1"); exit(); } $imgurls = "{dede:pagestyle maxwidth='$maxwidth' pagepicnum='$pagepicnum' ddmaxwidth='$ddmaxwidth' row='$row' col='$col' value='$pagestyle'/}\r\n"; $hasone = FALSE; //处理并保存从网上复制的图片 + /*--------------------- + function _getformhtml() + ------------------*/ if ($formhtml == 1) { $imagebody = stripslashes($imagebody); $imgurls .= GetCurContentAlbum($imagebody, $copysource, $litpicname); @@ -109,8 +116,12 @@ else if ($dopost == 'save') { $hasone = TRUE; } } - //处理从ZIP中解压的图片 + /*--------------------- + function _getformzip() + 处理从ZIP中解压的图片 + ---------------------*/ if ($formzip == 1) { + include_once(DEDEINC."/libraries/zip.class.php"); include_once(DEDEADMIN."/file_class.php"); $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16); @@ -145,11 +156,10 @@ else if ($dopost == 'save') { $imginfos = GetImageSize($imgfile, $info); $imgurls .= "{dede:img ddimg='$litpicname' text='' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; //把图片信息保存到媒体文档管理档案中 - $inquery = "INSERT INTO #@__uploads(title,url,mediatype,width,height,playtime,filesize,uptime,mid) - VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; + $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); - UserLogin::AddMyAddon($fid, $iurl); + AddMyAddon($fid, $iurl); WaterImg($imgfile, 'up'); if (!$hasone && $ddisfirst == 1 && $litpic == '') { if (empty($litpicname)) { @@ -171,7 +181,7 @@ else if ($dopost == 'save') { $album = $albumsArr[$i]; $data = explode(',', $album['img']); $ext = ".png"; - if (strpos($data[0], "data:image/jpeg") === 0){ + if(strpos($data[0], "data:image/jpeg") === 0){ $ext = ".jpg"; } elseif (strpos($data[0], "data:image/gif") === 0) { $ext = ".gif"; @@ -183,7 +193,7 @@ else if ($dopost == 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cUserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; @@ -214,7 +224,7 @@ else if ($dopost == 'save') { $vs = explode(',', $v); if (!isset(${$vs[0]})) { ${$vs[0]} = ''; - } else if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + } else if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -238,54 +248,58 @@ else if ($dopost == 'save') { //跳转网址的文档强制为动态 if (preg_match("#j#", $flag)) $ismake = -1; //加入主档案表 - $query = "INSERT INTO `#@__archives`(id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight');"; + $query = "INSERT INTO `#@__archives` (id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight'); "; if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_archives_save',array('error'=>str_replace('"', '', $gerr))), "javascript:;"); + $dsql->ExecuteNoneQuery(" DELETE FROM `#@__arctiny` WHERE id='$arcID' "); + ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //加入附加表 - $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); if (empty($addtable)) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_no_maintable',array('channelid'=>$channelid)), "javascript:;"); + ShowMsg("没找到当前模型[{$channelid}]的主表信息，无法完成操作", "javascript:;"); exit(); } $useip = GetIP(); - $query = "INSERT INTO `$addtable`(aid,typeid,redirecturl,userip,pagestyle,maxwidth,imgurls,`row`,col,isrm,ddmaxwidth,pagepicnum,body{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip','$pagestyle','$maxwidth','$imgurls','$row','$col','$isrm','$ddmaxwidth','$pagepicnum','$body'{$inadd_v});"; + $query = "INSERT INTO `$addtable` (aid,typeid,redirecturl,userip,pagestyle,maxwidth,imgurls,`row`,col,isrm,ddmaxwidth,pagepicnum,body{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip','$pagestyle','$maxwidth','$imgurls','$row','$col','$isrm','$ddmaxwidth','$pagepicnum','$body'{$inadd_v}); "; if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_addtable_save',array('addtable'=>$addtable, 'error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库附加表 `{$addtable}` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //生成网页 InsertTags($tags, $arcID); - $artUrl = MakeArt($arcID, TRUE, TRUE); + $artUrl = MakeArt($arcID, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; } - UserLogin::ClearMyAddon($arcID, $title); + ClearMyAddon($arcID, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_edit')."".Lang('content_view')."".Lang('content_published_main')."$backurl"; - $msg = "
{$msg}
".GetUpdateTest(); - $wintitle = Lang("content_success_publish"); - $wecome_info = Lang('content_main')."::".Lang('content_add'); - DedeWin::Instance()->AddTitle(Lang("content_success_publish")."：")->AddMsgItem($msg)->GetWindow("hand", " ", FALSE)->Display(); + $msg = "请选择您的后续操作：继续发布图集修改图集预览图集已发布图集管理$backurl"; + $msg = "
{$msg}
".GetUpdateTest(); + $wintitle = "成功发布一个图集"; + $wecome_info = "文档管理::发布图集"; + $win = new OxWindow(); + $win->AddTitle("成功发布一个图集："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", FALSE); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index aa868a14..501deeaf 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -8,28 +8,27 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\libraries\zip; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +require_once(DEDEINC."/customfields.func.php"); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { require_once(DEDEADMIN."/inc/inc_catalog_options.php"); - UserLogin::ClearMyAddon(); + require_once(DEDEINC."/dedetag.class.php"); + ClearMyAddon(); $aid = intval($aid); //读取归档信息 - $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid'"; + $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid' "; $arcRow = $dsql->GetOne($arcQuery); if (!is_array($arcRow)) { - ShowMsg(Lang("content_err_archive"), "-1"); + ShowMsg("读取档案基本信息出错!", "-1"); exit(); } $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg(Lang("content_err_channel"), "javascript:;"); + ShowMsg("读取频道配置信息出错", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; @@ -50,8 +49,12 @@ if ($dopost != 'save') { include DedeInclude("templets/album_edit.htm"); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = 0; @@ -65,22 +68,22 @@ else if ($dopost == 'save') { if (!isset($ddisfirst)) $ddisfirst = 0; if (!isset($delzip)) $delzip = 0; if ($typeid == 0) { - ShowMsg(Lang('content_error_typeid_isempty'), "-1"); + ShowMsg("请指定文档的栏目", "-1"); exit(); } if (empty($channelid)) { - ShowMsg(Lang('content_error_channelid_isempty'), "-1"); + ShowMsg("文档为非指定的类型，请检查您发布内容的表单是否合法", "-1"); exit(); } if (!CheckChannel($typeid, $channelid)) { - ShowMsg(Lang('content_error_channelid_check_failed'), "-1"); + ShowMsg("您所选择的栏目与当前模型不相符，请选择白色的选项", "-1"); exit(); } - if (!UserLogin::TestPurview('a_Edit')) { - if (UserLogin::TestPurview('a_AccEdit')) { - UserLogin::CheckCatalog($typeid, Lang('content_error_channelid_check_failed',array('typeid'=>$typeid))); + if (!TestPurview('a_Edit')) { + if (TestPurview('a_AccEdit')) { + CheckCatalog($typeid, "对不起，您没有操作栏目 {$typeid} 的文档权限"); } else { - CheckArcAdmin($id, $cUserLogin->getUserID()); + CheckArcAdmin($id, $cuserLogin->getUserID()); } } //对保存的内容进行处理 @@ -95,11 +98,12 @@ else if ($dopost == 'save') { $description = cn_substrR($description, 250); $keywords = trim(cn_substrR($keywords, 60)); $filename = trim(cn_substrR($filename, 40)); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -118,28 +122,7 @@ else if ($dopost == 'save') { if (preg_match("#j#", $flag)) $ismake = -1; //更新数据库的SQL语句 $query = " - UPDATE `#@__archives` SET - typeid='$typeid', - typeid2='$typeid2', - sortrank='$sortrank', - flag='$flag', - click='$click', - ismake='$ismake', - arcrank='$arcrank', - money='$money', - title='$title', - color='$color', - source='$source', - writer='$writer', - litpic='$litpic', - pubdate='$pubdate', - notpost='$notpost', - DESCription='$description', - keywords='$keywords', - shorttitle='$shorttitle', - filename='$filename', - dutyadmin='$adminid' - WHERE id='$id'; "; + UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($query)) { ShowMsg("更新数据库archives表时出错，请检查".$dsql->GetError(), "javascript:;"); exit(); @@ -168,11 +151,11 @@ else if ($dopost == 'save') { } $mime = get_mime_type($tmpFile); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^image#i", $mime)) { - ShowMsg(Lang("media_only_image"), -1); + ShowMsg("非图片格式文件，无法正常上传", -1); exit; } move_uploaded_file($tmpFile, $imgfile); @@ -187,7 +170,7 @@ else if ($dopost == 'save') { } $imgurls .= "{dede:img ddimg='$litpicname' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; } - //没上传图片，只修改msg信息 + //没上传图片(只修改msg信息) else { $iinfo = str_replace("'", "`", stripslashes(${'imgmsg'.$i})); $iurl = stripslashes(${'imgurl'.$i}); @@ -208,8 +191,12 @@ else if ($dopost == 'save') { $hasone = true; } } - //从ZIP文件中获取新图片 + /*--------------------- + function _getformzip() + 从ZIP文件中获取新图片 + ---------------------*/ if ($formzip == 1) { + include_once(DEDEINC."/libraries/zip.class.php"); include_once(DEDEADMIN."/file_class.php"); $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16); @@ -238,8 +225,7 @@ else if ($dopost == 'save') { $imginfos = GetImageSize($imgfile, $info); $imgurls .= "{dede:img ddimg='$litpicname' text='' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; //把图片信息保存到媒体文档管理档案中 - $inquery = "INSERT INTO #@__uploads(title,url,mediatype,width,height,playtime,filesize,uptime,mid) - VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; + $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; $dsql->ExecuteNoneQuery($inquery); if ( !$hasone && $ddisfirst == 1 @@ -260,11 +246,12 @@ else if ($dopost == 'save') { } if ($albums !== "") { $albumsArr = json_decode(stripslashes($albums), true); + //var_dump($albumsArr);exit; for ($i = 0; $i <= count($albumsArr) - 1; $i++) { $album = $albumsArr[$i]; $data = explode(',', $album['img']); $ext = ".png"; - if (strpos($data[0], "data:image/jpeg") === 0){ + if(strpos($data[0], "data:image/jpeg") === 0){ $ext = ".jpg"; } elseif (strpos($data[0], "data:image/gif") === 0) { $ext = ".gif"; @@ -276,7 +263,7 @@ else if ($dopost == 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cUserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; @@ -300,7 +287,7 @@ else if ($dopost == 'save') { continue; } $vs = explode(',', $v); - if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -314,38 +301,55 @@ else if ($dopost == 'save') { } } //更新附加表 - $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); if ($addtable != '') { $useip = GetIP(); - $query = "UPDATE `$addtable` SET typeid='$typeid',pagestyle='$pagestyle',body='$body',maxwidth='$maxwidth',ddmaxwidth='$ddmaxwidth',pagepicnum='$pagepicnum',imgurls='$imgurls',`row`='$row',col='$col',isrm='$isrm'{$inadd_f},redirecturl='$redirecturl',userip='$useip'WHERE aid='$id';"; + $query = "Update `$addtable` + set typeid='$typeid', + pagestyle='$pagestyle', + body='$body', + maxwidth = '$maxwidth', + ddmaxwidth = '$ddmaxwidth', + pagepicnum = '$pagepicnum', + imgurls='$imgurls', + `row`='$row', + col='$col', + isrm='$isrm'{$inadd_f}, + redirecturl='$redirecturl', + userip = '$useip' + WHERE aid='$id'; "; if (!$dsql->ExecuteNoneQuery($query)) { - ShowMsg(Lang('content_err_update_addon',array('addtable'=>$addtable)), "javascript:;"); + ShowMsg("更新附加表 `$addtable` 时出错，请检查原因".$dsql->GetError(), "javascript:;"); exit(); } } //生成网页 UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - $arcUrl = MakeArt($id, true, true); + $arcUrl = MakeArt($id, true, true, $isremote); if ($arcUrl == '') { $arcUrl = $cfg_phpurl."/view.php?aid=$id"; } - UserLogin::ClearMyAddon($id, $title); + ClearMyAddon($id, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_edit')."".Lang('content_view')."".Lang('content_published_main')."$backurl"; - $wintitle = Lang("content_success_edit"); - $wecome_info = Lang('content_main')."::".Lang('content_edit'); - DedeWin::Instance()->AddTitle(Lang("content_success_edit")."：")->AddMsgItem($msg)->GetWindow("hand", " ", false)->Display(); + $msg = "请选择您的后续操作：继续发布图集修改图集预览图集管理已发布图集$backurl"; + $wintitle = "成功修改图集"; + $wecome_info = "文档管理::修改图集"; + $win = new OxWindow(); + $win->AddTitle("成功修改一个图集："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", false); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index 751f575e..ed321268 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -8,38 +8,42 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('a_New,a_AccNew'); +CheckPurview('a_New,a_AccNew'); +require_once(DEDEINC.'/customfields.func.php'); require_once(DEDEADMIN.'/inc/inc_archives_functions.php'); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { + require_once(DEDEINC.'/dedetag.class.php'); require_once(DEDEADMIN.'/inc/inc_catalog_options.php'); - UserLogin::ClearMyAddon(); + ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得频道模型ID if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; } else { if ($channelid == 0) { - ShowMsg(Lang('content_err_channel_empty'), '-1'); + ShowMsg('无法识别模型信息，因此无法操作', '-1'); exit(); } } //获得频道模型信息 - $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'"); + $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 $maxWright = $dsql->GetOne("SELECT id+1 AS cc FROM `#@__archives` ORDER BY id DESC LIMIT 1"); - $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; + $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude('templets/archives_add.htm'); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); @@ -50,23 +54,23 @@ else if ($dopost == 'save') { if (!isset($autolitpic)) $autolitpic = 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); if ($typeid == 0) { - ShowMsg(Lang('content_error_typeid_isempty'), '-1'); + ShowMsg('请指定文档的栏目', '-1'); exit(); } if (empty($channelid)) { - ShowMsg(Lang('content_error_channelid_isempty'), '-1'); + ShowMsg('文档为非指定的类型，请检查您发布内容的表单是否合法', '-1'); exit(); } if (!CheckChannel($typeid, $channelid)) { - ShowMsg(Lang('content_error_channelid_check_failed'), '-1'); + ShowMsg('您所选择的栏目与当前模型不相符，请选择白色的选项', '-1'); exit(); } - if (!UserLogin::TestPurview('a_New')) { - UserLogin::CheckCatalog($typeid, Lang('content_error_channelid_check_failed',array('typeid'=>$typeid))); + if (!TestPurview('a_New')) { + CheckCatalog($typeid, "对不起，您没有操作栏目 {$typeid} 的权限"); } //对保存的内容进行处理 - if (empty($writer)) $writer = $cUserLogin->getUserName(); - if (empty($source)) $source = Lang('unknow'); + if (empty($writer)) $writer = $cuserLogin->getUserName(); + if (empty($source)) $source = '未知'; $pubdate = GetMkTime($pubdate); $senddate = time(); $sortrank = AddDay($pubdate, $sortup); @@ -81,11 +85,13 @@ else if ($dopost == 'save') { $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); $userip = GetIP(); + $isremote = 0; + $voteid = (empty($voteid) ? 0 : $voteid); $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -94,7 +100,7 @@ else if ($dopost == 'save') { //生成文档id $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid); if (empty($arcID)) { - ShowMsg(Lang("content_error_id_is_empty"), "-1"); + ShowMsg("无法获得主键，因此无法进行后续操作", "-1"); exit(); } //分析处理附加表数据 @@ -126,50 +132,54 @@ else if ($dopost == 'save') { //跳转网址的文档强制为动态 if (preg_match("#j#", $flag)) $ismake = -1; //保存到主表 - $query = "INSERT INTO `#@__archives`(id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight');"; + $query = "INSERT INTO `#@__archives` (id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,voteid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$voteid','$notpost','$description','$keywords','$filename','$adminid','$weight');"; if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_archives_save',array('error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //保存到附加表 - $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); if (!empty($addtable)) { $useip = GetIP(); - $query = "INSERT INTO `{$addtable}`(aid,typeid,redirecturl,userip,templet{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip',''{$inadd_v})"; + $query = "INSERT INTO `{$addtable}` (aid,typeid,redirecturl,userip{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip'{$inadd_v})"; if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_addtable_save',array('addtable'=>$addtable, 'error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库附加表 `{$addtable}` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } } //生成网页 InsertTags($tags, $arcID); - $artUrl = MakeArt($arcID, true, true); + $artUrl = MakeArt($arcID, true, true, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; } - UserLogin::ClearMyAddon($arcID, $title); + ClearMyAddon($arcID, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_view')."".Lang('content_edit')."".Lang('content_published_main')."$backurl"; - $msg = "
{$msg}
".GetUpdateTest(); - $wintitle = Lang("content_success_publish"); - $wecome_info = Lang('content_main')."::".Lang('content_add'); - DedeWin::Instance()->AddTitle(Lang("content_success_publish").'：')->AddMsgItem($msg)->GetWindow('hand', ' ', false)->Display(); + $msg = "请选择您的后续操作：继续发布商品查看商品修改商品已发布商品管理$backurl"; + $msg = "
{$msg}
".GetUpdateTest(); + $wintitle = '成功发布商品'; + $wecome_info = '文档管理::发布商品'; + $win = new OxWindow(); + $win->AddTitle('成功发布商品：'); + $win->AddMsgItem($msg); + $winform = $win->GetWindow('hand', ' ', false); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index abc9c8ba..402a5538 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -8,37 +8,35 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\Archives; -use DedeBIZ\libraries\DedeBIZ; -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\libraries\SplitWord; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeLink; -use DedeBIZ\TypeLink\TypeUnitSelector; require_once(dirname(__FILE__).'/config.php'); require_once(DEDEADMIN.'/inc/inc_batchup.php'); require_once(DEDEADMIN.'/inc/inc_archives_functions.php'); +require_once(DEDEINC.'/typelink/typelink.class.php'); +require_once(DEDEINC.'/archive/archives.class.php'); $ENV_GOBACK_URL = (empty($_COOKIE['ENV_GOBACK_URL']) ? 'content_list.php' : $_COOKIE['ENV_GOBACK_URL']); if (empty($dopost)) { - ShowMsg(Lang('invalid_parameter'), '-1'); + ShowMsg('对不起，您没指定运行参数', '-1'); exit(); } $aid = isset($aid) ? preg_replace("#[^0-9]#", '', $aid) : ''; +/*-------------------------- //编辑文档 +function editArchives(){ } +---------------------------*/ if ($dopost == 'editArchives') { - $query = "SELECT arc.id,arc.typeid,ch.maintable,ch.editcon 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'"; + $query = "SELECT arc.id,arc.typeid,ch.maintable,ch.editcon 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); $gurl = $row['editcon']; if ($gurl == '') $gurl = 'article_edit.php'; header("location:{$gurl}?aid=$aid"); exit(); -} else if ($dopost == 'upload_base64_image') { +} else if($dopost == 'upload_base64_image') { if ($litpic_b64 != "") { $data = explode(',', $litpic_b64); $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cUserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.".png"; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); //加水印 @@ -60,15 +58,18 @@ if ($dopost == 'editArchives') { } exit(); } +/*-------------------------- //浏览文档 +function viewArchives(){ } +---------------------------*/ else if ($dopost == "viewArchives") { $aid = preg_replace("#[^0-9]#", '', $aid); //获取主表信息 - $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE arc.id='$aid'"; + $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE arc.id='$aid' "; $trow = $dsql->GetOne($query); $trow['maintable'] = (trim($trow['maintable']) == '' ? '#@__archives' : trim($trow['maintable'])); if ($trow['issystem'] != -1) { - $arcQuery = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `{$trow['maintable']}` arc LEFT JOIN `#@__arctype` tp on arc.typeid=tp.id LEFT JOIN `#@__channeltype` ch on ch.id=arc.channel WHERE arc.id='$aid'"; + $arcQuery = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `{$trow['maintable']}` arc LEFT JOIN `#@__arctype` tp on arc.typeid=tp.id LEFT JOIN `#@__channeltype` ch on ch.id=arc.channel WHERE arc.id='$aid' "; $arcRow = $dsql->GetOne($arcQuery); PutCookie('DedeUserID', $arcRow['mid'], 1800); PutCookie('DedeLoginTime', time(), 1800); @@ -128,30 +129,33 @@ else if ($dopost == "viewArchives") { echo ""; exit(); } +/*-------------------------- //异步上传缩略图 +function uploadLitpic(){ } +---------------------------*/ else if ($dopost == "uploadLitpic") { $upfile = AdminUpload('litpic', 'imagelit', 0, false); if ($upfile == '-1') { $msg = ""; } else if ($upfile == '-2') { $msg = ""; } else if ($upfile == '0') { $msg = ""; } else { if (!empty($cfg_uplitpic_cut) && $cfg_uplitpic_cut == 'N') { $msg = ""; + echo ""; } //读出 if (empty($allsource) && filesize($m_file) > 0) { @@ -32,12 +31,14 @@ if (empty($allsource) && filesize($m_file) > 0) { fclose($fp); } make_hash(); -$wintitle = Lang("article_string_mix"); -$wecome_info = Lang("article_string_mix"); -DedeWin::Instance()->Init('article_string_mix.php', 'js/blank.js', 'POST') -->AddHidden('dopost', 'save') -->AddHidden('token', $_SESSION['token']) -->AddTitle(Lang("article_string_mix_title")) -->AddMsgItem("") -->GetWindow('ok')->Display(); +$wintitle = "防采集混淆字符串管理"; +$wecome_info = "防采集混淆字符串管理"; +$win = new OxWindow(); +$win->Init('article_string_mix.php', 'js/blank.js', 'POST'); +$win->AddHidden('dopost', 'save'); +$win->AddHidden('token', $_SESSION['token']); +$win->AddTitle("如果您要启用字符串混淆来防采集，请在文档模板需要的字段加上 function='RndString(@me)' 属性，如：{dede:field name='body' function='RndString(@me)'/}"); +$win->AddMsgItem(""); +$winform = $win->GetWindow('ok'); +$win->Display(); ?> \ No newline at end of file diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index a1ea2401..abf51812 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -8,13 +8,12 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_StringMix'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); +CheckPurview('sys_StringMix'); if (empty($dopost)) $dopost = ''; $templates = empty($templates) ? '' : stripslashes($templates); -$m_file = DEDEDATA.'/template.rand.txt'; +$m_file = DEDEDATA.'/template.rand.php'; $okmsg = ''; //保存配置 if ($dopost == 'save') { @@ -23,7 +22,7 @@ if ($dopost == 'save') { flock($fp, 3); fwrite($fp, $templates); fclose($fp); - $okmsg = Lang('article_template_rand_success_save'); + $okmsg = '成功保存配置信息 AT:('.MyDate('H:i:s', time()).')'; } //对旧文档进行随机模板处理 else if ($dopost == 'makeold') { @@ -31,43 +30,36 @@ else if ($dopost == 'makeold') { set_time_limit(3600); if (!file_exists($m_file)) { AjaxHead(); - echo Lang("article_template_rand_err_filenotexists"); + echo "配置文件不存在"; exit(); } - $fileData = file_get_contents($m_file); - $arrs = preg_split("#[\t\r\n]#", $fileData); - $cfg_tamplate_arr = array(); - foreach ($arrs as $value) { - if (trim($value) !== "") { - $cfg_tamplate_arr[] = trim($value); - } - } + require_once($m_file); if ($cfg_tamplate_rand == 0) { AjaxHead(); - echo Lang("article_template_rand_err_cfg"); + echo "系统没开启允许随机模板的选项"; exit(); } $totalTmp = count($cfg_tamplate_arr) - 1; if ($totalTmp < 1) { AjaxHead(); - echo Lang("article_template_rand_err_tt"); + echo "随机模板的数量必须为2个或以上"; exit(); } for ($i = 0; $i < 10; $i++) { $temp = $cfg_tamplate_arr[mt_rand(0, $totalTmp)]; - $dsql->ExecuteNoneQuery("UPDATE `#@__addonarticle` set templet='$temp' where RIGHT(aid, 1)='$i'"); + $dsql->ExecuteNoneQuery("UPDATE `#@__addonarticle` set templet='$temp' where RIGHT(aid, 1)='$i' "); } AjaxHead(); - echo Lang("article_template_rand_success"); + echo "全部随机操作成功"; exit(); } //清除全部的指定模板 else if ($dopost == 'clearold') { CheckCSRF(); - $dsql->ExecuteNoneQuery("UPDATE `#@__addonarticle` set templet=''"); - $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `#@__addonarticle`"); + $dsql->ExecuteNoneQuery("UPDATE `#@__addonarticle` set templet='' "); + $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `#@__addonarticle` "); AjaxHead(); - echo Lang("article_template_rand_success"); + echo "全部清除操作成功"; exit(); } //读出 @@ -76,11 +68,11 @@ if (empty($templates) && filesize($m_file) > 0) { $templates = fread($fp, filesize($m_file)); fclose($fp); } -$wintitle = Lang("article_template_rand"); -$wecome_info = Lang("article_template_rand"); +$wintitle = "随机模板防采集设置"; +$wecome_info = "随机模板防采集设置"; make_hash(); $msg = " - +
- ".Lang('article_template_rand_tip')." - ".Lang('article_template_rand_makeold')." - ".Lang('article_template_rand_clearold')." - $okmsg + 如果您想对旧的文档应用随机模板设置，请点击此对旧文档进行处理（必须设置好模板项） + 设置全部 + 取消全部 + $okmsg
"; -DedeWin::Instance()->Init('article_template_rand.php', 'js/blank.js', 'POST') -->AddHidden('dopost', 'save') -->AddHidden('token', $_SESSION['token']) -->AddTitle(Lang("article_template_rand_title")) -->AddMsgItem($msg) -->GetWindow('ok')->Display(); +$win = new OxWindow(); +$win->Init('article_template_rand.php', 'js/blank.js', 'POST'); +$win->AddHidden('dopost', 'save'); +$win->AddHidden('token', $_SESSION['token']); +$win->AddTitle("本设置仅适用于系统默认的文档模型，设置后发布文档时会自动按指定的模板随机获取一个，如果不想使用此功能，把它设置为空即可"); +$win->AddMsgItem($msg); +$winform = $win->GetWindow('ok'); +$win->Display(); ?> \ No newline at end of file diff --git a/src/admin/article_test_same.php b/src/admin/article_test_same.php index 799efd89..5f9ba8c2 100644 --- a/src/admin/article_test_same.php +++ b/src/admin/article_test_same.php @@ -8,17 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); @set_time_limit(0); -UserLogin::CheckPurview('sys_ArcBatch'); +CheckPurview('sys_ArcBatch'); if (empty($dopost)) $dopost = ''; if ($dopost == 'analyse') { - $arr = $dsql->getone("SELECT maintable FROM `#@__channeltype` WHERE id='$channelid'"); + $arr = $dsql->getone("SELECT maintable FROM `#@__channeltype` WHERE id='$channelid' "); if (is_array($arr)) { $maintable = $arr['maintable']; } else { - showmsg(Lang('article_test_same_err_id'), 'javascript:;'); + showmsg('频道id不正确，无法处理', 'javascript:;'); exit(); } $dsql->SetQuery("SELECT COUNT(title) AS dd,title FROM `$maintable` WHERE channel='$channelid' GROUP BY title ORDER BY dd DESC LIMIT 0, $pagesize"); @@ -27,13 +26,14 @@ if ($dopost == 'analyse') { include DedeInclude('templets/article_result_same.htm'); exit(); } -//删除选中的内容，只保留一条 +//删除选中的内容（只保留一条） else if ($dopost == 'delsel') { + require_once(DEDEINC."/typelink/typelink.class.php"); require_once(dirname(__FILE__)."/inc/inc_batchup.php"); if (empty($titles)) { header("Content-Type: text/html; charset={$cfg_ver_lang}"); echo "\r\n"; - echo Lang("article_test_same_err_noarticle"); + echo "没有指定删除的文档"; exit(); } $titless = split('`', $titles); @@ -47,9 +47,9 @@ else if ($dopost == 'delsel') { $title = trim($title); $title = addslashes($title == '' ? '' : urldecode($title)); if ($channelid < -1) { - $q1 = "SELECT aid as id,title FROM `$maintable` WHERE channel='$channelid' AND title='$title' $orderby"; + $q1 = "SELECT aid as id,title FROM `$maintable` WHERE channel='$channelid' AND title='$title' $orderby "; } else { - $q1 = "SELECT id,title FROM `$maintable` WHERE channel='$channelid' AND title='$title' $orderby"; + $q1 = "SELECT id,title FROM `$maintable` WHERE channel='$channelid' AND title='$title' $orderby "; } $dsql->SetQuery($q1); $dsql->Execute(); @@ -65,13 +65,13 @@ else if ($dopost == 'delsel') { DelArc($naid, 'OFF'); } } - $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$maintable`;"); - ShowMsg(Lang('article_test_same_delete_success',array('totalarc'=>$totalarc)), "javascript:;"); + $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `$maintable`; "); + ShowMsg("一共删除了 [{$totalarc}] 篇重复的文档", "javascript:;"); exit(); } //向导页 $channelinfos = array(); -$dsql->setquery("SELECT id,typename,maintable,addtable FROM `#@__channeltype`"); +$dsql->setquery("SELECT id,typename,maintable,addtable FROM `#@__channeltype` "); $dsql->execute(); while ($row = $dsql->getarray()) $channelinfos[] = $row; include DedeInclude('templets/article_test_same.htm'); diff --git a/src/admin/article_writer_edit.php b/src/admin/article_writer_edit.php index 7b7d497c..211b419e 100644 --- a/src/admin/article_writer_edit.php +++ b/src/admin/article_writer_edit.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_Writer'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); +CheckPurview('sys_Writer'); if (empty($dopost)) $dopost = ''; if (empty($allwriter)) $allwriter = ''; else $allwriter = stripslashes($allwriter); @@ -30,11 +29,13 @@ if (empty($allwriter) && filesize($m_file) > 0) { $allwriter = fread($fp, filesize($m_file)); fclose($fp); } -$wintitle = Lang("content_writer_main"); -$wecome_info = Lang("content_writer_main"); -DedeWin::Instance()->Init('article_writer_edit.php', 'js/blank.js', 'POST') -->AddHidden('dopost', 'save') -->AddTitle(Lang("content_writer_main_title")) -->AddMsgItem("") -->GetWindow('ok')->Display(); +$wintitle = "文档作者管理"; +$wecome_info = "文档作者管理"; +$win = new OxWindow(); +$win->Init('article_writer_edit.php', 'js/blank.js', 'POST'); +$win->AddHidden('dopost', 'save'); +$win->AddTitle("把作者姓名用半角逗号“,”分开："); +$win->AddMsgItem(""); +$winform = $win->GetWindow('ok'); +$win->Display(); ?> \ No newline at end of file diff --git a/src/admin/cards_make.php b/src/admin/cards_make.php index 0ab050b2..0e90d776 100644 --- a/src/admin/cards_make.php +++ b/src/admin/cards_make.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Card'); +CheckPurview('member_Card'); if (empty($dopost)) $dopost = ''; if ($dopost == '') include(DEDEADMIN."/templets/cards_make.htm"); //生成点卡 elseif ($dopost == 'make') { - $row = $dsql->GetOne("SELECT * FROM `#@__moneycard_record` ORDER BY aid DESC"); + $row = $dsql->GetOne("SELECT * FROM #@__moneycard_record ORDER BY aid DESC"); !is_array($row) ? $startid = 100000 : $startid = $row['aid'] + 100000; - $row = $dsql->GetOne("SELECT * FROM `#@__moneycard_type` WHERE tid='$cardtype'"); + $row = $dsql->GetOne("SELECT * FROM #@__moneycard_type WHERE tid='$cardtype'"); $money = $row['money']; $num = $row['num']; $mtime = time(); @@ -25,7 +24,7 @@ elseif ($dopost == 'make') { $ctid = $cardtype; $startid++; $endid = $startid + $mnum; - header("Content-Type: text/html; charset=utf-8"); + header("Content-Type: text/html; charset={$cfg_soft_lang}"); for (; $startid < $endid; $startid++) { $cardid = $snprefix.$startid.'-'; for ($p = 0; $p < $pwdgr; $p++) { @@ -47,10 +46,10 @@ elseif ($dopost == 'make') { $cardid .= '-'; } } - $inquery = "INSERT INTO `#@__moneycard_record`(ct_id,cardid,uid,isexp,mtime,utime,money,num) VALUES ('$ctid','$cardid','0','0','$mtime','$utime','$money','$num');"; + $inquery = "INSERT INTO `#@__moneycard_record` (ctid,cardid,uid,isexp,mtime,utime,money,num) VALUES ('$ctid','$cardid','0','0','$mtime','$utime','$money','$num'); "; $dsql->ExecuteNoneQuery($inquery); - echo Lang('cards_make_success',array('cardid'=>$cardid)); + echo "成功生成点卡：{$cardid}
"; } - echo Lang('cards_make_success_1',array("mnum"=>$mnum)); + echo "成功生成 {$mnum} 个点卡"; } ?> \ No newline at end of file diff --git a/src/admin/cards_manage.php b/src/admin/cards_manage.php index 5dfd65d7..1f578ccf 100644 --- a/src/admin/cards_manage.php +++ b/src/admin/cards_manage.php @@ -8,28 +8,28 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC.'/datalistcp.class.php'); $dopost = empty($dopost) ? "" : $dopost; if ($dopost == "delete") { $ids = explode('`', $aids); $dquery = ""; foreach ($ids as $id) { - if ($dquery == "") $dquery .= "aid='$id'"; - else $dquery .= "OR aid='$id'"; + if ($dquery == "") $dquery .= "aid='$id' "; + else $dquery .= " OR aid='$id' "; } if ($dquery != "") $dquery = " WHERE ".$dquery; - $dsql->ExecuteNoneQuery("DELETE FROM `#@__moneycard_record` $dquery"); - ShowMsg(Lang("content_delete_success"), "cards_manage.php"); + $dsql->ExecuteNoneQuery("DELETE FROM #@__moneycard_record $dquery"); + ShowMsg("成功删除指定的记录", "cards_manage.php"); exit(); } else { $addsql = ''; - if (isset($isexp)) $addsql = "WHERE isexp='$isexp'"; - $sql = "SELECT * FROM `#@__moneycard_record` $addsql ORDER BY aid DESC"; + if (isset($isexp)) $addsql = " WHERE isexp='$isexp' "; + $sql = "SELECT * FROM #@__moneycard_record $addsql ORDER BY aid DESC"; $dlist = new DataListCP(); $dlist->pagesize = 30;//设定每页显示记录数 if (isset($isexp)) $dlist->SetParameter("isexp", $isexp); - $dlist->dsql->SetQuery("SELECT * FROM `#@__moneycard_type`"); + $dlist->dsql->SetQuery("SELECT * FROM #@__moneycard_type "); $dlist->dsql->Execute('ts'); while ($rw = $dlist->dsql->GetArray('ts')) { $TypeNames[$rw['tid']] = $rw['pname']; @@ -44,19 +44,19 @@ function GetMemberID($mid) { global $dsql; if ($mid == 0) return '0'; - $row = $dsql->GetOne("SELECT userid FROM `#@__member` WHERE mid='$mid'"); + $row = $dsql->GetOne("SELECT userid FROM #@__member WHERE mid='$mid' "); if (is_array($row)) return "".$row['userid'].""; else return '0'; } function GetUseDate($time = 0) { if (!empty($time)) return GetDateMk($time); - else return Lang('cards_stat_0'); + else return '未使用'; } function GetSta($sta) { - if ($sta == 1) return Lang('cards_stat_1'); - else if ($sta == -1) return Lang('cards_stat_-1'); - else return Lang('cards_stat_0'); + if ($sta == 1) return '已售出'; + else if ($sta == -1) return '已使用'; + else return '未使用'; } ?> \ No newline at end of file diff --git a/src/admin/cards_type.php b/src/admin/cards_type.php index fd888bc4..ad4c4c33 100644 --- a/src/admin/cards_type.php +++ b/src/admin/cards_type.php @@ -8,10 +8,10 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('member_Type'); +CheckPurview('member_Type'); if (empty($dopost)) $dopost = ""; + //保存修改 if ($dopost == "save") { $startID = 1; @@ -26,23 +26,24 @@ if ($dopost == "save") { if ($pname != '') { $query = "UPDATE `#@__moneycard_type` SET pname='$pname',money='$money',num='$num' WHERE tid='$tid'"; $dsql->ExecuteNoneQuery($query); - $query = "UPDATE `#@__moneycard_record` SET money='$money',num='$num' WHERE ct_id='$tid';"; + $query = "UPDATE `#@__moneycard_record` SET money='$money',num='$num' WHERE ctid='$tid' ; "; $dsql->ExecuteNoneQuery($query); } } else { - $query = "DELETE FROM `#@__moneycard_type` WHERE tid='$tid'"; + $query = "DELETE FROM `#@__moneycard_type` WHERE tid='$tid' "; $dsql->ExecuteNoneQuery($query); - $query = "DELETE FROM `#@__moneycard_record` WHERE ct_id='$tid' AND isexp<>-1;"; + $query = "DELETE FROM `#@__moneycard_record` WHERE ctid='$tid' AND isexp<>-1 ; "; $dsql->ExecuteNoneQuery($query); } } + //增加新记录 if (isset($check_new) && $pname_new != '') { - $query = "INSERT INTO `#@__moneycard_type`(num,pname,money) VALUES ('{$num_new}','{$pname_new}','{$money_new}');"; + $query = "INSERT INTO `#@__moneycard_type` (num,pname,money) VALUES ('{$num_new}','{$pname_new}','{$money_new}');"; $dsql->ExecuteNoneQuery($query); } - header("Content-Type: text/html; charset=utf-8"); - echo ""; + header("Content-Type: text/html; charset={$cfg_soft_lang}"); + echo ""; } require_once(DEDEADMIN."/templets/cards_type.htm"); ?> \ No newline at end of file diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 804bac3d..42836614 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeLink; require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/typelink/typelink.class.php"); if (empty($listtype)) $listtype = ''; if (empty($dopost)) $dopost = ''; if (empty($upinyin)) $upinyin = 0; @@ -20,11 +19,11 @@ $id = empty($id) ? 0 : intval($id); $reid = empty($reid) ? 0 : intval($reid); $nid = 'article'; if ($id == 0 && $reid == 0) { - UserLogin::CheckPurview('t_New'); + CheckPurview('t_New'); } else { $checkID = empty($id) ? $reid : $id; - UserLogin::CheckPurview('t_AccNew'); - UserLogin::CheckCatalog($checkID, Lang('catalog_err_addsub')); + CheckPurview('t_AccNew'); + CheckCatalog($checkID, '您无权在本栏目下创建子类'); } if (empty($myrow)) $myrow = array(); $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id"); @@ -42,13 +41,16 @@ if ($dopost == 'quick') { include DedeInclude('templets/catalog_add_quick.htm'); exit(); } +/*--------------------- +function action_savequick(){ } +---------------------*/ else if ($dopost == 'savequick') { if (!isset($savetype)) $savetype = ''; $isdefault = isset($isdefault) ? $isdefault : 0; $tempindex = "{style}/index_{$nid}.htm"; $templist = "{style}/list_{$nid}.htm"; $temparticle = "{style}/article_{$nid}.htm"; - $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`iscross`,`crossid`,`content`,`smalltypes`) VALUES ('~reid~','~topid~','~rank~','~typename~','','','','','','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')"; + $queryTemplate = "INSERT INTO `#@__arctype` (reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) VALUES ('~reid~','~topid~','~rank~','~typename~','','','','','','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')"; if (empty($savetype)) { foreach ($_POST as $k => $v) { if (preg_match("#^posttype#", $k)) { @@ -122,9 +124,12 @@ else if ($dopost == 'savequick') { } } UpDateCatCache(); - ShowMsg(Lang('catalog_quickadd_success'), 'catalog_main.php'); + ShowMsg('成功增加指定栏目', 'catalog_main.php'); exit(); } +/*--------------------- +function action_save(){ } +---------------------*/ else if ($dopost == 'save') { $smalltypes = ''; if (empty($smalltype)) $smalltype = ''; @@ -134,7 +139,6 @@ else if ($dopost == 'save') { if ($ispart != 0) $cross = 0; $description = Html2Text($description, 1); $keywords = Html2Text($keywords, 1); - $sortrank = empty($sortrank)? 0 : $sortrank; if ($ispart != 2) { //栏目的参照目录 if ($referpath == 'cmspath') $nextdir = '{cmspath}'; @@ -152,12 +156,12 @@ else if ($dopost == 'save') { //检测二级网址 if ($siteurl != '') { $siteurl = preg_replace("#\/$#", "", $siteurl); - if (!preg_match("#(http|https):\/\/#i", $siteurl)) { - ShowMsg(Lang("catalog_err_site_url"), "-1"); + if (!preg_match("#http:\/\/#i", $siteurl)) { + ShowMsg("您绑定的二级域名无效，请用(http://host)的形式", "-1"); exit(); } if (preg_match("#".$cfg_basehost."#i", $siteurl)) { - ShowMsg(Lang("catalog_err_site_same"), "-1"); + ShowMsg("您绑定的二级域名与当前站点是同一个域，不需要绑定", "-1"); exit(); } } @@ -167,20 +171,20 @@ else if ($dopost == 'save') { $true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir); $true_typedir = preg_replace("#\/{1,}#", "/", $true_typedir); if (!CreateDir($true_typedir)) { - ShowMsg(Lang("catalog_err_create",array('true_typedir'=>$true_typedir)), "-1"); + ShowMsg("创建目录 {$true_typedir} 失败，请检查您的路径是否存在问题", "-1"); exit(); } } - $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`iscross`,`crossid`,`content`,`smalltypes`) VALUES ('$reid','$topid','$sortrank','$typename','$cnoverview','$enname','$enoverview','$bigpic','$litimg','$typedir','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')"; + $in_query = "INSERT INTO `#@__arctype` (reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) VALUES ('$reid','$topid','$sortrank','$typename','$cnoverview','$enname','$enoverview','$bigpic','$litimg','$typedir','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')"; if (!$dsql->ExecuteNoneQuery($in_query)) { - ShowMsg(Lang("catalog_err_save"), "-1"); + ShowMsg("保存目录数据时失败，请检查您的输入资料是否存在问题", "-1"); exit(); } UpDateCatCache(); if ($reid > 0) { PutCookie('lastCid', GetTopid($reid), 3600 * 24, '/'); } - ShowMsg(Lang("catalog_success_save"), "catalog_main.php"); + ShowMsg("成功创建一个分类", "catalog_main.php"); exit(); }//End dopost==save //获取从父目录继承的默认参数 @@ -193,7 +197,7 @@ if ($dopost == '') { $typedir = ''; $moresite = 0; if ($id > 0) { - $myrow = $dsql->GetOne("SELECT tp.*,ch.typename AS ctypename FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id=$id"); + $myrow = $dsql->GetOne("SELECT tp.*,ch.typename AS ctypename FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id=$id "); $channelid = $myrow['channeltype']; $issennd = $myrow['issend']; $corank = $myrow['corank']; diff --git a/src/admin/catalog_del.php b/src/admin/catalog_del.php index 59ac7363..30ecdd9d 100644 --- a/src/admin/catalog_del.php +++ b/src/admin/catalog_del.php @@ -8,32 +8,33 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeUnitAdmin; require_once(dirname(__FILE__).'/config.php'); //检查权限许可 -UserLogin::CheckPurview('t_Del,t_AccDel'); +CheckPurview('t_Del,t_AccDel'); +require_once(DEDEINC.'/typelink/typeunit.class.admin.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); $id = trim(preg_replace("#[^0-9]#", '', $id)); //检查栏目操作许可 -UserLogin::CheckCatalog($id, Lang("catalog_err_delete_noperm")); +CheckCatalog($id, "您无权删除本栏目"); if (empty($dopost)) $dopost = ''; if ($dopost == 'ok') { - $ut = new TypeUnitAdmin(); + $ut = new TypeUnit(); $ut->DelType($id, $delfile); UpDateCatCache(); - ShowMsg(Lang("catalog_success_delete"), "catalog_main.php"); + ShowMsg("成功删除一个栏目", "catalog_main.php"); exit(); } -$dsql->SetQuery("SELECT typename,typedir FROM `#@__arctype` WHERE id=".$id); +$dsql->SetQuery("SELECT typename,typedir FROM #@__arctype WHERE id=".$id); $row = $dsql->GetOne(); -$wintitle = Lang("catalog_delete_confirm"); -$wecome_info = "".Lang('catalog_main')." > ".Lang("catalog_delete_confirm"); -DedeWin::Instance()->Init('catalog_del.php', 'js/blank.js', 'POST') -->AddHidden('id', $id) -->AddHidden('dopost', 'ok') -->AddTitle(Lang('catalog_delete_confirm_title',array('typename'=>$row['typename']))) -->AddItem(Lang('catalog_delete_typedir'), $row['typedir']) -->AddItem(Lang('catalog_delete_file'), " ") -->GetWindow('ok')->Display(); +$wintitle = "删除栏目确认"; +$wecome_info = "栏目管理 > 删除栏目确认"; +$win = new OxWindow(); +$win->Init('catalog_del.php', 'js/blank.js', 'POST'); +$win->AddHidden('id', $id); +$win->AddHidden('dopost', 'ok'); +$win->AddTitle("您要确定要删除栏目：[{$row['typename']}] 吗"); +$win->AddItem('栏目的文件保存目录：', $row['typedir']); +$win->AddItem('是否删除文件：', " "); +$winform = $win->GetWindow('ok'); +$win->Display(); ?> \ No newline at end of file diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index d1feb7e5..fa3e76ea 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -8,21 +8,18 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\ListView; -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeLink; -use DedeBIZ\TypeLink\TypeUnitAdmin; -use DedeBIZ\TypeLink\TypeUnitMenu; require_once(dirname(__FILE__).'/config.php'); if (empty($dopost)) { - ShowMsg(Lang("dopost_error_noparms"), "catalog_main.php"); + ShowMsg("对不起，请指定栏目参数", "catalog_main.php"); exit(); } $cid = empty($cid) ? 0 : intval($cid); $unittype = empty($unittype) ? 0 : intval($unittype); $channelid = empty($channelid) ? 0 : intval($channelid); +/*-------------------------- //增加文档 +function addArchives(); +---------------------------*/ if ($dopost == "addArchives") { //默认文档调用发布表单 if (empty($cid) && empty($channelid)) { @@ -34,18 +31,22 @@ if ($dopost == "addArchives") { $row = $dsql->GetOne("SELECT addcon FROM `#@__channeltype` WHERE id='$channelid'"); } else { //根据栏目调用发布表单 - $row = $dsql->GetOne("SELECT ch.addcon FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$cid'"); + $row = $dsql->GetOne("SELECT ch.addcon FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$cid' "); } $gurl = $row["addcon"]; if ($gurl == "") { - ShowMsg(Lang("dopost_error_typelink"), "catalog_main.php"); + ShowMsg("对不起，您指的栏目可能有误", "catalog_main.php"); exit(); } + //跳转并传递参数 header("location:{$gurl}?channelid={$channelid}&cid={$cid}"); exit(); } +/*-------------------------- //管理文档 +function listArchives(); +---------------------------*/ else if ($dopost == "listArchives") { if (!empty($gurl)) { if (empty($arcrank)) { @@ -62,7 +63,7 @@ else if ($dopost == "listArchives") { $typename = $row["typename"]; $channelname = $row["channelname"]; if ($gurl == "") { - ShowMsg(Lang("dopost_error_typelink"), "catalog_main.php"); + ShowMsg("对不起，您指的栏目可能有误", "catalog_main.php"); exit(); } } else if ($channelid > 0) { @@ -77,38 +78,48 @@ else if ($dopost == "listArchives") { header("location:{$gurl}?channelid={$channelid}&cid={$cid}"); exit(); } +/*-------------------------- //浏览通用模板目录 +function viewTempletDir(); +---------------------------*/ else if ($dopost == "viewTemplet") { header("location:tpl.php?path=/".$cfg_df_style); exit(); } -//浏览单个页面的栏目 +/*------------------------ +浏览单个页面的栏目 +function ViewSgPage() +------------------------*/ else if ($dopost == "viewSgPage") { + require_once(DEDEINC."/archive/listview.class.php"); $lv = new ListView($cid); $pageurl = $lv->MakeHtml(); - ShowMsg(Lang("catalog_upcache_wait"), $pageurl); + ShowMsg("更新缓冲，请稍后", $pageurl); exit(); } -//修改栏目排列顺序 +/*------------------------ +修改栏目排列顺序 +function upRank() +------------------------*/ else if ($dopost == "upRank") { //检查权限许可 - UserLogin::CheckPurview('t_Edit,t_AccEdit'); + CheckPurview('t_Edit,t_AccEdit'); //检查栏目操作许可 - UserLogin::CheckCatalog($cid, Lang("catalog_error_noedit_purview")); + CheckCatalog($cid, "您无权修改本栏目"); $row = $dsql->GetOne("SELECT reid,sortrank FROM `#@__arctype` WHERE id='$cid'"); $reid = $row['reid']; $sortrank = $row['sortrank']; - $row = $dsql->GetOne("SELECT sortrank FROM `#@__arctype` WHERE sortrank<=$sortrank AND reid=$reid ORDER BY sortrank DESC"); + $row = $dsql->GetOne("SELECT sortrank FROM `#@__arctype` WHERE sortrank<=$sortrank AND reid=$reid ORDER BY sortrank DESC "); if (is_array($row)) { $sortrank = $row['sortrank'] - 1; $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET sortrank='$sortrank' WHERE id='$cid'"); } UpDateCatCache(); - ShowMsg(Lang('dopost_success_back'), "catalog_main.php"); + ShowMsg("操作成功，返回目录", "catalog_main.php"); exit(); } else if ($dopost == "upRankAll") { //检查权限许可 - UserLogin::CheckPurview('t_Edit'); + CheckPurview('t_Edit'); $row = $dsql->GetOne("SELECT id FROM `#@__arctype` ORDER BY id DESC"); if (is_array($row)) { $maxID = $row['id']; @@ -119,16 +130,19 @@ else if ($dopost == "upRank") { } } UpDateCatCache(); - ShowMsg(Lang('dopost_success_back'), "catalog_main.php"); + ShowMsg("操作成功，正在返回", "catalog_main.php"); exit(); } +/*-------------------------- //更新栏目缓存 +function UpCatlogCache(); +---------------------------*/ else if ($dopost == "upcatcache") { UpDateCatCache(); $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); //导入普通模型微数据 - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives`"; + $sql = "INSERT INTO `#@__arctiny` (id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; $dsql->ExecuteNoneQuery($sql); //导入单表模型微数据 $dsql->SetQuery("SELECT id,addtable FROM `#@__channeltype` WHERE id < -1 "); @@ -139,128 +153,151 @@ else if ($dopost == "upcatcache") { if (empty($tb) || isset($doarray[$tb])) { continue; } else { - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT aid, typeid, 0, arcrank, channel, senddate, 0, mid FROM `$tb`"; + $sql = "INSERT INTO `#@__arctiny` (id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT aid, typeid, 0, arcrank, channel, senddate, 0, mid FROM `$tb` "; $rs = $dsql->executenonequery($sql); $doarray[$tb] = 1; } } - ShowMsg(Lang('dopost_success_back'), "catalog_main.php"); + ShowMsg("操作成功，正在返回", "catalog_main.php"); exit(); } -//获取js文件 +/*--------------------- +获取JS文件 +function GetJs +----------------------*/ else if ($dopost == "GetJs") { header("location:makehtml_js.php"); exit(); } -//获得子类菜单 +/*----------- +获得子类的内容 +function GetSunListsMenu(); +-----------*/ else if ($dopost == "GetSunListsMenu") { - $userChannel = $cUserLogin->getUserChannel(); + $userChannel = $cuserLogin->getUserChannel(); + require_once(DEDEINC."/typeunit/typeunit.class.menu.php"); AjaxHead(); PutCookie('lastCidMenu', $cid, 3600 * 24, "/"); - $tu = new TypeUnitMenu($userChannel); + $tu = new TypeUnit($userChannel); $tu->LogicListAllSunType($cid, "　"); } -//获得子类内容 +/*----------- +获得子类的内容 +function GetSunLists(); +-----------*/ else if ($dopost == "GetSunLists") { + require_once(DEDEINC."/typelink/typeunit.class.admin.php"); AjaxHead(); PutCookie('lastCid', $cid, 3600 * 24, "/"); - $tu = new TypeUnitAdmin(); + $tu = new TypeUnit(); $tu->dsql = $dsql; - echo "\r\n"; + echo "
\r\n"; $tu->LogicListAllSunType($cid, "　"); - echo "
\r\n"; + echo " \r\n"; $tu->Close(); } -//合并栏目 +/*---------------- +合并栏目 +function unitCatalog() { } +-----------------*/ else if ($dopost == 'unitCatalog') { - UserLogin::CheckPurview('t_Move'); - require_once(DEDEINC.'/channel/channelunit.func.php'); + CheckPurview('t_Move'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); + require_once(DEDEINC.'/typelink/typelink.class.php'); + require_once(DEDEINC.'/channelunit.func.php'); if (empty($nextjob)) { $typeid = isset($typeid) ? intval($typeid) : 0; - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctype` WHERE reid='$typeid'"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctype` WHERE reid='$typeid' "); $tl = new TypeLink($typeid); $typename = $tl->TypeInfos['typename']; $reid = $tl->TypeInfos['reid']; $channelid = $tl->TypeInfos['channeltype']; if (!empty($row['dd'])) { - ShowMsg(Lang("catalog_merge_err_hasson", array('typename'=>$typename)), '-1'); + ShowMsg("栏目：$typename($typeid) 有子栏目，不能进行合并操作", '-1'); exit(); } $typeOptions = $tl->GetOptionArray(0, 0, $channelid); - $wintitle = Lang('catalog_merge'); - $wecome_info = "".Lang('catalog_main')." > ".Lang('catalog_merge'); - DedeWin::Instance()->Init('catalog_do.php', 'js/blank.js', 'POST') - ->AddHidden('dopost', 'unitCatalog') - ->AddHidden('typeid', $typeid) - ->AddHidden('channelid', $channelid) - ->AddHidden('nextjob', 'unitok') - ->AddTitle(Lang('catalog_merge_tip1')) - ->AddItem(Lang('catalog_merge_select_typename'), Lang('catalog_merge_tip2',array('typename'=>$typename))) - ->AddItem(Lang('catalog_merge_to'), "") - ->AddItem(Lang('care'), Lang('catalog_merge_tip3')) - ->GetWindow('ok') - ->Display(); + $wintitle = '合并栏目'; + $wecome_info = "栏目管理 > 合并栏目"; + $win = new OxWindow(); + $win->Init('catalog_do.php', 'js/blank.js', 'POST'); + $win->AddHidden('dopost', 'unitCatalog'); + $win->AddHidden('typeid', $typeid); + $win->AddHidden('channelid', $channelid); + $win->AddHidden('nextjob', 'unitok'); + $win->AddTitle("合并目录时不会删除原来的栏目目录，合并后需手动更新目标栏目的文档HTML和列表HTML"); + $win->AddItem('您选择的栏目是：', "$typename($typeid)"); + $win->AddItem('您希望合并到那个栏目', ""); + $win->AddItem('注意事项：', '栏目不能有下级子栏目，只允许子级到更高级或同级或不同父级的情况'); + $winform = $win->GetWindow('ok'); + $win->Display(); exit(); } else { if ($typeid == $unittype) { - ShowMsg(Lang('catalog_merge_err_same'), '-1'); + ShowMsg("同一栏目无法合并,请后退重试", '-1'); exit(); } if (IsParent($unittype, $typeid)) { - ShowMsg(Lang('catalog_merge_err_parent2son'), 'catalog_main.php'); + ShowMsg('不能从父类合并到子类', 'catalog_main.php'); exit(); } - $row = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $row = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = (empty($row['addtable']) ? '#@__addonarticle' : $row['addtable']); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET typeid='$unittype' WHERE typeid='$typeid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__feedback` SET typeid='$unittype' WHERE typeid='$typeid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET typeid='$unittype' WHERE typeid='$typeid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET typeid2='$unittype' WHERE typeid2='$typeid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__addonspec` SET typeid='$unittype' WHERE typeid='$typeid'"); - $dsql->ExecuteNoneQuery("UPDATE `$addtable` SET typeid='$unittype' WHERE typeid='$typeid'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id='$typeid'"); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET typeid='$unittype' WHERE typeid='$typeid' "); + $dsql->ExecuteNoneQuery("UPDATE `#@__feedback` SET typeid='$unittype' WHERE typeid='$typeid' "); + $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET typeid='$unittype' WHERE typeid='$typeid' "); + $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET typeid2='$unittype' WHERE typeid2='$typeid' "); + $dsql->ExecuteNoneQuery("UPDATE `#@__addonspec` SET typeid='$unittype' WHERE typeid='$typeid' "); + $dsql->ExecuteNoneQuery("UPDATE `$addtable` SET typeid='$unittype' WHERE typeid='$typeid' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id='$typeid' "); UpDateCatCache(); - ShowMsg(Lang('catalog_merge_success'), 'catalog_main.php'); + ShowMsg('成功合并指定栏目', 'catalog_main.php'); exit(); } } -//移动栏目 +/*---------------- +移动栏目 +function moveCatalog() { } +-----------------*/ else if ($dopost == 'moveCatalog') { - UserLogin::CheckPurview('t_Move'); - require_once(DEDEINC.'/channel/channelunit.func.php'); + CheckPurview('t_Move'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); + require_once(DEDEINC.'/typelink/typelink.class.php'); + require_once(DEDEINC.'/channelunit.func.php'); if (empty($nextjob)) { $tl = new TypeLink($typeid); $typename = $tl->TypeInfos['typename']; $reid = $tl->TypeInfos['reid']; $channelid = $tl->TypeInfos['channeltype']; $typeOptions = $tl->GetOptionArray(0, 0, $channelid); - $wintitle = Lang('catalog_move'); - $wecome_info = "".Lang('catalog_main')." > ".Lang('catalog_move'); - DedeWin::Instance()->Init('catalog_do.php', 'js/blank.js', 'POST') - ->AddHidden('dopost', 'moveCatalog') - ->AddHidden('typeid', $typeid) - ->AddHidden('channelid', $channelid) - ->AddHidden('nextjob', 'unitok') - ->AddTitle(Lang("catalog_move_tip")) - ->AddItem(Lang('catalog').'：', "$typename($typeid)") - ->AddItem(Lang('select_catalog'), "") - ->AddItem(Lang('care').'：', Lang('catalog_move_tip2')) - ->GetWindow('ok') - ->Display(); + $wintitle = "移动栏目"; + $wecome_info = "栏目管理 > 移动栏目"; + $win = new OxWindow(); + $win->Init('catalog_do.php', 'js/blank.js', 'POST'); + $win->AddHidden('dopost', 'moveCatalog'); + $win->AddHidden('typeid', $typeid); + $win->AddHidden('channelid', $channelid); + $win->AddHidden('nextjob', 'unitok'); + $win->AddTitle("移动目录时不会删除原来已创建的列表，移动后需重新对栏目创建HTML"); + $win->AddItem('您选择的栏目是：', "$typename($typeid)"); + $win->AddItem('您希望移动到那个栏目', ""); + $win->AddItem('注意事项：', '不允许从父级移动到子级目录，只允许子级到更高级或同级或不同父级的情况'); + $winform = $win->GetWindow('ok'); + $win->Display(); exit(); } else { if ($typeid == $movetype) { - ShowMsg(Lang('catalog_move_err_same'), 'catalog_main.php'); + ShowMsg('移对对象和目标位置相同', 'catalog_main.php'); exit(); } if (IsParent($movetype, $typeid)) { - ShowMsg(Lang('catalog_move_err_parent2son'), 'catalog_main.php'); + ShowMsg('不能从父类移动到子类', 'catalog_main.php'); exit(); } $topid = GetTopid($movetype); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET reid='$movetype',topid='$topid' WHERE id='$typeid'"); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET reid='$movetype',topid='$topid' WHERE id='$typeid' "); UpDateCatCache(); - ShowMsg(Lang('catalog_move_success'), 'catalog_main.php'); + ShowMsg('成功移动目录', 'catalog_main.php'); exit(); } } diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index c78557df..1bcb1ad7 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -8,14 +8,17 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/typelink/typelink.class.php"); if (empty($dopost)) $dopost = ''; $id = isset($id) ? intval($id) : 0; //检查权限许可 -UserLogin::CheckPurview('t_Edit,t_AccEdit'); +CheckPurview('t_Edit,t_AccEdit'); //检查栏目操作许可 -UserLogin::CheckCatalog($id, Lang('catalog_err_edit_noperm')); +CheckCatalog($id, '您无权修改本栏目'); +/*----------------------- +function action_save() +----------------------*/ if ($dopost == "save") { $description = Html2Text($description, 1); $keywords = Html2Text($keywords, 1); @@ -26,14 +29,14 @@ if ($dopost == "save") { $uptopsql = " ,siteurl='$siteurl',sitepath='$sitepath',ishidden='$ishidden' "; } if ($ispart != 0) $cross = 0; - $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typename='$typename',cnoverview='$cnoverview',enname='$enname',enoverview='$enoverview',bigpic='$bigpic',litimg='$litimg',typedir='$typedir',isdefault='$isdefault',defaultname='$defaultname',issend='$issend',ishidden='$ishidden',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ispart='$ispart',corank='$corank',description='$description',keywords='$keywords',seotitle='$seotitle',moresite='$moresite',`iscross`='$cross',`content`='$content',`crossid`='$crossid',`smalltypes`='$smalltypes' $uptopsql WHERE id='$id'"; + $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typename='$typename',cnoverview='$cnoverview',enname='$enname',enoverview='$enoverview',bigpic='$bigpic',litimg='$litimg',typedir='$typedir',isdefault='$isdefault',defaultname='$defaultname',issend='$issend',ishidden='$ishidden',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ispart='$ispart',corank='$corank',description='$description',keywords='$keywords',seotitle='$seotitle',moresite='$moresite',`cross`='$cross',`content`='$content',`crossid`='$crossid',`smalltypes`='$smalltypes'$uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg(Lang("catalog_err_update"), "-1"); + ShowMsg("保存当前栏目修改时失败，请检查您的输入资料是否存在问题", "-1"); exit(); } //如果选择子栏目可投稿，更新顶级栏目为可投稿 if ($topid > 0 && $issend == 1) { - $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid';"); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid'; "); } $slinks = " id IN (".GetSonIds($id).")"; //修改顶级栏目时强制修改下级的多站点支持属性 @@ -43,14 +46,14 @@ if ($dopost == "save") { } //修改子栏目属性 if (!empty($upnext)) { - $upquery = "UPDATE `#@__arctype` SET issend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks"; + $upquery = "UPDATE `#@__arctype` SETissend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks"; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg(Lang("catalog_err_update_son"), "-1"); + ShowMsg("修改当前栏目成功，但修改下级栏目属性时失败", "-1"); exit(); } } UpDateCatCache(); - ShowMsg(Lang("catalog_success_update"), "catalog_main.php"); + ShowMsg("成功修改一个分类", "catalog_main.php"); exit(); } //End Save Action else if ($dopost == "savetime") { @@ -67,15 +70,15 @@ else if ($dopost == "savetime") { } //如果选择子栏目可投稿，更新顶级栏目为可投稿 if ($topid > 0 && $issend == 1) { - $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid';"); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid'; "); } - $upquery = "UPDATE `#@__arctype` SETissend='$issend',sortrank='$sortrank',typedir='$typedir',typename='$typename',isdefault='$isdefault',defaultname='$defaultname',ispart='$ispart',corank='$corank' $uptopsql WHERE id='$id'"; + $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typedir='$typedir',typename='$typename',isdefault='$isdefault',defaultname='$defaultname',ispart='$ispart',corank='$corank' $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg(Lang("catalog_err_update"), "-1"); + ShowMsg("保存当前栏目修改时失败，请检查您的输入资料是否存在问题", "-1"); exit(); } UpDateCatCache(); - ShowMsg(Lang("catalog_success_update"), "catalog_main.php"); + ShowMsg("成功修改一个分类", "catalog_main.php"); exit(); } //读取栏目信息 @@ -112,33 +115,33 @@ if ($dopost == 'time') { - + - + - + - - + + - + - + - + - + - + -
：是否支持投稿： - - + +
：内容模型： $arr) { if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}"; } ?> - + 更多模型
：栏目名称：
： 排列顺序： （由低 > 高）
：浏览权限： + （仅限制栏目里的文档浏览权限）
：文件保存目录：
：栏目列表选项： - - - + + +
：默认页的名称：
：栏目属性： -
-
- +
+
+
- - + + +
diff --git a/src/admin/catalog_main.php b/src/admin/catalog_main.php index 4ba4e0ec..27ff3695 100644 --- a/src/admin/catalog_main.php +++ b/src/admin/catalog_main.php @@ -9,6 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -$userChannel = $cUserLogin->getUserChannel(); +require_once(DEDEINC."/typelink/typeunit.class.admin.php"); +$userChannel = $cuserLogin->getUserChannel(); include DedeInclude('templets/catalog_main.htm'); ?> \ No newline at end of file diff --git a/src/admin/config.php b/src/admin/config.php index 54791661..73b98524 100644 --- a/src/admin/config.php +++ b/src/admin/config.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; define('DEDEADMIN', str_replace("\\", '/', dirname(__FILE__))); -define('LANGSECTION', 'admin'); require_once(DEDEADMIN.'/../system/common.inc.php'); +require_once(DEDEINC.'/userlogin.class.php'); header('Cache-Control:private'); $dsql->safeCheck = FALSE; $dsql->SetLongLink(); @@ -48,8 +47,8 @@ $dedeNowurl = GetCurUrl(); $dedeNowurls = explode('?', $dedeNowurl); $s_scriptName = $dedeNowurls[0]; //检验用户登录状态 -$cUserLogin = new UserLogin(); -if ($cUserLogin->getUserID() == -1) { +$cuserLogin = new userLogin(); +if ($cuserLogin->getUserID() == -1) { if (preg_match("#PHP (.*) Development Server#", $_SERVER['SERVER_SOFTWARE'])) { $dirname = dirname($_SERVER['SCRIPT_NAME']); header("location:{$dirname}/login.php?gotopage=".urlencode($dedeNowurl)); @@ -78,7 +77,7 @@ if ($cfg_dede_log == 'Y') { $s_scriptNames = $s_scriptNames[count($s_scriptNames) - 1]; $s_userip = GetIP(); if ($s_method == 'POST' || (!preg_match("#".$s_nologfile."#i", $s_scriptNames) && $s_query != '') || preg_match("#".$s_needlogfile."#i", $s_scriptNames)) { - $inquery = "INSERT INTO `#@__log`(adminid,filename,method,query,cip,dtime) VALUES ('".$cUserLogin->getUserID()."','{$s_scriptNames}','{$s_method}','".addslashes($s_query)."','{$s_userip}','".time()."');"; + $inquery = "INSERT INTO `#@__log` (adminid,filename,method,query,cip,dtime) VALUES ('".$cuserLogin->getUserID()."','{$s_scriptNames}','{$s_method}','".addslashes($s_query)."','{$s_userip}','".time()."');"; $dsql->ExecuteNoneQuery($inquery); } } @@ -88,7 +87,7 @@ if (file_exists(DEDEDATA."/downmix.data.php")) { //管理缓存管理员频道缓存 $cache1 = DEDEDATA.'/cache/inc_catalog_base.inc'; if (!file_exists($cache1)) UpDateCatCache(); -$cacheFile = DEDEDATA.'/cache/admincat_'.$cUserLogin->userID.'.inc'; +$cacheFile = DEDEDATA.'/cache/admincat_'.$cuserLogin->userID.'.inc'; if (file_exists($cacheFile)) require_once($cacheFile); /** * 更新栏目缓存 @@ -98,7 +97,7 @@ if (file_exists($cacheFile)) require_once($cacheFile); */ function UpDateCatCache() { - global $dsql, $cache1, $cUserLogin; + global $dsql, $cache1, $cuserLogin; $cache2 = DEDEDATA.'/cache/channelsonlist.inc'; $cache3 = DEDEDATA.'/cache/channeltoplist.inc'; $dsql->SetQuery("SELECT id,reid,channeltype,issend,typename FROM `#@__arctype`"); @@ -114,7 +113,7 @@ function UpDateCatCache() } fwrite($fp1, "{$phph}>"); fclose($fp1); - $cUserLogin->ReWriteAdminChannel(); + $cuserLogin->ReWriteAdminChannel(); @unlink($cache2); @unlink($cache3); } @@ -156,9 +155,9 @@ if (!function_exists('GetMemberName')) { { global $dsql; if (empty($mid)) { - return Lang("administrator"); + return "管理员"; } - $rs = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='{$mid}'"); + $rs = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='{$mid}' "); return $rs['uname']; } } diff --git a/src/admin/content_att.php b/src/admin/content_att.php index 9079e68a..b85ddc65 100644 --- a/src/admin/content_att.php +++ b/src/admin/content_att.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Att'); +CheckPurview('sys_Att'); if (empty($dopost)) $dopost = ''; //保存修改 if ($dopost == "save") { @@ -20,10 +19,10 @@ if ($dopost == "save") { $att = ${'att_'.$startID}; $attname = ${'attname_'.$startID}; $sortid = ${'sortid_'.$startID}; - $query = "UPDATE `#@__arcatt` SET `attname`='$attname',`sortid`='$sortid' WHERE att='$att'"; + $query = "UPDATE `#@__arcatt` SET `attname`='$attname',`sortid`='$sortid' WHERE att='$att' "; $dsql->ExecuteNoneQuery($query); } - echo ""; + echo ""; } include DedeInclude('templets/content_att.htm'); ?> \ No newline at end of file diff --git a/src/admin/content_batch_up.php b/src/admin/content_batch_up.php index 59d41702..8ccfa48f 100644 --- a/src/admin/content_batch_up.php +++ b/src/admin/content_batch_up.php @@ -9,5 +9,6 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); +require_once(DEDEINC.'/typelink/typelink.class.php'); include DedeInclude('templets/content_batch_up.htm'); ?> \ No newline at end of file diff --git a/src/admin/content_batchup_action.php b/src/admin/content_batchup_action.php index 97fa32b7..e7d8135f 100644 --- a/src/admin/content_batchup_action.php +++ b/src/admin/content_batchup_action.php @@ -8,11 +8,12 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_ArcBatch'); +CheckPurview('sys_ArcBatch'); +require_once(DEDEINC."/typelink/typelink.class.php"); require_once(DEDEADMIN."/inc/inc_batchup.php"); @set_time_limit(0); +//获取id条件 if (empty($startid)) $startid = 0; if (empty($endid)) $endid = 0; if (empty($seltime)) $seltime = 0; @@ -26,6 +27,7 @@ if ($action == "makehtml") { header("Location: $jumpurl"); exit(); } + $gwhere = " WHERE 1 "; if ($startid > 0) $gwhere .= " AND id>= $startid "; if ($endid > $startid) $gwhere .= " AND id<= $endid "; @@ -40,7 +42,7 @@ if ($seltime == 1) { $gwhere .= " AND (senddate >= $t1 AND senddate <= $t2) "; } if (!empty($userid)) { - $row = $dsql->GetOne("SELECT `mid` FROM `#@__member` WHERE `userid` LIKE '$userid'"); + $row = $dsql->GetOne("SELECT `mid` FROM #@__member WHERE `userid` LIKE '$userid'"); if (is_array($row)) { $gwhere .= " AND mid = {$row['mid']} "; } @@ -50,7 +52,7 @@ if (!empty($heightdone)) $action = $heightdone; //指量审核 if ($action == 'check') { if (empty($startid) || empty($endid) || $endid < $startid) { - ShowMsg(Lang('content_error_id_check'), 'javascript:;'); + ShowMsg('该操作必须指定起始id', 'javascript:;'); exit(); } $jumpurl = "makehtml_archives_action.php?endid=$endid&startid=$startid"; @@ -64,13 +66,13 @@ if ($action == 'check') { $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET arcrank=0 WHERE id='{$row->id}'"); } } - ShowMsg(Lang("content_batch_check_success"), $jumpurl); + ShowMsg("完成数据库的审核处理，准备更新HTML", $jumpurl); exit(); } //批量删除 else if ($action == 'del') { if (empty($startid) || empty($endid) || $endid < $startid) { - ShowMsg(Lang('content_error_id_check'), 'javascript:;'); + ShowMsg('该操作必须指定起始id', 'javascript:;'); exit(); } $dsql->SetQuery("SELECT id FROM `#@__archives` $gwhere"); @@ -79,60 +81,62 @@ else if ($action == 'del') { while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg(Lang('content_batch_delete_success',array('tdd'=>$tdd)), "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //删除空标题文档 else if ($action == 'delnulltitle') { - $dsql->SetQuery("SELECT id FROM `#@__archives` WHERE trim(title)=''"); + $dsql->SetQuery("SELECT id FROM `#@__archives` WHERE trim(title)='' "); $dsql->Execute('x'); $tdd = 0; while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg(Lang('content_batch_delete_success',array('tdd'=>$tdd)), "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //删除空内容文档 else if ($action == 'delnullbody') { - $dsql->SetQuery("SELECT aid FROM `#@__addonarticle` WHERE LENGTH(body) < 10"); + $dsql->SetQuery("SELECT aid FROM `#@__addonarticle` WHERE LENGTH(body) < 10 "); $dsql->Execute('x'); $tdd = 0; while ($row = $dsql->GetObject('x')) { if (DelArc($row->aid)) $tdd++; } - ShowMsg(Lang('content_batch_delete_success',array('tdd'=>$tdd)), "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //修正缩略图错误 else if ($action == 'modddpic') { - $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET litpic='' WHERE trim(litpic)='litpic'"); - ShowMsg(Lang("content_batch_modddpic_success"), "javascript:;"); + $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET litpic='' WHERE trim(litpic)='litpic' "); + ShowMsg("成功修正缩略图错误", "javascript:;"); exit(); } //批量移动 else if ($action == 'move') { if (empty($typeid)) { - ShowMsg(Lang('content_batch_err_typeid_isempty'), 'javascript:;'); + ShowMsg('该操作必须指定栏目', 'javascript:;'); exit(); } - $typeold = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$typeid';"); - $typenew = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$newtypeid';"); + $typeold = $dsql->GetOne("SELECT * FROM #@__arctype WHERE id='$typeid'; "); + $typenew = $dsql->GetOne("SELECT * FROM #@__arctype WHERE id='$newtypeid'; "); if (!is_array($typenew)) { - ShowMsg(Lang("content_batch_err_typenew"), "javascript:;"); + ShowMsg("无法检测移动到的新栏目的信息，不能完成操作", "javascript:;"); exit(); } if ($typenew['ispart'] != 0) { - ShowMsg(Lang("content_batch_err_ispart"), "javascript:;"); + ShowMsg("您不能把数据移动到非最终列表的栏目", "javascript:;"); exit(); } if ($typenew['channeltype'] != $typeold['channeltype']) { - ShowMsg(Lang("content_batch_err_channeltype"), "javascript:;"); + ShowMsg("不能把数据移动到内容类型不同的栏目", "javascript:;"); exit(); } $gwhere .= " And channel='".$typenew['channeltype']."' And title like '%$keyword%'"; - $ch = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id={$typenew['channeltype']}"); + + $ch = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id={$typenew['channeltype']} "); $addtable = $ch['addtable']; + $dsql->SetQuery("SELECT id FROM `#@__archives` $gwhere"); $dsql->Execute('m'); $tdd = 0; @@ -140,7 +144,7 @@ else if ($action == 'move') { $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET typeid='$newtypeid' WHERE id='{$row->id}'"); $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET typeid='$newtypeid' WHERE id='{$row->id}'"); if ($addtable != '') { - $dsql->ExecuteNoneQuery("UPDATE `$addtable` SET typeid='$newtypeid' WHERE aid='{$row->id}'"); + $dsql->ExecuteNoneQuery("UPDATE `$addtable` SET typeid='$newtypeid' WHERE aid='{$row->id}' "); } if ($rs) $tdd++; //DelArc($row->id,true); @@ -149,20 +153,26 @@ else if ($action == 'move') { $jumpurl = "makehtml_archives_action.php?endid=$endid&startid=$startid"; $jumpurl .= "&typeid=$newtypeid&pagesize=20&seltime=$seltime"; $jumpurl .= "&stime=".urlencode($starttime)."&etime=".urlencode($endtime); - ShowMsg(Lang('content_batch_move_success',array('tdd'=>$tdd )), $jumpurl); + ShowMsg("成功移动 $tdd 条记录，准备重新生成网页", $jumpurl); } else { - ShowMsg(Lang("content_batch_finish_move_success"), "javascript:;"); + ShowMsg("完成操作，没移动任何数据", "javascript:;"); } } //删除空标题内容 else if ($action == 'delnulltitle') { - $dsql->SetQuery("SELECT id FROM `#@__archives` WHERE trim(title)=''"); + $dsql->SetQuery("SELECT id FROM #@__archives WHERE trim(title)='' "); $dsql->Execute('x'); $tdd = 0; while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg(Lang('content_batch_delete_success',array('tdd'=>$tdd)), "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); + exit(); +} +//修正缩略图错误 +else if ($action == 'modddpic') { + $dsql->ExecuteNoneQuery("UPDATE #@__archives SET litpic='' WHERE trim(litpic)='litpic' "); + ShowMsg("成功修正缩略图错误", "javascript:;"); exit(); } ?> \ No newline at end of file diff --git a/src/admin/content_list.php b/src/admin/content_list.php index d5d3f34e..70673ece 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -1,7 +1,8 @@ getUserID(); + if (TestPurview('a_MyList')) $mid = $cuserLogin->getUserID(); } -$adminid = $cUserLogin->getUserID(); +$adminid = $cuserLogin->getUserID(); $maintable = '#@__archives'; setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); $tl = new TypeLink($cid); @@ -74,7 +74,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) { } if ($cid == 0) { if ($channelid == 0) { - $positionname = Lang('catalog_all').'>'; + $positionname = '所有栏目>'; } else { $row = $tl->dsql->GetOne("SELECT id,typename,maintable FROM `#@__channeltype` WHERE id='$channelid'"); $positionname = $row['typename']." > "; @@ -112,7 +112,7 @@ if ($typeCount > 800) { } else { $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid); } -$whereSql = empty($channelid) ? " WHERE arc.channel > 0 AND arc.arcrank > -2 " : " WHERE arc.channel = '$channelid' AND arc.arcrank > -2 "; +$whereSql = empty($channelid) ? " WHERE arc.channel > 0 AND arc.arcrank > -2 " : " WHERE arc.channel = '$channelid' AND arc.arcrank > -2 "; $flagsArr = ''; $dsql->Execute('f', 'SELECT * FROM `#@__arcatt` ORDER BY sortid ASC'); while ($frow = $dsql->GetArray('f')) { @@ -135,9 +135,9 @@ if ($cid != 0) { } if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby); $orderbyField = 'arc.'.$orderby; diff --git a/src/admin/content_s_list.php b/src/admin/content_s_list.php index bf27e10d..220d2e61 100644 --- a/src/admin/content_s_list.php +++ b/src/admin/content_s_list.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('spec_List'); +CheckPurview('spec_List'); $s_tmplets = "templets/content_s_list.htm"; $channelid = -1; include(dirname(__FILE__)."/content_list.php"); diff --git a/src/admin/content_sg_list.php b/src/admin/content_sg_list.php index d8e6e6b0..de70fe4d 100644 --- a/src/admin/content_sg_list.php +++ b/src/admin/content_sg_list.php @@ -8,9 +8,6 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeLink; require_once(dirname(__FILE__)."/config.php"); $cid = isset($cid) ? intval($cid) : 0; $channelid = isset($channelid) ? intval($channelid) : 0; @@ -18,28 +15,30 @@ $mid = isset($mid) ? intval($mid) : 0; if (!isset($keyword)) $keyword = ''; if (!isset($arcrank)) $arcrank = ''; if (empty($cid) && empty($channelid)) { - ShowMsg(Lang("content_err_cid_channelid_isempty"), "javascript:;"); + ShowMsg("该页面必须指定栏目id或内容模型ID才能浏览", "javascript:;"); exit(); } //检查权限许可，总权限 -UserLogin::CheckPurview('a_List,a_AccList,a_MyList'); +CheckPurview('a_List,a_AccList,a_MyList'); //栏目浏览许可 -if (UserLogin::TestPurview('a_List')) { -} else if (UserLogin::TestPurview('a_AccList')) { +if (TestPurview('a_List')) { +} else if (TestPurview('a_AccList')) { if ($cid == 0) { - $ucid = $cid = $cUserLogin->getUserChannel(); + $ucid = $cid = $cuserLogin->getUserChannel(); } else { - UserLogin::CheckCatalog($cid, Lang("catalog_err_norank")); + CheckCatalog($cid, "您无权浏览非指定栏目的内容"); } } -$adminid = $cUserLogin->getUserID(); +$adminid = $cuserLogin->getUserID(); $maintable = '#@__archives'; +require_once(DEDEINC."/typelink/typelink.class.php"); +require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEADMIN."/inc/inc_list_functions.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $tl = new TypeLink($cid); $listtable = @trim($tl->TypeInfos['addtable']); if (!empty($channelid) && !empty($ucid) && $tl->TypeInfos['channeltype'] != $channelid) { - ShowMsg(Lang('catalog_err_noperm'), 'javascript:;'); + ShowMsg('您没权限访问此页', 'javascript:;'); exit(); } if ($cid == 0) { @@ -53,12 +52,12 @@ $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid); $whereSql = $channelid == 0 ? " WHERE arc.channel < -1 " : " WHERE arc.channel = '$channelid' "; if (!empty($mid)) $whereSql .= " AND arc.mid = '$mid' "; if ($keyword != '') $whereSql .= " AND (arc.title like '%$keyword%') "; -if ($cid != 0) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).") "; +if ($cid != 0) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")"; if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.arcrank,arc.flag,arc.senddate,arc.channel,arc.title,arc.mid,arc.click,tp.typename,ch.typename as channelname FROM `$listtable` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel $whereSql ORDER BY arc.aid DESC"; $dlist = new DataListCP(); diff --git a/src/admin/content_tj.php b/src/admin/content_tj.php index a836aeb1..938c1062 100644 --- a/src/admin/content_tj.php +++ b/src/admin/content_tj.php @@ -8,12 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_ArcTj'); -$row1 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`"); -$row2 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__feedback`"); -$row3 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member`"); +CheckPurview('sys_ArcTj'); +$row1 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); +$row2 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__feedback` "); +$row3 = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` "); /** * 获取文档 * @@ -34,14 +33,14 @@ function GetArchives($dsql, $ordertype) } else { $ordersql = " ORDER BY click DESC "; } - $query = "SELECT id,title,click,scores FROM `#@__archives` $swhere $ordersql LIMIT 0,20"; + $query = "SELECT id,title,click,scores FROM `#@__archives` $swhere $ordersql LIMIT 0,30 "; $dsql->SetQuery($query); $dsql->Execute('ga'); while ($row = $dsql->GetObject('ga')) { if (preg_match("#feedback#i", $ordertype)) { - $moreinfo = "[id}'>".Lang('feedback')."：{$row->scores}]"; + $moreinfo = "[id}'>评论：{$row->scores}]"; } else { - $moreinfo = "[".Lang('click')."：{$row->click}]"; + $moreinfo = "[点击：{$row->click}]"; } echo "·"; echo cn_substr($row->title, 30)."{$moreinfo}
\r\n"; diff --git a/src/admin/css/albumupload.min.css b/src/admin/css/albumupload.min.css deleted file mode 100644 index fdeb8988..00000000 --- a/src/admin/css/albumupload.min.css +++ /dev/null @@ -1 +0,0 @@ -div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 150px}.progressWrapper{width:360px;overflow:hidden}.progressContainer{padding:5px;margin:5px;background:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background:#FFEBEB;border:solid 1px #B50000}.green{background:#EBFFEB;border:solid 1px #DDF0DD}.blue{background:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:16px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background:blue}.progressBarComplete{width:100%;background:green;visibility:hidden}.progressBarError{width:100%;background:#dc3545;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;text-align:left;white-space:nowrap}.swfupload{vertical-align:top}.albCt{float:left;width:220px;height:auto;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:auto}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{max-width:200px;max-height:150px;cursor:pointer} \ No newline at end of file diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css deleted file mode 100644 index e621bf21..00000000 --- a/src/admin/css/login.min.css +++ /dev/null @@ -1 +0,0 @@ -*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f8f8f8}a{color:#545b62}h2{font-size:24px}input,select,.btn{font-size:14px!important}.biz-head{padding:1rem 0;background:#fff}.logo{height:36px}.biz-nav{height:36px;line-height:36px}.biz-nav-a{padding-right:30px}.biz-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.login-from{margin:0 auto;width:500px}.login-area{padding:1.25rem;background:#fff;border-radius:.2rem}.login-power{padding-top:1rem}.login-power a,.goindex a{color:#1eb867}.form-control{height:36px}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.biz-head{padding:1rem 15px}.biz-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file diff --git a/src/admin/css/top.min.css b/src/admin/css/top.min.css deleted file mode 100644 index 59df6a97..00000000 --- a/src/admin/css/top.min.css +++ /dev/null @@ -1 +0,0 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#fff}body.hidemenu{background:none}body.showmenu .index-menu{display:block}body.hidemenu .index-menu{display:none}body.showmenu .index-body{left:230px;transition:all .3s}body.hidemenu .index-body{left:0;transition:all .3s}a,a:hover{text-decoration:none}ul,li{list-style:none}.index-menu{position:absolute;top:60px;width:230px;left:0;bottom:0;z-index:1}.index-body{position:absolute;right:0;top:60px;bottom:0;z-index:1}.main{height:100%}.main iframe{width:100%;height:100%;z-index:20}.menu{height:100%}.menu iframe{width:100%;height:100%;z-index:3}.head{position:relative;width:100%;height:60px;z-index:2}.top{width:100%;height:60px;background:linear-gradient(45deg,#1eb867,#009688);box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);}.top .top-logo{float:left;margin-left:30px;width:200px}.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:90px}.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;font-size:12px;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,.top .top-admin ul li a{font-size:14px;color:#fff}.top .top-item ul li a:hover,.top .top-admin ul li a:hover{color:#dee2e6}.top .top-admin{float:right;margin-right:30px;height:60px;line-height:60px}.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}.form-search{width:170px}.input-search{width:160px;height:26px;line-height:26px;font-size:12px;background:#fff;border-radius:.2rem;border:0;vertical-align:middle}.input-search:focus{box-shadow:none;outline:none}.btn-search{margin-left:-30px;height:26px;line-height:26px;color:#545b62;background:transparent;border-radius:.2rem;border:0}.btn{font-size:14px;color:#fff}.btn:hover{color:#fff}.dropdown-menu{min-width:8rem}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.accordion-box{margin:0;padding:1rem 8px;background:#f8f8f8;overflow:scroll;overflow-x:hidden}.accordion{width:100%;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.accordion .link{position:relative;padding-left:50px;display:block;height:40px;line-height:40px;cursor:pointer;transition:all .3s;}.accordion li:last-child .link{border-bottom:0}.accordion li i{position:absolute;top:12px;left:20px;color:#545b62;}.accordion li i.fa-angle-down{right:20px;left:auto;}.accordion li.open .link,.accordion li.open i{color:#1eb867}.accordion li.open i.fa-angle-down{transform:rotate(180deg)}.submenu{display:none;padding:6px 0;background:#adb5bd;border-radius:0 0 .2rem .2rem}.submenu li{height:40px;line-height:40px;transition:all .3s}.submenu li:hover{background:#1eb867}.submenu a{display:block;float:left;padding:0 10px 0 50px;color:#fff}.submenu-right{float:right!important;padding:0 20px 0 10px!important;}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer} \ No newline at end of file diff --git a/src/admin/dialog/config.php b/src/admin/dialog/config.php index f5f18024..e75ad097 100644 --- a/src/admin/dialog/config.php +++ b/src/admin/dialog/config.php @@ -2,15 +2,14 @@ /** * 该页仅用于检测用户登录的情况，如要手工修改系统配置，请修改common.inc.php * - * @version $Id: config.php 2022-07-01 tianya $ + * @version $Id: config.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -define('LANGSECTION', 'admin'); require_once(dirname(__FILE__)."/../../system/common.inc.php"); +require_once(DEDEINC."/userlogin.class.php"); //获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行修改这个选项 $dedeNowurl = ''; $s_scriptName = ''; @@ -19,10 +18,10 @@ $dedeNowurl = GetCurUrl(); $dedeNowurls = explode("?", $dedeNowurl); $s_scriptName = $dedeNowurls[0]; //检验用户登录状态 -$cUserLogin = new UserLogin(); -if ($cUserLogin->getUserID() <= 0) { +$cuserLogin = new userLogin(); +if ($cuserLogin->getUserID() <= 0) { if (empty($adminDirHand)) { - ShowMsg(Lang("dialog_nologin"), "javascript:;"); + ShowMsg("提示：需输入后台管理目录才能登录
请输入后台管理目录名：
", "javascript:;"); exit(); } $adminDirHand = HtmlReplace($adminDirHand, 1); diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index f2c9a658..db9f0093 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -24,7 +24,7 @@ if (strlen($activepath) < strlen($cfg_image_dir)) { $activepath = $cfg_image_dir; } $inpath = $cfg_basedir.$activepath; -$activeurl = $activepath; +$activeurl = '..'.$activepath; if (empty($f)) { $f = 'form1.picname'; } @@ -53,16 +53,17 @@ if (!empty($iseditor)) { - + - <?php echo Lang('dialog_select_image');?> + 选择图片 - + +
+ +
-
- -
- +
- - - - + + + + - + - - + + "; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; @@ -207,7 +211,8 @@ html{background:#f8f8f8} if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " - + + "; @@ -219,7 +224,8 @@ html{background:#f8f8f8} if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " - + + "; diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php index f8ea0c6e..00eea9a9 100644 --- a/src/admin/dialog/select_images_post.php +++ b/src/admin/dialog/select_images_post.php @@ -2,15 +2,14 @@ /** * 图片选择 * - * @version $Id: select_images_post.php 2022-07-01 tianya $ + * @version $Id: select_images_post.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -helper('image'); +require_once(DEDEINC."/image.func.php"); if (empty($activepath)) { $activepath = ''; $activepath = str_replace('.', '', $activepath); @@ -23,21 +22,21 @@ if (empty($imgfile)) { $imgfile = ''; } if (!is_uploaded_file($imgfile)) { - ShowMsg(Lang("friendlink_err_imglogo_empty",array('file'=>$imgfile)), "-1"); + ShowMsg("您没有选择上传的文件".$imgfile, "-1"); exit(); } $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1; $imgfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $imgfile_name)); if (!preg_match("#\.(".$cfg_imgtype.")#i", $imgfile_name)) { - ShowMsg(Lang("dialog_err_imagetype"), "-1"); + ShowMsg("您所上传的图片类型不在许可列表，请修改系统对扩展名限定的配置", "-1"); exit(); } $nowtme = time(); $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/webp"); $imgfile_type = strtolower(trim($imgfile_type)); if (!in_array($imgfile_type, $sparr)) { - ShowMsg(Lang("dialog_err_imageformat"), "-1"); + ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG、WBMP格式的其中一种", "-1"); exit(); } $mdir = MyDate($cfg_addon_savetype, $nowtme); @@ -45,7 +44,7 @@ if (!is_dir($cfg_basedir.$activepath."/$mdir")) { MkdirAll($cfg_basedir.$activepath."/$mdir", $cfg_dir_purview); CloseFtp(); } -$filename_name = $cUserLogin->getUserID().'-'.dd2char(MyDate("ymdHis", $nowtme).mt_rand(100, 999)); +$filename_name = $cuserLogin->getUserID().'-'.dd2char(MyDate("ymdHis", $nowtme).mt_rand(100, 999)); $filename = $mdir.'/'.$filename_name; $fs = explode('.', $imgfile_name); $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -53,14 +52,14 @@ $filename_name = $filename_name.'.'.$fs[count($fs) - 1]; $fullfilename = $cfg_basedir.$activepath."/".$filename; $mime = get_mime_type($imgfile); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } -move_uploaded_file($imgfile, $fullfilename) or die(Lang('media_err_upload',array('filename'=>$fullfilename))); +move_uploaded_file($imgfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($imgfile); if (empty($resize)) { $resize = 0; @@ -81,10 +80,10 @@ $sizes = getimagesize($fullfilename, $info); $imgwidthValue = $sizes[0]; $imgheightValue = $sizes[1]; $imgsize = filesize($fullfilename); -$inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','".$activepath."/".$filename."','1','$imgwidthValue','$imgheightValue','0','{$imgsize}','{$nowtme}','".$cUserLogin->getUserID()."');"; +$inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','".$activepath."/".$filename."','1','$imgwidthValue','$imgheightValue','0','{$imgsize}','{$nowtme}','".$cuserLogin->getUserID()."'); "; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); -UserLogin::AddMyAddon($fid, $activepath.'/'.$filename); +AddMyAddon($fid, $activepath.'/'.$filename); $CKUpload = isset($CKUpload) ? $CKUpload : FALSE; if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) { $fileurl = $activepath.'/'.$filename; @@ -93,9 +92,9 @@ if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) { exit; } if (!empty($noeditor)) { - ShowMsg(Lang("dialog_success_uploadimage"), "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&noeditor=yes&activepath=".urlencode($activepath)."/$mdir&d=".time()); + ShowMsg("成功上传一幅图片", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&noeditor=yes&activepath=".urlencode($activepath)."/$mdir&d=".time()); } else { - ShowMsg(Lang("dialog_success_uploadimage"), "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."/$mdir&d=".time()); + ShowMsg("成功上传一幅图片", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."/$mdir&d=".time()); } exit(); ?> \ No newline at end of file diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index f67814a5..d8570d3c 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -2,7 +2,7 @@ /** * 多媒体选择 * - * @version $Id: select_media.php 2022-07-01 tianya $ + * @version $Id: select_media.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -43,15 +43,16 @@ if (!empty($noeditor)) { - + - <?php echo Lang('dialog_media_select');?> + 选择多媒体 - + @@ -78,15 +79,15 @@ html{background:#f8f8f8} - 上传： - + 上传： + - - - + + + - - + + "; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; echo "$line"; + } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = " class='text-danger' "; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; } else if (preg_match("#\.(wmv|avi)#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); @@ -134,7 +147,7 @@ html{background:#f8f8f8} if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " - + "; @@ -146,7 +159,7 @@ html{background:#f8f8f8} if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " - + "; @@ -158,8 +171,7 @@ html{background:#f8f8f8} if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " - + "; diff --git a/src/admin/dialog/select_media_post.php b/src/admin/dialog/select_media_post.php index ee49bd81..75fe5365 100644 --- a/src/admin/dialog/select_media_post.php +++ b/src/admin/dialog/select_media_post.php @@ -2,7 +2,7 @@ /** * 多媒体发送 * - * @version $Id: select_media_post.php 2022-07-01 tianya $ + * @version $Id: select_media_post.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -12,7 +12,8 @@ include_once(dirname(__FILE__).'/config.php'); $cfg_softtype = $cfg_mediatype."|mp4"; $cfg_soft_dir = $cfg_other_medias; $bkurl = 'select_media.php'; -$uploadmbtype = Lang("dialog_media_post"); +$uploadmbtype = "多媒体文件类型"; + if (empty($activepath)) { $activepath = ''; $activepath = str_replace('.', '', $activepath); diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 97028631..441d0384 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -1,13 +1,4 @@ @@ -20,7 +11,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); -<?php echo Lang('dialog_mimages');?> +插入多图 @@ -64,7 +65,7 @@ html{background:#f8f8f8} window.opener.CKEDITOR.tools.callFunction(funcNum, reimg); } if (typeof window.opener.CKEDITOR.instances[""] !== "undefined") { - let addonHTML = `附件：${reimg}`; + let addonHTML = `附件：${reimg}`; window.opener.CKEDITOR.instances[""].insertHtml(addonHTML); } if (window.opener.document. != null) { @@ -75,16 +76,16 @@ html{background:#f8f8f8} window.close(); } -
+
" : ''; echo $noeditor;?> @@ -145,22 +146,23 @@ html{background:#f8f8f8} - ： - - - ： - ： - + 上传： + + + 宽： + 高： +
预览选择图片文件大小修改时间
点击图片预览，点击图片名选择图片，显示图片后点击该图片关闭预览
".Lang('parent_directory')."".Lang('current_directory')."：$activepath + 上级目录当前目录：$activepath
$file + $file
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
点击名称选择文件文件大小最后修改时间
".Lang('parent_directory')."".Lang('current_directory')."：$activepath上级目录当前目录：$activepath
$file$file
$file$filesize KB$filetime
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
- $file$file $filesize KB $filetime
+
@@ -92,9 +93,9 @@ html{background:#f8f8f8}
- ： - ： - + 上传： + 改名： +
- - - + + + - - + + \r\n"; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; @@ -141,7 +142,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; $line = " - + "; @@ -153,7 +154,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; $line = " - + "; @@ -165,7 +166,7 @@ html{background:#f8f8f8} - +
选择文件文件大小修改时间
".Lang('parent_directory')."".Lang('current_directory')."：$activepath上级目录当前目录：$activepath
$file$file
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
点击选择的文件，红色字样的为刚上传的文件
diff --git a/src/admin/dialog/select_soft_post.php b/src/admin/dialog/select_soft_post.php index 52657bf5..49b45532 100644 --- a/src/admin/dialog/select_soft_post.php +++ b/src/admin/dialog/select_soft_post.php @@ -2,25 +2,24 @@ /** * 软件发送 * - * @version $Id: select_soft_post.php 2022-07-01 tianya $ + * @version $Id: select_soft_post.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; if (!isset($cfg_basedir)) { include_once(dirname(__FILE__).'/config.php'); } if (empty($uploadfile)) $uploadfile = ''; -if (empty($uploadmbtype)) $uploadmbtype = Lang('dialog_soft_type'); +if (empty($uploadmbtype)) $uploadmbtype = '软件类型'; if (empty($bkurl)) $bkurl = 'select_soft.php'; $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1; $newname = (empty($newname) ? '' : preg_replace("#[\\ \"\*\?\t\r\n<>':\/|]#", "", $newname)); $uploadfile = isset($imgfile) && empty($uploadfile) ? $imgfile : $uploadfile; $uploadfile_name = isset($imgfile_name) && empty($uploadfile_name) ? $imgfile_name : $uploadfile_name; if (!is_uploaded_file($uploadfile)) { - ShowMsg(Lang("dialog_soft_err_upload"), "-1"); + ShowMsg("您没有选择上传的文件或选择的文件大小超出限制", "-1"); exit(); } //软件类型所有支持的附件 @@ -28,7 +27,7 @@ $cfg_softtype = $cfg_softtype; $cfg_softtype = str_replace('||', '|', $cfg_softtype); $uploadfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $uploadfile_name)); if (!preg_match("#\.(".$cfg_softtype.")#i", $uploadfile_name)) { - ShowMsg(Lang('dialog_soft_err_filetype',array('type'=>$uploadmbtype)), "-1"); + ShowMsg("您所上传的{$uploadmbtype}不在许可列表，请修改系统对扩展名限定的配置", "-1"); exit(); } $nowtme = time(); @@ -40,21 +39,21 @@ if ($activepath == $cfg_soft_dir) { CloseFtp(); } } -//文件名前为手工指定，后者自动处理 +//文件名（前为手工指定， 后者自动处理） if (!empty($newname)) { $filename = $newname; if (!preg_match("#\.#", $filename)) $fs = explode('.', $uploadfile_name); else $fs = explode('.', $filename); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg(Lang("media_ext_forbidden"), 'javascript:;'); + ShowMsg("您指定的文件名被系统禁止", 'javascript:;'); exit(); } if (!preg_match("#\.#", $filename)) $filename = $filename.'.'.$fs[count($fs) - 1]; } else { - $filename = $cUserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', $nowtme)); + $filename = $cuserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', $nowtme)); $fs = explode('.', $uploadfile_name); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg(Lang("dialog_soft_err_notallow"), "-1"); + ShowMsg("您上传了某些可能存在不安全因素的文件，系统拒绝操作", "-1"); exit(); } $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -63,14 +62,14 @@ $fullfilename = $cfg_basedir.$activepath.'/'.$filename; $fullfileurl = $activepath.'/'.$filename; $mime = get_mime_type($uploadfile); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } -move_uploaded_file($uploadfile, $fullfilename) or die(Lang('media_err_upload',array('filename'=>$fullfilename))); +move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($uploadfile); if ($uploadfile_type == 'application/x-shockwave-flash') { $mediatype = 2; @@ -81,10 +80,10 @@ if ($uploadfile_type == 'application/x-shockwave-flash') { } else { $mediatype = 4; } -$inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','$fullfileurl','$mediatype','0','0','0','{$uploadfile_size}','{$nowtme}','".$cUserLogin->getUserID()."');"; +$inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','$fullfileurl','$mediatype','0','0','0','{$uploadfile_size}','{$nowtme}','".$cuserLogin->getUserID()."'); "; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); -UserLogin::AddMyAddon($fid, $fullfileurl); +AddMyAddon($fid, $fullfileurl); if ($ck == 1) { $funcNum = isset($_GET['CKEditorFuncNum']) ? $_GET['CKEditorFuncNum'] : 1; $url = $fullfileurl; @@ -95,7 +94,7 @@ if ($ck == 1) { ); echo json_encode($arr); } else { - ShowMsg(Lang("dialog_soft_success_upload"), $bkurl."?comeback=".urlencode($filename)."&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."&d=".time()); + ShowMsg("成功上传文件", $bkurl."?comeback=".urlencode($filename)."&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."&d=".time()); exit(); } ?> \ No newline at end of file diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index 3f1b0e52..dee3f3d2 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -2,7 +2,7 @@ /** * 模板选择 * - * @version $Id: select_templets.php 2022-07-01 tianya $ + * @version $Id: select_templets.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -20,7 +20,7 @@ if (strlen($activepath) < strlen($templetdir)) { $activepath = $templetdir; } $inpath = $cfg_basedir.$activepath; -$activeurl = $activepath; +$activeurl = '..'.$activepath; if (!is_dir($inpath)) { die('No Exsits Path'); } @@ -34,15 +34,16 @@ if (empty($comeback)) { - + - <?php echo Lang('dialog_template_select');?> + 选择模板 - + @@ -56,23 +57,23 @@ html{background:#f8f8f8} window.close(); } - +
- - - + + + - - + + \r\n"; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; @@ -120,7 +121,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; @@ -132,7 +133,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."/#", "", $reurl); $line = " - + "; @@ -144,7 +145,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; @@ -156,7 +157,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; @@ -168,7 +169,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; @@ -180,7 +181,7 @@ html{background:#f8f8f8} $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; diff --git a/src/admin/dialog/select_templets_post.php b/src/admin/dialog/select_templets_post.php index 45ee533d..ace26bf5 100644 --- a/src/admin/dialog/select_templets_post.php +++ b/src/admin/dialog/select_templets_post.php @@ -2,7 +2,7 @@ /** * 模板发送 * - * @version $Id: select_templets_post.php 2022-07-01 tianya $ + * @version $Id: select_templets_post.php 1 9:43 2010年7月8日Z tianya $ * @package DedeBIZ.Dialog * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -14,15 +14,15 @@ if (empty($uploadfile)) { $uploadfile = ""; } if (!is_uploaded_file($uploadfile)) { - ShowMsg(Lang("friendlink_err_imglogo_empty"), "-1"); + ShowMsg("您没有选择上传的文件", "-1"); exit(); } if (!preg_match("#^text#", $uploadfile_type)) { - ShowMsg(Lang("dialog_template_err_upload"), "-1"); + ShowMsg("您上传的不是文本类型附件", "-1"); exit(); } if (!preg_match("#\.(".$cfg_txttype.")#i", $uploadfile_name)) { - ShowMsg(Lang("dialog_template_err_format"), "-1"); + ShowMsg("您所上传的模板文件类型不能被识别，只允许htm、html、tpl、txt扩展名", "-1"); exit(); } if ($filename =='') { @@ -30,12 +30,12 @@ if ($filename =='') { } $filename = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $filename)); if ($filename == '' || !preg_match("#\.(".$cfg_txttype.")#i", $filename)) { - ShowMsg(Lang("dialog_template_err_ftype"), "-1"); + ShowMsg("您所上传的文件存在问题，请检查文件类型是否适合", "-1"); exit(); } $fullfilename = $cfg_basedir.$activepath."/".$filename; -move_uploaded_file($uploadfile, $fullfilename) or die(Lang('media_err_upload',array('filename'=>$fullfilename))); +move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($uploadfile); -ShowMsg(Lang("dialog_soft_success_upload"), "select_templets.php?comeback=".urlencode($filename)."&f=$f&activepath=".urlencode($activepath)."&d=".time()); +ShowMsg("成功上传文件", "select_templets.php?comeback=".urlencode($filename)."&f=$f&activepath=".urlencode($activepath)."&d=".time()); exit(); ?> \ No newline at end of file diff --git a/src/admin/diy_add.php b/src/admin/diy_add.php index 7c5da2e8..5c4baaa5 100644 --- a/src/admin/diy_add.php +++ b/src/admin/diy_add.php @@ -9,30 +9,29 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -use DedeBIZ\Login\UserLogin; -UserLogin::CheckPurview('c_New'); +CheckPurview('c_New'); $mysql_version = $dsql->GetVersion(); $mysql_versions = explode(".", trim($mysql_version)); $mysql_version = $mysql_versions[0].".".$mysql_versions[1]; if (empty($action)) { - $row = $dsql->GetOne("SELECT diyid FROM `#@__diyforms` ORDER BY diyid DESC LIMIT 0,1 "); + $row = $dsql->GetOne("SELECT diyid FROM #@__diyforms ORDER BY diyid DESC LIMIT 0,1 "); if (is_array($row)) $newdiyid = $row['diyid'] + 1; else $newdiyid = 1; include(DEDEADMIN."/templets/diy_add.htm"); } else { if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) { - ShowMsg(Lang("diy_err_id_check"), "-1"); + ShowMsg("'自定义表单diyid'必须为数字", "-1"); exit(); } if ($table == "") { - ShowMsg(Lang("diy_err_table_check"), "-1"); + ShowMsg("表名不能为空", "-1"); exit(); } $public = isset($public) && is_numeric($public) ? $public : 0; $name = dede_htmlspecialchars($name); - $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' OR `table` LIKE '$table' OR name LIKE '$name'"); + $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' OR `table` LIKE '$table' OR name LIKE '$name' "); if (is_array($row)) { - ShowMsg(Lang("diy_err_diyid_exists"), "-1"); + ShowMsg("可能自定义表单的‘diyid’、‘名称’在数据库中已存在，不能重复使用", "-1"); exit(); } if ($cfg_dbtype=="sqlite") { @@ -45,7 +44,7 @@ if (empty($action)) { while ($row = $dsql->GetArray("biz")) { if (empty($row[0])) $row[0] = ''; if ($table == $row[0]) { - showmsg(Lang('diy_err_table_exists'), '-1'); + showmsg('指定的表在数据库中重复', '-1'); exit(); } } @@ -59,11 +58,11 @@ if (empty($action)) { $sql .= " PRIMARY KEY (`id`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; "; } if ($dsql->ExecuteNoneQuery($sql)) { - $query = "INSERT INTO `#@__diyforms` (`diyid`, `name`, `table`, `info`, `listtemplate`, `viewtemplate`, `posttemplate`, `public` ) VALUES ('$diyid', '$name', '$table', '', '$listtemplate', '$viewtemplate', '$posttemplate', '$public')"; + $query = "INSERT INTO `#@__diyforms` (`diyid`,`name`,`table`,`info`,`listtemplate`,`viewtemplate`,`posttemplate`,`public` ) VALUES ('$diyid','$name','$table','','$listtemplate','$viewtemplate','$posttemplate','$public')"; $dsql->ExecuteNoneQuery($query); - showmsg(Lang('diy_add_success'), 'diy_main.php'); + showmsg('自定义表单创建成功，请自行添加字段', 'diy_main.php'); } else { - showmsg(Lang('diy_err_add'), '-1'); + showmsg('自定义表单创建失败', '-1'); } } ?> \ No newline at end of file diff --git a/src/admin/diy_edit.php b/src/admin/diy_edit.php index 1641c35f..25da1f4d 100644 --- a/src/admin/diy_edit.php +++ b/src/admin/diy_edit.php @@ -8,53 +8,63 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_Edit'); +CheckPurview('c_Edit'); +require_once(DEDEINC."/dedetag.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ""; $diyid = (empty($diyid) ? 0 : intval($diyid)); +/*---------------- +function __SaveEdit() +-----------------*/ if ($dopost == "save") { $public = isset($public) && is_numeric($public) ? $public : 0; $name = dede_htmlspecialchars($name); - $query = "UPDATE `#@__diyforms` SET name='$name',listtemplate='$listtemplate',viewtemplate='$viewtemplate',posttemplate='$posttemplate',public='$public' WHERE diyid='$diyid'"; + $query = "UPDATE `#@__diyforms` SET name = '$name', listtemplate='$listtemplate', viewtemplate='$viewtemplate', posttemplate='$posttemplate', public='$public' WHERE diyid='$diyid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("diy_success_edit"), "diy_main.php"); + ShowMsg("成功修改一个自定义表单", "diy_main.php"); exit(); } +/*---------------- +function __Delete() +-----------------*/ else if ($dopost == "delete") { @set_time_limit(0); - UserLogin::CheckPurview('c_Del'); + CheckPurview('c_Del'); $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); if (empty($job)) $job = ""; //确认提示 if ($job == "") { - $wintitle = Lang('diy_main')."-".Lang('diy_delete'); - $wecome_info = "".Lang('diy_main')."::".Lang('diy_delete'); - DedeWin::Instance()->Init("diy_edit.php", "js/blank.js", "POST") - ->AddHidden("job", "yes") - ->AddHidden("dopost", $dopost) - ->AddHidden("diyid", $diyid) - ->AddTitle(Lang("diy_delete_title",array("name"=>$row['name']))) - ->GetWindow("ok") - ->Display(); + $wintitle = "自定义表单管理-删除自定义表单"; + $wecome_info = "自定义表单管理::删除自定义表单"; + $win = new OxWindow(); + $win->Init("diy_edit.php", "js/blank.js", "POST"); + $win->AddHidden("job", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("diyid", $diyid); + $win->AddTitle("将删除所有与该自定义表单相关的文件和数据
您确定要删除 \"".$row['name']."\" 这个自定义表单？"); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } //操作 else if ($job == "yes") { - $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'", PDO::FETCH_ASSOC); + $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'", MYSQL_ASSOC); if (!is_array($row)) { - ShowMsg(Lang("diy_err_not_exists"), "-1"); + ShowMsg("您所指定的自定义表单信息不存在!", "-1"); exit(); } //删除表 $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$row['table']}`;"); //删除频道配置信息 $dsql->ExecuteNoneQuery("DELETE FROM `#@__diyforms` WHERE diyid='$diyid'"); - ShowMsg(Lang("diy_success_delete"), "diy_main.php"); + ShowMsg("成功删除一个自定义表单", "diy_main.php"); exit(); } } +/*---------------- +function edit() +-----------------*/ $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); include DEDEADMIN."/templets/diy_edit.htm"; ?> \ No newline at end of file diff --git a/src/admin/diy_field_add.php b/src/admin/diy_field_add.php index 891b14c8..8ea13642 100644 --- a/src/admin/diy_field_add.php +++ b/src/admin/diy_field_add.php @@ -8,7 +8,6 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); //增加权限检查 require_once(DEDEADMIN.'/inc/inc_admin_channel.php'); @@ -16,11 +15,15 @@ if (empty($action)) $action = ''; $mysql_version = $dsql->GetVersion(); $mysql_versions = explode(".", trim($mysql_version)); $mysql_version = $mysql_versions[0].".".$mysql_versions[1]; +/*---------------------- +function Save() +---------------------*/ if ($action == 'save') { //模型信息 $fieldname = strtolower($fieldname); $row = $dsql->GetOne("SELECT `table`,`info` FROM `#@__diyforms` WHERE diyid='$diyid'"); $fieldset = stripslashes($row['info']); + require_once(DEDEINC."/dedetag.class.php"); $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource($fieldset); @@ -36,7 +39,7 @@ if ($action == 'save') { $rs = $dsql->ExecuteNoneQuery(" ALTER TABLE `$trueTable` ADD $ntabsql "); if (!$rs) { $gerr = $dsql->GetError(); - ShowMsg(Lang("mychannel_field_err_add",array("err"=>$gerr)), "javascript:;"); + ShowMsg("增加字段失败，错误提示为：".$gerr, "javascript:;"); exit(); } $ok = FALSE; @@ -57,17 +60,20 @@ if ($action == 'save') { } $addlist = GetAddFieldList($dtp, $oksetting); $oksetting = addslashes($oksetting); - $rs = $dsql->ExecuteNoneQuery("Update #@__diyforms set `info`='$oksetting' where diyid='$diyid'"); + $rs = $dsql->ExecuteNoneQuery("Update #@__diyforms set `info`='$oksetting' where diyid='$diyid' "); if (!$rs) { $grr = $dsql->GetError(); - ShowMsg(Lang('mychannel_field_err_savenode',array('err'=>$grr)), "javascript:;"); + ShowMsg("保存节点配置出错".$grr, "javascript:;"); exit(); } - ShowMsg(Lang("mychannel_field_add_success"), "diy_edit.php?diyid=$diyid"); + ShowMsg("成功增加一个字段", "diy_edit.php?diyid=$diyid"); exit(); } //检测模型相关信息，并初始化相关数据 -$row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'"); +/*---------------------- +function ShowPage() +---------------------*/ +$row = $dsql->GetOne("SELECT `table` FROM #@__diyforms WHERE diyid='$diyid'"); $trueTable = $row['table']; $tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`( `id` int(10) unsigned NOT NULL auto_increment, @@ -83,7 +89,7 @@ $dsql->ExecuteNoneQuery($tabsql); $fields = array(); $rs = $dsql->SetQuery("show fields from `$trueTable`"); $dsql->Execute('a'); -while ($nrow = $dsql->GetArray('a', PDO::FETCH_ASSOC)) { +while ($nrow = $dsql->GetArray('a', MYSQL_ASSOC)) { $fields[strtolower($nrow['Field'])] = 1; } $f = ''; diff --git a/src/admin/diy_field_edit.php b/src/admin/diy_field_edit.php index fccdb285..eb88356c 100644 --- a/src/admin/diy_field_edit.php +++ b/src/admin/diy_field_edit.php @@ -8,9 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); //增加权限检查 +require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEADMIN."/inc/inc_admin_channel.php"); if (empty($action)) $action = ''; //获取模型信息 @@ -33,9 +33,12 @@ foreach ($ds as $d) { $fieldtypes[$dds[0]] = $dds[1]; } //保存修改 +/*-------------------- +function _SAVE() +----------------------*/ if ($action == 'save') { if (!isset($fieldtypes[$dtype])) { - ShowMsg(Lang("mychannel_field_err_edit"), "-1"); + ShowMsg("您修改的是系统专用类型的数据，禁止操作", "-1"); exit(); } //检测数据库是否存在附加表，不存在则新建一个 @@ -53,7 +56,7 @@ if ($action == 'save') { $fields = array(); $rs = $dsql->SetQuery("show fields from `$trueTable`"); $dsql->Execute('a'); - while ($nrow = $dsql->GetArray('a', PDO::FETCH_ASSOC)) { + while ($nrow = $dsql->GetArray('a', MYSQL_ASSOC)) { $fields[strtolower($nrow['Field'])] = $nrow['Type']; } //修改字段配置信息 @@ -84,11 +87,14 @@ if ($action == 'save') { } $oksetting = $dtp->GetResultNP(); $oksetting = addslashes($oksetting); - $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET info='$oksetting' WHERE diyid='$diyid'"); - ShowMsg(Lang("mychannel_field_success_edit"), "diy_edit.php?diyid={$diyid}"); + $dsql->ExecuteNoneQuery("UPDATE #@__diyforms SET info='$oksetting' WHERE diyid='$diyid' "); + ShowMsg("成功修改一个字段的配置", "diy_edit.php?diyid={$diyid}"); exit(); } -//删除字段 +/*------------------ +删除字段 +function _DELETE() +-------------------*/ else if ($action == "delete") { //检测旧数据类型，并替换为新配置 foreach ($dtp->CTags as $tagid => $ctag) { @@ -97,9 +103,9 @@ else if ($action == "delete") { } } $oksetting = addslashes($dtp->GetResultNP()); - $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET info='$oksetting' WHERE diyid='$diyid'"); - $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname`"); - ShowMsg(Lang("mychannel_field_delete_success"), "diy_edit.php?diyid=$diyid"); + $dsql->ExecuteNoneQuery("UPDATE #@__diyforms SET info='$oksetting' WHERE diyid='$diyid' "); + $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` "); + ShowMsg("成功删除一个字段", "diy_edit.php?diyid=$diyid"); exit(); } require_once(DEDEADMIN."/templets/diy_field_edit.htm"); diff --git a/src/admin/diy_list.php b/src/admin/diy_list.php index 7891972f..cf0ca645 100644 --- a/src/admin/diy_list.php +++ b/src/admin/diy_list.php @@ -8,18 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\DiyForm; -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_New'); +CheckPurview('c_New'); $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0; $action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete','excel')) ? $action : ''; if (empty($diyid)) { - showMsg(Lang("illegal_operation"), 'javascript:;'); + showMsg("非法操作", 'javascript:;'); exit(); } -$diy = new DiyForm($diyid); +require_once DEDEINC.'/diyform.class.php'; +$diy = new diyform($diyid); if ($action == 'post') { if (empty($do)) { $postform = $diy->getForm('post', '', 'admin'); @@ -29,13 +27,13 @@ if ($action == 'post') { $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash); if (!empty($dede_fields)) { if ($dede_fieldshash != md5($dede_fields.$cfg_cookie_encode)) { - showMsg(Lang("diy_err_checkdata"), '-1'); + showMsg("数据校验不对，程序返回", '-1'); exit(); } } $diyform = $dsql->getOne("SELECT * FROM `#@__diyforms` WHERE diyid=$diyid"); if (!is_array($diyform)) { - showmsg(Lang("diy_err_not_exists"), '-1'); + showmsg("自定义表单不存在", '-1'); exit(); } $addvar = $addvalue = ''; @@ -59,15 +57,16 @@ if ($action == 'post') { } } } - $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue)"; + $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue)"; if ($dsql->ExecuteNoneQuery($query)) { $goto = "diy_list.php?action=list&diyid={$diy->diyid}"; - showmsg(Lang('diy_success_send'), $goto); + showmsg('发布成功', $goto); } else { - showmsg(Lang('diy_err_send'), '-1'); + showmsg('对不起，发布不成功', '-1'); } } } else if ($action == 'list') { + include_once DEDEINC.'/datalistcp.class.php'; $query = "SELECT * FROM {$diy->table} ORDER BY id DESC"; $datalist = new DataListCP(); $datalist->pagesize = 30; @@ -81,13 +80,13 @@ if ($action == 'post') { if (empty($do)) { $id = isset($id) && is_numeric($id) ? $id : 0; if (empty($id)) { - showMsg(Lang('diy_err_no_select'), 'javascript:;'); + showMsg('非法操作未指定id', 'javascript:;'); exit(); } $query = "SELECT * FROM {$diy->table} WHERE id=$id"; $row = $dsql->GetOne($query); if (!is_array($row)) { - showmsg(Lang("diy_err_not_exists"), '-1'); + showmsg("您访问的记录不存在或未经审核", '-1'); exit(); } $postform = $diy->getForm('edit', $row, 'admin'); @@ -100,7 +99,7 @@ if ($action == 'post') { $diyform = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid=$diyid"); $diyco = $dsql->GetOne("SELECT * FROM `$diy->table` WHERE id='$id'"); if (!is_array($diyform)) { - showmsg(Lang("diy_err_not_exists"), '-1'); + showmsg("自定义表单不存在", '-1'); exit(); } $addsql = ''; @@ -129,50 +128,50 @@ if ($action == 'post') { $query = "UPDATE `$diy->table` SET $addsql WHERE id=$id"; if ($dsql->ExecuteNoneQuery($query)) { $goto = "diy_list.php?action=list&diyid={$diy->diyid}"; - showmsg(Lang('operation_successful'), $goto); + showmsg('编辑成功', $goto); } else { - showmsg(Lang('operation_successful'), '-1'); + showmsg('编辑成功', '-1'); } } } elseif ($action == 'check') { if (is_array($id) && is_all_numeric($id)) { $ids = implode(',', $id); } else { - showmsg(Lang('diy_err_no_select'), '-1'); + showmsg('未选中要操作的内容', '-1'); exit(); } $query = "UPDATE `$diy->table` SET ifcheck=1 WHERE id IN ($ids)"; if ($dsql->ExecuteNoneQuery($query)) { - showmsg(Lang('operation_successful'), "diy_list.php?action=list&diyid={$diy->diyid}"); + showmsg('审核成功', "diy_list.php?action=list&diyid={$diy->diyid}"); } else { - showmsg(Lang('operation_failed'), "diy_list.php?action=list&diyid={$diy->diyid}"); + showmsg('审核失败', "diy_list.php?action=list&diyid={$diy->diyid}"); } } elseif ($action == 'delete') { if (empty($do)) { if (is_array($id)) { $ids = implode(',', $id); } else { - showmsg(Lang('diy_err_no_select'), '-1'); + showmsg('未选中要操作的内容', '-1'); exit(); } $query = "DELETE FROM `$diy->table` WHERE id IN ($ids)"; if ($dsql->ExecuteNoneQuery($query)) { - showmsg(Lang('operation_successful'), "diy_list.php?action=list&diyid={$diy->diyid}"); + showmsg('删除成功', "diy_list.php?action=list&diyid={$diy->diyid}"); } else { - showmsg(Lang('operation_failed'), "diy_list.php?action=list&diyid={$diy->diyid}"); + showmsg('删除失败', "diy_list.php?action=list&diyid={$diy->diyid}"); } } else if ($do = 1) { $row = $dsql->GetOne("SELECT * FROM `$diy->table` WHERE id='$id'"); if (file_exists($cfg_basedir.$row[$name])) { unlink($cfg_basedir.$row[$name]); $dsql->ExecuteNoneQuery("UPDATE `$diy->table` SET $name='' WHERE id='$id'"); - showmsg(Lang('operation_successful'), "diy_list.php?action=list&diyid={$diy->diyid}"); + showmsg('文件删除成功', "diy_list.php?action=list&diyid={$diy->diyid}"); } else { - showmsg(Lang('diy_err_file_notexists'), '-1'); + showmsg('文件不存在', '-1'); } } } -elseif ($action == 'excel') { +elseif($action == 'excel') { ob_end_clean();//清除缓冲区,避免乱码 header("Content-type:application/vnd.ms-excel"); header("Content-Disposition:attachment;filename={$diy->name}_".date("Y-m-d").".xls"); @@ -183,7 +182,7 @@ elseif ($action == 'excel') { { echo ""; } - echo ""; + echo ""; echo ""; $sql = "SELECT * FROM {$diy->table} ORDER BY id DESC"; $dsql->SetQuery($sql); @@ -195,12 +194,12 @@ elseif ($action == 'excel') { { echo ""; } - $status = $arr['ifcheck'] == 1 ? Lang('reviewed') : Lang('not_approved'); + $status = $arr['ifcheck'] == 1 ? '已审核' : '未审核'; echo ""; echo ""; } echo "
- ： - ： - + 上传： + 改名： +
选择文件文件大小修改时间
".Lang('parent_directory')."".Lang('current_directory')."：$activepath上级目录当前目录：$activepath
$file$file
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
$file$file $filesize KB $filetime
{$fielddata[0]}".Lang('status')."状态
".$arr[$key]."".$status."
"; } else { - showmsg(Lang("illegal_operation"), "-1"); + showmsg('未定义操作', "-1"); } ?> \ No newline at end of file diff --git a/src/admin/diy_main.php b/src/admin/diy_main.php index 1dafedeb..e90166c8 100644 --- a/src/admin/diy_main.php +++ b/src/admin/diy_main.php @@ -8,13 +8,12 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_List'); +CheckPurview('c_List'); +require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEINC."/common.func.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); -$sql = "SELECT `diyid`,`name`,`table` FROM `#@__diyforms` ORDER BY diyid ASC"; +$sql = "Select `diyid`,`name`,`table` From #@__diyforms order by diyid asc"; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN."/templets/diy_main.htm"); $dlist->SetSource($sql); diff --git a/src/admin/erraddsave.php b/src/admin/erraddsave.php index 989e3131..870378fe 100644 --- a/src/admin/erraddsave.php +++ b/src/admin/erraddsave.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\libraries\DedeWin; require_once(dirname(__FILE__).'/config.php'); +require_once(DEDEINC.'/datalistcp.class.php'); require_once(DEDEINC.'/common.func.php'); if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; @@ -18,7 +17,7 @@ function username($mid) { global $dsql; if (!isset($mid) || empty($mid)) { - return Lang("tourist"); + return "游客"; exit(); } else { $sql = "SELECT uname FROM `#@__member` WHERE `mid` = '$mid'"; @@ -32,34 +31,34 @@ function typename($me) { switch ($me) { case $me == 1: - return $me = Lang("erraddsave_type_1"); + return $me = "错别字"; break; case $me == 2: - return $me = Lang("erraddsave_type_2"); + return $me = "成语运用不当"; break; case $me == 3: - return $me = Lang("erraddsave_type_3"); + return $me = "专业术语写法不规则"; break; case $me == 4: - return $me = Lang("erraddsave_type_4"); + return $me = "产品与图片不符"; break; case $me == 5: - return $me = Lang("erraddsave_type_5"); + return $me = "事实年代以及内容错误"; break; case $me == 6: - return $me = Lang("erraddsave_type_6"); + return $me = "事实年代以及内容错误"; break; case $me == 7: - return $me = Lang("erraddsave_type_7"); + return $me = "其他错误"; break; default: - return $me = Lang("erraddsave_type_unknow"); + return $me = "未知错误"; break; } } if ($dopost == "delete") { if ($id == '') { - ShowMsg(Lang("invalid_parameter"), "-1"); + ShowMsg("参数无效", "-1"); exit(); } if ($fmdo == 'yes') { @@ -68,23 +67,25 @@ if ($dopost == "delete") { $query = "DELETE FROM `#@__erradd` WHERE `id` = '$var'"; $dsql->ExecuteNoneQuery($query); } - ShowMsg(Lang("content_delete_success"), "erraddsave.php"); + ShowMsg("成功删除指定的文档", "erraddsave.php"); exit(); } else { - $wintitle = Lang("delete"); - $wecome_info = "".Lang('erraddsave')."::".Lang('erraddsave_delete'); - DedeWin::Instance()->Init("erraddsave.php", "js/blank.js", "POST") - ->AddHidden("fmdo", "yes") - ->AddHidden("dopost", $dopost) - ->AddHidden("id", $id) - ->AddTitle(Lang('content_delete_confirm',array('qstr'=>$id))) - ->GetWindow("ok") - ->Display(); + require_once(DEDEINC."/libraries/oxwindow.class.php"); + $wintitle = "删除"; + $wecome_info = "错误管理::删除错误"; + $win = new OxWindow(); + $win->Init("erraddsave.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("id", $id); + $win->AddTitle("您确定要删除“ $id ”这些错误提示"); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } exit(); } -$sql = "SELECT * FROM `#@__erradd` ORDER BY id DESC"; +$sql = "SELECT * FROM `#@__erradd` ORDER BY id desc"; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN."/templets/erradd.htm"); $dlist->SetSource($sql); diff --git a/src/admin/exit.php b/src/admin/exit.php index 5d89a032..ffe609e4 100644 --- a/src/admin/exit.php +++ b/src/admin/exit.php @@ -8,15 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/../system/common.inc.php'); -$cUserLogin = new UserLogin(); -$cUserLogin->exitUser(); +require_once(DEDEINC.'/userlogin.class.php'); +$cuserLogin = new userLogin(); +$cuserLogin->exitUser(); if (empty($needclose)) { header('location:index.php'); } else { $msg = ""; echo $msg; diff --git a/src/admin/feedback_edit.php b/src/admin/feedback_edit.php index a59e9db5..da3cb39b 100644 --- a/src/admin/feedback_edit.php +++ b/src/admin/feedback_edit.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Feedback'); +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 = ""; @@ -23,18 +22,18 @@ if ($dopost == 'edit') { $adminmsg = str_replace(">", ">", $adminmsg); $adminmsg = str_replace(" ", "  ", $adminmsg); $adminmsg = str_replace("\r\n", "
\n", $adminmsg); - $msg = $msg."
\n"."".Lang('feedback_admin')."：$adminmsg\n"; + $msg = $msg."
\n"."管理员回复：$adminmsg\n"; } $query = "UPDATE `#@__feedback` SET username='$username',msg='$msg',ischeck=1 WHERE id=$id"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("feedback_success_edit"), $ENV_GOBACK_URL); + ShowMsg("成功回复一则留言", $ENV_GOBACK_URL); exit(); } elseif ($dopost === 'makehtml') { require_once(DEDEADMIN.'/inc/inc_archives_functions.php'); $query = "SELECT * FROM `#@__feedback` WHERE id=$id"; $row = $dsql->GetOne($query); MakeArt($row['aid']); - ShowMsg(Lang("feedback_success_makehtml"), $ENV_GOBACK_URL); + ShowMsg("成功更新评论所在的文档内容", $ENV_GOBACK_URL); exit(); } $query = "SELECT * FROM `#@__feedback` WHERE id=$id"; diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php index 4af0ef0e..c2f45a7c 100644 --- a/src/admin/feedback_main.php +++ b/src/admin/feedback_main.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\TypeLink\TypeLink; require_once(dirname(__FILE__)."/config.php"); //权限检查 -UserLogin::CheckPurview('sys_Feedback'); +CheckPurview('sys_Feedback'); +require_once(DEDEINC."/datalistcp.class.php"); +require_once(DEDEINC."/typelink/typelink.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); function IsCheck($st) { - return $st == 1 ? "[".Lang('reviewed')."]" : "[".Lang('not_approved')."]"; + return $st == 1 ? "[已审核]" : "[未审核]"; } function jsTrimjajx($str, $len) { @@ -32,7 +31,7 @@ function jsTrimjajx($str, $len) if (!empty($job)) { $ids = preg_replace("#[^0-9,]#", '', $fid); if (empty($ids)) { - ShowMsg(Lang('feedback_noselect'), $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("您没选中任何选项", $_COOKIE['ENV_GOBACK_URL'], 0, 500); exit; } } else { @@ -49,28 +48,28 @@ function UpdateReplycount($id) if ($job == 'del') { $query = "DELETE FROM `#@__feedback` WHERE id IN($ids) "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang('feedback_success_delete'), $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("成功删除指定的评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500); exit(); } //删除相同IP的所有评论 else if ($job == 'delall') { - $dsql->SetQuery("SELECT ip FROM `#@__feedback` WHERE id IN ($ids)"); + $dsql->SetQuery("SELECT ip FROM `#@__feedback` WHERE id IN ($ids) "); $dsql->Execute(); $ips = ''; while ($row = $dsql->GetArray()) { - $ips .= ($ips == '' ? " ip = '{$row['ip']}' " : " Or ip = '{$row['ip']}'"); + $ips .= ($ips == '' ? " ip = '{$row['ip']}' " : " Or ip = '{$row['ip']}' "); } if ($ips != '') { $query = "DELETE FROM `#@__feedback` WHERE $ips "; $dsql->ExecuteNoneQuery($query); } - ShowMsg(Lang('feedback_success_delete'), $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("成功删除指定相同IP的所有评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500); exit(); } //审核评论 else if ($job == 'check') { - $query = "UPDATE `#@__feedback` SET ischeck=1 WHERE id IN($ids)"; + $query = "UPDATE `#@__feedback` SET ischeck=1 WHERE id IN($ids) "; $dsql->ExecuteNoneQuery($query); $dquery = "SELECT * FROM `#@__feedback` WHERE id IN($ids)"; @@ -79,7 +78,7 @@ else if ($job == 'check') { while ($row = $dsql->GetArray()) { UpdateReplycount($row['fid']); } - ShowMsg(Lang('feedback_success_check'), $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("成功审核指定评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500); exit(); } //浏览评论 diff --git a/src/admin/file_class.php b/src/admin/file_class.php index acc6163a..8c85ab12 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -1,4 +1,5 @@ baseDir.$this->activeDir."/".$newname; $oldext = pathinfo($oldname)['extension']; $newext = pathinfo($newname)['extension']; + if ($oldext != $newext) { if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) { - ShowMsg(Lang("media_ext_forbidden"), "javascript:;"); + ShowMsg("您指定的文件名被系统禁止", "javascript:;"); exit(); } } @@ -38,7 +41,7 @@ class FileManagement if (($newname != $oldname) && is_writable($oldname)) { rename($oldname, $newname); } - ShowMsg(Lang("file_success_rename"), "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("成功修改一个文件名", "file_manage_main.php?activepath=".$this->activeDir); return 0; } //创建新目录 @@ -49,10 +52,10 @@ class FileManagement if (is_writable($this->baseDir.$this->activeDir)) { MkdirAll($dirname, $GLOBALS['cfg_dir_purview']); CloseFtp(); - ShowMsg(Lang("file_success_newdir"), "file_manage_main.php?activepath=".$this->activeDir."/".$newdir); + ShowMsg("成功创建一个新目录", "file_manage_main.php?activepath=".$this->activeDir."/".$newdir); return 1; } else { - ShowMsg(Lang("file_err_newdir"), "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("创建新目录失败，因为这个位置不允许写入", "file_manage_main.php?activepath=".$this->activeDir); return 0; } } @@ -83,14 +86,14 @@ class FileManagement copy($oldfile, $truepath."/$mfile"); } unlink($oldfile); - ShowMsg(Lang("file_success_move"), "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath", 0, 1000); return 1; } else { - ShowMsg(Lang('file_err_move',array('oldfile'=>$oldfile,'truepath'=>$truepath,'mfile'=>$mfile)), "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("移动文件 $oldfile > $truepath/$mfile 失败，可能是某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000); return 0; } } else { - ShowMsg(Lang("file_err_path"), "-1", 0, 5000); + ShowMsg("对不起，您移动的路径不合法", "-1", 0, 5000); return 0; } } @@ -99,7 +102,7 @@ class FileManagement * * @param unknown_type $indir */ - function RmDirFiles($indir='') + function RmDirFiles($indir) { if (!is_dir($indir)) { return; @@ -124,7 +127,7 @@ class FileManagement * @param unknown_type $fileexp * @param unknown_type $filearr */ - function GetMatchFiles($indir='', $fileexp='', &$filearr) + function GetMatchFiles($indir, $fileexp, &$filearr) { $dh = dir($indir); while ($filename = $dh->read()) { @@ -150,18 +153,18 @@ class FileManagement $filename = $this->baseDir.$this->activeDir."/$filename"; if (is_file($filename)) { @unlink($filename); - $t = Lang("file"); + $t = "文件"; } else { - $t = Lang("dir"); + $t = "目录"; if ($this->allowDeleteDir == 1) { $this->RmDirFiles($filename); } else { //完善用户体验，by:sumic - ShowMsg(Lang("file_err_delete").$t, "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("系统禁止删除".$t."", "file_manage_main.php?activepath=".$this->activeDir); exit; } } - ShowMsg(Lang("file_success_delete").$t, "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("成功删除一个".$t."", "file_manage_main.php?activepath=".$this->activeDir); return 0; } } diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index 69ee4055..c909a976 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -8,41 +8,55 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_文件管理器'); +CheckPurview('plus_文件管理器'); +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 == "") $inpath = $cfg_basedir; else $inpath = $cfg_basedir.$activepath; -//显示控制层 +//文件管理器交互与逻辑控制文件 $fmm = new FileManagement(); $fmm->Init(); +/*--------------- +function __rename(); +----------------*/ if ($fmdo == "rename") { $fmm->RenameFile($oldfilename, $newfilename); } //新建目录 +/*--------------- +function __newdir(); +----------------*/ else if ($fmdo == "newdir") { CheckCSRF(); $fmm->NewDir($newpath); } //移动文件 +/*--------------- +function __move(); +----------------*/ else if ($fmdo == "move") { $fmm->MoveFile($filename, $newpath); } //删除文件 +/*--------------- +function __delfile(); +----------------*/ else if ($fmdo == "del") { $fmm->DeleteFile($filename); } //文件编辑 +/*--------------- +function __saveEdit(); +----------------*/ else if ($fmdo == "edit") { CheckCSRF(); $filename = str_replace("..", "", $filename); if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) { - ShowMsg(Lang("media_ext_forbidden"), "javascript:;"); + ShowMsg("您指定的文件名被系统禁止", "javascript:;"); exit(); } $file = "$cfg_basedir$activepath/$filename"; @@ -51,16 +65,16 @@ else if ($fmdo == "edit") { fputs($fp, $str); fclose($fp); if (empty($backurl)) { - ShowMsg(Lang("file_success_edit_one"), "file_manage_main.php?activepath=$activepath"); + ShowMsg("成功保存一个文件", "file_manage_main.php?activepath=$activepath"); } else { - ShowMsg(Lang("file_success_edit"), $backurl); + ShowMsg("成功保存文件", $backurl); } exit(); } /* 文件编辑，可视化模式 function __saveEditView(); -else if ($fmdo=="editview") +else if($fmdo=="editview") { $filename = str_replace("..","",$filename); $file = "$cfg_basedir$activepath/$filename"; @@ -69,7 +83,7 @@ else if ($fmdo=="editview") $fp = fopen($file,"w"); fputs($fp,$str); fclose($fp); - if (empty($backurl)) + if(empty($backurl)) { $backurl = "file_manage_main.php?activepath=$activepath"; } @@ -78,6 +92,9 @@ else if ($fmdo=="editview") } */ //文件上传 +/*--------------- +function __upload(); +----------------*/ else if ($fmdo == "upload") { $j = 0; for ($i = 1; $i <= 50; $i++) { @@ -92,11 +109,11 @@ else if ($fmdo == "upload") { //检查文件类型 $mime = get_mime_type($upfile); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } if (!file_exists($cfg_basedir.$activepath."/".$upfile_name)) { @@ -106,27 +123,30 @@ else if ($fmdo == "upload") { $j++; } } - ShowMsg(Lang('file_success_upload',array('j'=>$j,'activepath'=>$activepath)), "file_manage_main.php?activepath=$activepath"); + ShowMsg("成功上传 $j 个文件到: $activepath", "file_manage_main.php?activepath=$activepath"); exit(); } //空间检查 else if ($fmdo == "space") { if ($activepath == "") { - $ecpath = Lang("file_alldir"); + $ecpath = "所有目录"; } else { $ecpath = $activepath; } - $titleinfo = Lang('dir')."[$ecpath]".Lang('file_spaceinfo')."：
"; - $wintitle = Lang("file_manage"); - $wecome_info = Lang('file_manage')."::".Lang('file_sizecheck')." [".Lang('file_manage')."]"; + $titleinfo = "目录[$ecpath]空间使用状况：
"; + $wintitle = "文件管理"; + $wecome_info = "文件管理::空间大小检查 [文件浏览器]"; $activepath = $cfg_basedir.$activepath; $space = new SpaceUse; $space->checksize($activepath); $total = $space->totalsize; $totalkb = $space->setkb($total); $totalmb = $space->setmb($total); - DedeWin::Instance()->Init("", "js/blank.js", "POST")->AddTitle($titleinfo) - ->AddMsgItem("$totalmb M
$totalkb KB
$total ".Lang('byte')) - ->GetWindow("")->Display(); + $win = new OxWindow(); + $win->Init("", "js/blank.js", "POST"); + $win->AddTitle($titleinfo); + $win->AddMsgItem("$totalmb M
$totalkb KB
$total 字节"); + $winform = $win->GetWindow(""); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/file_manage_main.php b/src/admin/file_manage_main.php index 587ec310..16aca2f5 100644 --- a/src/admin/file_manage_main.php +++ b/src/admin/file_manage_main.php @@ -8,15 +8,14 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_文件管理器'); +CheckPurview('plus_文件管理器'); if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : $cfg_cmspath; $inpath = ""; $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); if (DEDEBIZ_SAFE_MODE && !preg_match("#^/static#",$activepath)) { - ShowMsg(Lang("file_safemode_static"), -1); + ShowMsg("安全模式下仅允许查看编辑static目录内容", -1); exit; } if ($activepath == "/") $activepath = ""; diff --git a/src/admin/file_manage_view.php b/src/admin/file_manage_view.php index 52180d76..1489f637 100644 --- a/src/admin/file_manage_view.php +++ b/src/admin/file_manage_view.php @@ -8,74 +8,82 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_文件管理器'); +CheckPurview('plus_文件管理器'); +require_once(DEDEINC."/libraries/oxwindow.class.php"); $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); if ($activepath == "/") $activepath = ""; if ($activepath == "") $inpath = $cfg_basedir; else $inpath = $cfg_basedir.$activepath; //显示控制层 +//修改文件名 if ($fmdo == "rename") { - if ($activepath == "") $ndirstring = Lang("root_directory"); + if ($activepath == "") $ndirstring = "根目录"; $ndirstring = $activepath; - $wintitle = Lang("file_manage"); - $wecome_info = Lang("file_manage")."::".Lang('file_rename')." [".Lang("file_manage")."]"; - DedeWin::Instance()->Init("file_manage_control.php", "js/blank.js", "POST") - ->AddHidden("fmdo", $fmdo) - ->AddHidden("activepath", $activepath) - ->AddHidden("filename", $filename) - ->AddTitle(Lang("file_rename_title",array('ndirstring'=>$ndirstring))) - ->AddItem(Lang("file_rename_oldname"), "") - ->AddItem(Lang("file_rename_newname"), "") - ->GetWindow("ok")->Display(); + $wintitle = "文件管理"; + $wecome_info = "文件管理::修改文件名 [文件浏览器]"; + $win = new OxWindow(); + $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", $fmdo); + $win->AddHidden("activepath", $activepath); + $win->AddHidden("filename", $filename); + $win->AddTitle("修改文件名，当前路径：$ndirstring"); + $win->AddItem("旧名称：", ""); + $win->AddItem("新名称：", ""); + $winform = $win->GetWindow("ok"); + $win->Display(); } //新建目录 else if ($fmdo == "newdir") { - if ($activepath == "") $activepathname = Lang("root_directory"); + if ($activepath == "") $activepathname = "根目录"; else $activepathname = $activepath; - $wintitle = Lang("file_manage"); - $wecome_info = Lang("file_manage")."::".Lang('file_rename_newdir')." [".Lang("file_manage")."]"; - DedeWin::Instance()->Init("file_manage_control.php", "js/blank.js", "POST") - ->AddHidden("fmdo", $fmdo) - ->AddHidden("activepath", $activepath) - ->AddHidden("token", make_hash()) - ->AddTitle(Lang("file_rename_newdir_title",array('activepathname'=>$activepathname))) - ->AddItem(Lang('new_directory')."：", "") - ->GetWindow("ok") - ->Display(); + $wintitle = "文件管理"; + $wecome_info = "文件管理::新建目录 [文件浏览器]"; + $win = new OxWindow(); + $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", $fmdo); + $win->AddHidden("activepath", $activepath); + $win->AddHidden("token", make_hash()); + $win->AddTitle("当前目录 $activepathname "); + $win->AddItem("新目录：", ""); + $winform = $win->GetWindow("ok"); + $win->Display(); } //移动文件 else if ($fmdo == "move") { - $wintitle = Lang("file_manage"); - $wecome_info = Lang("file_manage")."::".Lang('file_rename_move')." [".Lang("file_manage")."]"; - DedeWin::Instance()->Init("file_manage_control.php", "js/blank.js", "POST") - ->AddHidden("fmdo", $fmdo) - ->AddHidden("activepath", $activepath) - ->AddHidden("filename", $filename) - ->AddTitle(Lang("file_rename_move_title")) - ->AddItem(Lang("file_rename_move_src"), $filename) - ->AddItem(Lang("file_rename_move_curr"), $activepath) - ->AddItem(Lang("file_rename_move_new"), "") - ->GetWindow("ok") - ->Display(); + $wintitle = "文件管理"; + $wecome_info = "文件管理::移动文件 [文件浏览器]"; + $win = new OxWindow(); + $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", $fmdo); + $win->AddHidden("activepath", $activepath); + $win->AddHidden("filename", $filename); + $win->AddTitle("新位置前面不加'/'表示相对于当前位置，加'/'表示相对于根目录"); + $win->AddItem("被移动文件：", $filename); + $win->AddItem("当前位置：", $activepath); + $win->AddItem("新位置：", ""); + $winform = $win->GetWindow("ok"); + $win->Display(); } //删除文件 else if ($fmdo == "del") { - $wintitle = Lang("file_manage"); - $wecome_info = Lang("file_manage")."::".Lang('file_rename_del')." [".Lang("file_manage")."]"; - $wmsg = Lang('content_delete_confirm',array('qstr'=>$filename)); - DedeWin::Instance()->Init("file_manage_control.php", "js/blank.js", "POST") - ->AddHidden("fmdo", $fmdo) - ->AddHidden("activepath", $activepath) - ->AddHidden("filename", $filename) - ->AddTitle(Lang("file_rename_del_title")) - ->AddMsgItem($wmsg, "50") - ->GetWindow("ok") - ->Display(); + $wintitle = "文件管理"; + $wecome_info = "文件管理::删除文件 [文件浏览器]"; + $win = new OxWindow(); + $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", $fmdo); + $win->AddHidden("activepath", $activepath); + $win->AddHidden("filename", $filename); + if (@is_dir($cfg_basedir.$activepath."/$filename")) { + $wmsg = "您确定要删除目录：$filename 吗"; + } else { + $wmsg = "您确定要删除文件：$filename 吗"; + } + $win->AddTitle("删除文件确认"); + $win->AddMsgItem($wmsg, "50"); + $winform = $win->GetWindow("ok"); + $win->Display(); } //编辑文件 else if ($fmdo == "edit") { @@ -92,7 +100,7 @@ else if ($fmdo == "edit") { fclose($fp); $content = dede_htmlspecialchars($content); } - $contentView = "\r\n"; + $contentView = "\r\n"; $GLOBALS['filename'] = $filename; $path_parts = pathinfo($filename); if ($path_parts['extension'] == 'php') { diff --git a/src/admin/freelist_add.php b/src/admin/freelist_add.php index 6470f516..35c08235 100644 --- a/src/admin/freelist_add.php +++ b/src/admin/freelist_add.php @@ -8,10 +8,10 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_FreeList'); +CheckPurview('c_FreeList'); if (empty($dopost)) { + require_once DEDEINC.'/typelink/typelink.class.php'; include DedeInclude('templets/freelist_add.htm'); exit(); } else if ($dopost == 'save') { @@ -21,7 +21,7 @@ if (empty($dopost)) { $ntype = ''; $edtime = time(); if (empty($channel)) { - showmsg(Lang('freelist_err_channel_isempty'), '-1'); + showmsg('频道类型不能为空', '-1'); exit(); } if (is_array($types)) { @@ -37,10 +37,9 @@ if (empty($dopost)) { if (!empty($innertext)) $innertext = stripslashes($innertext); $listTag = "{dede:list $atts}$innertext{/dede:list}"; $listTag = addslashes($listTag); - $inquery = "INSERT INTO `#@__freelist` (`title`,`namerule`,`listdir`,`defaultpage`,`nodefault`,`templet`,`edtime`, `maxpage`,`click`,`listtag`,`keywords`,`description`) VALUES ('$title','$namerule','$listdir','$defaultpage','$nodefault','$templet','$edtime', '$maxpage','0','$listTag','$keywords','$description'); - "; + $inquery = "INSERT INTO `#@__freelist` (`title`,`namerule` , `listdir`,`defaultpage`,`nodefault`,`templet`,`edtime`, `maxpage`,`click`,`listtag`,`keywords`,`description`) VALUES ('$title','$namerule','$listdir','$defaultpage','$nodefault','$templet','$edtime','$maxpage','0','$listTag','$keywords','$description');"; $dsql->ExecuteNoneQuery($inquery); - ShowMsg(Lang("freelist_add_success"), "freelist_main.php"); + ShowMsg("成功增加一个自由列表", "freelist_main.php"); exit(); } ?> \ No newline at end of file diff --git a/src/admin/freelist_edit.php b/src/admin/freelist_edit.php index 47ba6a7e..8929b339 100644 --- a/src/admin/freelist_edit.php +++ b/src/admin/freelist_edit.php @@ -8,11 +8,12 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); if (empty($dopost)) { + require_once DEDEINC.'/typelink/typelink.class.php'; + require_once DEDEINC.'/dedetag.class.php'; $aid = isset($aid) && is_numeric($aid) ? $aid : 0; - $row = $dsql->GetOne("SELECT * FROM `#@__freelist` WHERE aid='$aid'"); + $row = $dsql->GetOne("Select * From `#@__freelist` where aid='$aid' "); $dtp = new DedeTagParse(); $dtp->SetNameSpace("dede", "{", "}"); $dtp->LoadSource("--".$row['listtag']."--"); @@ -38,9 +39,9 @@ if (empty($dopost)) { if (!empty($innertext)) $innertext = stripslashes($innertext); $listTag = "{dede:list $atts}$innertext{/dede:list}"; $listTag = addslashes($listTag); - $inquery = "UPDATE `#@__freelist` set title='$title',namerule='$namerule',listdir='$listdir',defaultpage='$defaultpage',nodefault='$nodefault',templet='$templet',edtime='$edtime',`maxpage`='$maxpage',listtag='$listTag',keywords='$keywords',description='$description' WHERE aid='$aid';"; + $inquery = "UPDATE `#@__freelist` set title='$title',namerule='$namerule',listdir='$listdir', defaultpage='$defaultpage',nodefault='$nodefault',templet='$templet',edtime='$edtime',`maxpage`='$maxpage',listtag='$listTag',keywords='$keywords',description='$description' WHERE aid='$aid';"; $dsql->ExecuteNoneQuery($inquery); - ShowMsg(Lang("freelist_edit_success"), "freelist_main.php"); + ShowMsg("成功修改一个自由列表", "freelist_main.php"); exit(); } ?> \ No newline at end of file diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 0c0e8934..66c04723 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_FreeList'); -require_once DEDEINC.'/channel/channelunit.func.php'; +CheckPurview('c_FreeList'); +require_once DEDEINC.'/channelunit.func.php'; setcookie("ENV_GOBACK_URL",$dedeNowurl,time()+3600,"/"); -if (empty($pagesize)) $pagesize = 30; -if (empty($pageno)) $pageno = 1; -if (empty($dopost)) $dopost = ''; -if (empty($orderby)) $orderby = 'aid'; -if (empty($keyword)) +if(empty($pagesize)) $pagesize = 30; +if(empty($pageno)) $pageno = 1; +if(empty($dopost)) $dopost = ''; +if(empty($orderby)) $orderby = 'aid'; +if(empty($keyword)) { $keyword = ''; $addget = ''; @@ -27,25 +26,25 @@ if (empty($keyword)) $addsql = " where title like '%$keyword%' "; } //重载列表 -if ($dopost=='getlist') +if($dopost=='getlist') { AjaxHead(); GetTagList($dsql,$pageno,$pagesize,$orderby); exit(); } //删除字段 -else if ($dopost=='del') +else if($dopost=='del') { $aid = preg_replace("#[^0-9]#", "", $aid); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__freelist` WHERE aid='$aid';"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__freelist` WHERE aid='$aid'; "); AjaxHead(); GetTagList($dsql,$pageno,$pagesize,$orderby); exit(); } //第一次进入这个页面 -if ($dopost=='') +if($dopost=='') { - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__freelist` $addsql"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__freelist` $addsql "); $totalRow = $row['dd']; include(DEDEADMIN."/templets/freelist_main.htm"); } @@ -61,39 +60,34 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') { global $cfg_phpurl,$addsql; $start = ($pageno-1) * $pagesize; - $printhead =" - - - - - - - - \r\n"; + $printhead =" + + + + + + + + \r\n"; echo $printhead; - $dsql->SetQuery("SELECT aid,title,templet,click,edtime,namerule,listdir,defaultpage,nodefault FROM `#@__freelist` $addsql ORDER BY $orderby DESC LIMIT $start,$pagesize"); + $dsql->SetQuery("SELECT aid,title,templet,click,edtime,namerule,listdir,defaultpage,nodefault From `#@__freelist` $addsql order by $orderby desc limit $start,$pagesize "); $dsql->Execute(); - $i = 0; while($row = $dsql->GetArray()) { $listurl = GetFreeListUrl($row['aid'],$row['namerule'],$row['listdir'],$row['defaultpage'],$row['nodefault']); - $line = " + $line = " - - "; - $i++; + + "; echo $line; } - if ($i == 0) { - echo ""; - } - echo "
id".Lang('title')."".Lang('template')."".Lang('click')."".Lang('edtime')."".Lang('operation')."
id列表名称模板文件点击创建时间管理
{$row['aid']} {$row['title']} {$row['templet']} {$row['click']} ".MyDate("y-m-d",$row['edtime'])." ".Lang("edit")." - ".Lang("update")." - ".Lang("delete")." -
+ 修改 + 更新 + 删除 +
".Lang('none_result')."
\r\n"; } ?> \ No newline at end of file diff --git a/src/admin/friendlink_add.php b/src/admin/friendlink_add.php index 2f0f218c..0496bd0f 100644 --- a/src/admin/friendlink_add.php +++ b/src/admin/friendlink_add.php @@ -8,14 +8,13 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_友情链接模块'); +CheckPurview('plus_友情链接模块'); if (empty($dopost)) $dopost = ""; if ($dopost == "add") { $dtime = time(); if (is_uploaded_file($logoimg)) { - $names = explode(".", $logoimg_name); + $names = split("\.", $logoimg_name); $shortname = ".".$names[count($names) - 1]; if (!preg_match("#(jpg|gif|png)$#", $shortname)) { $shortname = '.gif'; @@ -29,14 +28,14 @@ if ($dopost == "add") { $imgurl = $imgurl."/".$filename; $mime = get_mime_type($logoimg); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^image#i", $mime)) { - ShowMsg(Lang("media_only_image"), -1); + ShowMsg("非图片格式文件，无法正常上传", -1); exit; } - move_uploaded_file($logoimg, $cfg_basedir.$imgurl) or die(Lang('file_err_copy',array('path'=>$cfg_basedir.$imgurl))); + move_uploaded_file($logoimg, $cfg_basedir.$imgurl) or die("复制文件到:".$cfg_basedir.$imgurl."失败"); @unlink($logoimg); } else { $imgurl = $logo; @@ -44,7 +43,7 @@ if ($dopost == "add") { //强制检测用户友情链接分类是否数据结构不符 if (empty($typeid) || preg_match("#[^0-9]#", $typeid)) { $typeid = 0; - $dsql->ExecuteNoneQuery("ALTER TABLE `#@__flinktype` CHANGE `ID` `id` MEDIUMINT( 8 ) UNSIGNED DEFAULT NULL AUTO_INCREMENT;"); + $dsql->ExecuteNoneQuery("ALTER TABLE `#@__flinktype` CHANGE `ID` `id` MEDIUMINT( 8 ) UNSIGNED DEFAULT NULL AUTO_INCREMENT; "); } $sortrank = isset($sortrank)? intval($sortrank) : 1; $url = isset($url)? HtmlReplace($url, -1) : ''; @@ -54,14 +53,14 @@ if ($dopost == "add") { $email = isset($email)? HtmlReplace($email, -1) : ''; $typeid = isset($typeid)? intval($typeid) : 0; $ischeck = isset($ischeck)? intval($ischeck) : 0; - $query = "INSERT INTO `#@__flink`(sortrank,url,webname,logo,msg,email,typeid,dtime,ischeck) VALUES ('$sortrank','$url','$webname','$imgurl','$msg','$email','$typeid','$dtime','$ischeck');"; + $query = "INSERT INTO `#@__flink` (sortrank,url,webname,logo,msg,email,typeid,dtime,ischeck) VALUES ('$sortrank','$url','$webname','$imgurl','$msg','$email','$typeid','$dtime','$ischeck'); "; $rs = $dsql->ExecuteNoneQuery($query); $burl = empty($_COOKIE['ENV_GOBACK_URL']) ? "friendlink_main.php" : $_COOKIE['ENV_GOBACK_URL']; if ($rs) { - ShowMsg(Lang("friendlink_success_add"), $burl, 0, 500); + ShowMsg("成功增加一个链接", $burl, 0, 500); exit(); } else { - ShowMsg(Lang('friendlink_err_add',array('err'=>$dsql->GetError())), "javascript:;"); + ShowMsg("增加链接时出错，请向官方反馈，原因：".$dsql->GetError(), "javascript:;"); exit(); } } diff --git a/src/admin/friendlink_edit.php b/src/admin/friendlink_edit.php index c38609ff..b8e06a5d 100644 --- a/src/admin/friendlink_edit.php +++ b/src/admin/friendlink_edit.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('plus_友情链接模块'); +CheckPurview('plus_友情链接模块'); $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? 'friendlink_main.php' : $_COOKIE['ENV_GOBACK_URL']; if (empty($dopost)) $dopost = ""; $id = isset($id)? intval($id) : 0; @@ -23,7 +22,7 @@ if (isset($allid)) { } if ($dopost == "delete") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__flink` WHERE id='$id'"); - ShowMsg(Lang("friendlink_success_delete"), $ENV_GOBACK_URL); + ShowMsg("成功删除一个链接", $ENV_GOBACK_URL); exit(); } else if ($dopost == "delall") { $aids = explode(',', $aids); @@ -32,10 +31,10 @@ if ($dopost == "delete") { $aid = intval($aid); $dsql->ExecuteNoneQuery("DELETE FROM `#@__flink` WHERE id='$aid'"); } - ShowMsg(Lang("content_delete_success"), $ENV_GOBACK_URL); + ShowMsg("成功删除指定链接", $ENV_GOBACK_URL); exit(); } else { - ShowMsg(Lang("friendlink_select_none"), $ENV_GOBACK_URL); + ShowMsg("您没选定任何链接", $ENV_GOBACK_URL); exit(); } } else if ($dopost == "saveedit") { @@ -45,21 +44,21 @@ if ($dopost == "delete") { } if (!empty($logoimg)) { if (!is_uploaded_file($logoimg)) { - ShowMsg(Lang("friendlink_err_imglogo_empty",array('file'=>$logoimg)), "-1"); + ShowMsg("您没有选择上传的文件".$logoimg, "-1"); exit(); } $mime = get_mime_type($logoimg); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image)#i", $mime)) { - ShowMsg(Lang("media_only_image"), -1); + ShowMsg("仅支持上传图片文件", -1); exit; } $logoimg_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $logoimg_name)); $fullfilename = DEDEROOT.'static/flink/'.$logoimg_name; - move_uploaded_file($logoimg, $fullfilename) or die(Lang('media_err_upload',array('filename'=>$fullfilename))); + move_uploaded_file($logoimg, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($logoimg); $logo = $cfg_cmspath.'/static/flink/'.$logoimg_name; } @@ -70,9 +69,9 @@ if ($dopost == "delete") { $email = isset($email)? HtmlReplace($email, -1) : ''; $typeid = isset($typeid)? intval($typeid) : 0; $ischeck = isset($ischeck)? intval($ischeck) : 0; - $query = "UPDATE `#@__flink` SET sortrank='$sortrank',url='$url',webname='$webname',logo='$logo',msg='$msg', email='$email',typeid='$typeid',ischeck='$ischeck' WHERE id='$id'"; + $query = "UPDATE `#@__flink` SET sortrank='$sortrank',url='$url',webname='$webname',logo='$logo',msg='$msg', email='$email',typeid='$typeid',ischeck='$ischeck' WHERE id='$id' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("friendlink_success_saveedit"), $ENV_GOBACK_URL); + ShowMsg("成功修改一个链接", $ENV_GOBACK_URL); exit(); } $myLink = $dsql->GetOne("SELECT `#@__flink`.*,`#@__flinktype`.typename FROM `#@__flink` LEFT JOIN `#@__flinktype` ON `#@__flink`.typeid=`#@__flinktype`.id WHERE `#@__flink`.id=$id"); diff --git a/src/admin/friendlink_main.php b/src/admin/friendlink_main.php index 8d564d22..12ac91b6 100644 --- a/src/admin/friendlink_main.php +++ b/src/admin/friendlink_main.php @@ -8,8 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; require_once(dirname(__FILE__).'/config.php'); +require_once(DEDEINC.'/datalistcp.class.php'); setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); if (empty($keyword)) $keyword = ''; if (empty($ischeck)) { @@ -21,8 +21,8 @@ if (empty($ischeck)) { else $ischeckSql = " And ischeck='$ischeck' "; } $keyword = HtmlReplace($keyword, -1); -$selCheckArr = array(0 => Lang('friendlink_ischeck_no'), -1 => Lang('friendlink_stat_0'), 1 => Lang('friendlink_ischeck_1'), 2 => Lang('friendlink_ischeck_2')); -$sql = "SELECT * FROM `#@__flink` WHERE CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime DESC"; +$selCheckArr = array(0 => '不限类型', -1 => '未审核', 1 => '内页', 2 => '首页'); +$sql = "SELECT * FROM `#@__flink` WHERE CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime desc"; $dlist = new DataListCP(); $dlist->SetParameter('keyword', $keyword); $dlist->SetParameter('ischeck', $ischeck); @@ -31,13 +31,13 @@ $dlist->SetSource($sql); $dlist->display(); function GetPic($pic) { - if ($pic == '') return Lang('friendlink_nopic'); + if ($pic == '') return '无图标'; else return ""; } function GetSta($sta) { - if ($sta == 1) return Lang('friendlink_stat_1'); - if ($sta == 2) return Lang('friendlink_stat_2'); - else return Lang('friendlink_stat_0'); + if ($sta == 1) return '内页'; + if ($sta == 2) return '首页'; + else return '未审核'; } ?> \ No newline at end of file diff --git a/src/admin/friendlink_type.php b/src/admin/friendlink_type.php index 2dc8b1c4..f9d89159 100644 --- a/src/admin/friendlink_type.php +++ b/src/admin/friendlink_type.php @@ -20,22 +20,22 @@ if ($dopost == "save") { $pname = HtmlReplace(${'pname_'.$startID},-1); if (isset(${'check_'.$startID})) { if ($pname != '') { - $query = "UPDATE `#@__flinktype` SET typename='$pname' WHERE id='$tid'"; + $query = "UPDATE `#@__flinktype` SET typename='$pname' WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } } else { - $query = "DELETE FROM `#@__flinktype` WHERE id='$tid'"; + $query = "DELETE FROM `#@__flinktype` WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } } //增加新记录 if (isset($check_new) && $pname_new != '') { $pname_new = HtmlReplace($pname_new, -1); - $query = "INSERT INTO `#@__flinktype`(typename) VALUES ('{$pname_new}');"; + $query = "INSERT INTO `#@__flinktype` (typename) VALUES ('{$pname_new}');"; $dsql->ExecuteNoneQuery($query); } - header("Content-Type: text/html; charset=utf-8"); - echo ""; + header("Content-Type: text/html; charset={$cfg_soft_lang}"); + echo ""; } include DedeInclude('templets/friendlink_type.htm'); ?> \ No newline at end of file diff --git a/src/admin/inc/configgroup.txt b/src/admin/inc/configgroup.txt index 78bade7c..ab304f2d 100644 --- a/src/admin/inc/configgroup.txt +++ b/src/admin/inc/configgroup.txt @@ -1,7 +1,7 @@ -1,config_tab_site -2,config_tab_core -3,config_tab_addon -4,config_tab_user -5,config_tab_interaction -6,config_tab_performance -7,config_tab_other \ No newline at end of file +1,站点设置 +2,核心设置 +3,附件设置 +4,会员设置 +5,互动设置 +6,性能选项 +7,其它选项 \ No newline at end of file diff --git a/src/admin/inc/grouplist.txt b/src/admin/inc/grouplist.txt index 853450b1..53311cb7 100644 --- a/src/admin/inc/grouplist.txt +++ b/src/admin/inc/grouplist.txt @@ -1,88 +1,88 @@ ->>gl_spec +>>特别权限(仅超级管理员使用) ->admin_AllowAll>gl_admin_AllowAll +>admin_AllowAll>可以进行任意操作 ->>gl_channel +>>频道管理 ->c_List>gl_c_List ->c_New>gl_c_New ->c_Edit>gl_c_Edit ->c_Del>gl_c_Del ->c_Stepselect>gl_c_Stepselect +>c_List>列出频道 +>c_New>新建频道 +>c_Edit>修改频道 +>c_Del>删除频道 +>c_Stepselect>联动类别管理 ->>gl_typename +>>栏目管理 ->t_List>gl_t_List ->t_New>gl_t_New ->t_Edit>gl_t_Edit ->t_Move>gl_t_Move ->t_Del>gl_t_Del ->t_AccList>gl_t_AccList ->t_AccNew>gl_t_AccNew ->t_AccEdit>gl_t_AccEdit ->t_AccDel>gl_t_AccDel +>t_List>列出任意栏目 +>t_New>新建任意栏目 +>t_Edit>修改任意栏目 +>t_Move>移动任意栏目 +>t_Del>删除任意栏目 +>t_AccList>列出授权栏目 +>t_AccNew>新建授权子栏目 +>t_AccEdit>修改授权子栏目 +>t_AccDel>删除授权子栏目 ->>gl_content +>>内容管理 ->a_List>gl_a_List ->a_New>gl_a_New ->a_Edit>gl_a_Edit ->a_Del>gl_a_Del ->a_Commend>gl_a_Commend ->a_Check>gl_a_Check ->a_AccNew>gl_a_AccNew ->a_AccList>gl_a_AccList ->a_AccEdit>gl_a_AccEdit ->a_AccDel>gl_a_AccDel ->a_AccCheck>gl_a_AccCheck ->a_MyList>gl_a_MyList ->a_MyEdit>gl_a_MyEdit ->a_MyDel>gl_a_MyDel ->a_MyCheck>gl_a_MyCheck ->a_Recycling>gl_a_Recycling +>a_List>列出内容 +>a_New>发布任意文档 +>a_Edit>修改任意文档 +>a_Del>删除任意文档 +>a_Commend>推荐任意文档 +>a_Check>审核任意文档 +>a_AccNew>发布授权文档 +>a_AccList>列出授权文档 +>a_AccEdit>修改授权文档 +>a_AccDel>删除授权文档 +>a_AccCheck>审核授权文档 +>a_MyList>列出我发布的文档 +>a_MyEdit>修改我发布的文档 +>a_MyDel>删除我发布的文档 +>a_MyCheck>审核我发布的文档 +>a_Recycling>管理回收站 ->>gl_template>unsafe +>>模板管理>unsafe ->temp_All>gl_temp_All>unsafe ->temp_New>gl_temp_New>unsafe ->temp_Edit>gl_temp_Edit>unsafe ->temp_Del>gl_temp_Del>unsafe ->temp_One>gl_temp_One>unsafe ->temp_MyTag>gl_temp_MyTag>unsafe ->temp_Test>gl_temp_Test>unsafe ->temp_Other>gl_temp_Other>unsafe +>temp_All>管理所有模板>unsafe +>temp_New>新建模板>unsafe +>temp_Edit>修改模板>unsafe +>temp_Del>删除模板>unsafe +>temp_One>单页模板管理>unsafe +>temp_MyTag>自定义标记>unsafe +>temp_Test>测试标记>unsafe +>temp_Other>模板其它管理>unsafe ->>gl_special +>>专题管理 ->spec_New>gl_spec_New ->spec_List>gl_spec_List ->spec_Edit>gl_spec_Edit +>spec_New>新建专题 +>spec_List>列出专题 +>spec_Edit>修改专题 ->>gl_system +>>系统管理权限 ->sys_User>gl_sys_User ->sys_Group>gl_sys_Group ->sys_MdPwd>gl_sys_MdPwd ->sys_DelUpload>gl_sys_DelUpload ->sys_Edit>gl_sys_Edit ->sys_Log>gl_sys_Log ->sys_plus>gl_sys_plus ->sys_Data>gl_sys_Data>unsafe ->sys_Att>gl_sys_Att ->sys_ArcBatch>gl_sys_ArcBatch ->sys_ArcTj>gl_sys_ArcTj ->sys_Source>gl_sys_Source ->sys_Writer>gl_sys_Writer ->sys_SoftConfig>gl_sys_SoftConfig ->sys_Keyword>gl_sys_Keyword ->sys_MakeHtml>gl_sys_MakeHtml ->sys_Feedback>gl_sys_Feedback ->sys_Upload>gl_sys_Upload ->sys_MyUpload>gl_sys_MyUpload +>sys_User>系统用户管理 +>sys_Group>系统组管理 +>sys_MdPwd>修改个人密码 +>sys_DelUpload>删除附件 +>sys_Edit>修改系统参数 +>sys_Log>管理日志 +>sys_plus>插件管理 +>sys_Data>数据备份还原>unsafe +>sys_Att>自定义文档属性 +>sys_ArcBatch>文档批量维护 +>sys_ArcTj>文档信息统计 +>sys_Source>新闻来源 +>sys_Writer>作者管理 +>sys_SoftConfig>软件频道参数 +>sys_Keyword>关键词管理 +>sys_MakeHtml>更新HTML +>sys_Feedback>评论管理 +>sys_Upload>管理任意上传 +>sys_MyUpload>管理我的上传 ->>gl_user +>>会员管理 ->member_Type>gl_member_Type ->member_List>gl_member_List ->member_Edit>gl_member_Edit ->member_Del>gl_member_Del \ No newline at end of file +>member_Type>会员类型管理 +>member_List>列出会员 +>member_Edit>修改会员 +>member_Del>删除会员 \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 96702ceb..30a68fcc 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -2,417 +2,428 @@ /** * 后台操作记录信息 * - * @version $Id: inc_action_info.php 2022-07-01 tianya $ + * @version $Id: inc_action_info.php 2 14:55 2010-11-11 tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/../config.php"); -$cUserLogin = new UserLogin(); +$cuserLogin = new userLogin(); //后台功能操作配置项 $actionSearch[0] = array( - 'toptitle' => Lang('manage'), - 'title' => Lang('normal_actions'), - 'description' => Lang('normal_actions_desc'), + 'toptitle' => '运维', + 'title' => '常规操作', + 'description' => '站点档案常规功能操作', 'soniterm' => array( 0 => array( - 'title' => Lang('site_catalog_main'), - 'description' => Lang('site_catalog_main_desc'), + 'title' => '网站栏目管理', + 'description' => '站点所有栏目管理', 'purview' => 't_List,t_AccList', 'linkurl' => 'catalog_main.php' ), 1 => array( - 'title' => Lang('content_list_-1'), - 'description' => Lang('content_list_-1_desc'), + 'title' => '等审核的档案', + 'description' => '所有内容模型发表的未经审核内容列表', 'purview' => 'a_Check,a_AccCheck', 'linkurl' => 'content_list.php?arcrank=-1' ), 2 => array( - 'title' => Lang('content_list_me'), - 'description' => Lang('content_list_me_desc'), + 'title' => '我发布的文档', + 'description' => '现在登录的管理员所发表的所有内容模型中的文档', 'purview' => 'a_List,a_AccList,a_MyList', - 'linkurl' => 'content_list.php?mid='.$cUserLogin->userID + 'linkurl' => 'content_list.php?mid='.$cuserLogin->userID ), 3 => array( - 'title' => Lang('feedback_main'), - 'description' => Lang('feedback_main_desc'), + 'title' => '评论管理', + 'description' => '网站所有评论管理', 'purview' => 'sys_Feedback', 'linkurl' => 'feedback_main.php' ), 4 => array( - 'title' => Lang('content_recycling'), - 'description' => Lang('content_recycling_desc'), + 'title' => '内容回收站', + 'description' => '如果在"系统配置变量"的"核心设置"中开启了"文档回收站是否开启功能"，后台删除的文档将会存放在此处', 'purview' => 'a_List,a_AccList,a_MyList', 'linkurl' => 'recycling.php' ) ) ); $actionSearch[1] = array( - 'toptitle' => Lang('manage'), - 'title' => Lang('content_main'), - 'description' => Lang('content_main_desc'), + 'toptitle' => '运维', + 'title' => '内容管理', + 'description' => '网站对应内容模型的文档管理', 'soniterm' => array( 0 => array( - 'title' => Lang('content_s_list'), - 'description' => Lang('content_s_list_desc'), + 'title' => '专题管理', + 'description' => '所有专题内容的管理', 'purview' => 'spec_New', 'linkurl' => 'content_s_list.php' ), ) ); $actionSearch[2] = array( - 'toptitle' => Lang('manage'), - 'title' => Lang('attachment_main'), - 'description' => Lang('attachment_main_desc'), + 'toptitle' => '运维', + 'title' => '附件管理', + 'description' => '所有上传的附件管理', 'soniterm' => array( 0 => array( - 'title' => Lang('media_add'), - 'description' => Lang('media_add_desc'), + 'title' => '上传新文件 ', + 'description' => '通过这可以上传图片、FLASH、视频音频、附件其它等附件', 'purview' => '', 'linkurl' => 'media_add.php' ), 1 => array( - 'title' => Lang('media_main'), - 'description' => Lang('media_main_desc'), + 'title' => '附件数据管理 ', + 'description' => '列出所有上传的附件', 'purview' => 'sys_Upload,sys_MyUpload', 'linkurl' => 'media_main.php' ), 2 => array( - 'title' => Lang('media_main_filemanager'), - 'description' => Lang('media_main_filemanager_desc'), + 'title' => '文件式管理器 ', + 'description' => '应用文件浏览的模式进行附件的管理', 'purview' => 'plus_文件管理器', 'linkurl' => 'media_main.php?dopost=filemanager' ), ) ); $actionSearch[3] = array( - 'toptitle' => Lang('manage'), - 'title' => Lang('mychannel'), - 'description' => Lang('mychannel_desc'), + 'toptitle' => '运维', + 'title' => '频道模型', + 'description' => '所有上传的附件管理', 'soniterm' => array( 0 => array( - 'title' => Lang('mychannel_main'), - 'description' => Lang('mychannel_main_desc'), + 'title' => '内容模型管理 ', + 'description' => '可以对现有商品、软件、图片集、普通文档、专题、分类信息等模型就行管理，也可以创建新的内容模型', 'purview' => 'c_List', 'linkurl' => 'mychannel_main.php' ), 1 => array( - 'title' => Lang('templets_one'), - 'description' => Lang('templets_one_desc'), + 'title' => '单页文档管理 ', + 'description' => '创建和管理单页面', 'purview' => 'temp_One', 'linkurl' => 'templets_one.php' ), 2 => array( - 'title' => Lang('stepselect_main'), - 'description' => Lang('stepselect_main_desc'), + 'title' => '联动类别管理 ', + 'description' => '创建和管理所有的联动', 'purview' => 'c_Stepseclect', 'linkurl' => 'stepselect_main.php?dopost=filemanager' ), 3 => array( - 'title' => Lang('freelist_main'), - 'description' => Lang('freelist_main_desc'), + 'title' => '自由列表管理 ', + 'description' => '创建不同的列表形式', 'purview' => 'c_List', 'linkurl' => 'freelist_main.php' ), 4 => array( - 'title' => Lang('diy_main'), - 'description' => Lang('diy_main_desc'), + 'title' => '自定义表单 ', + 'description' => '创建和管理自定义表单', 'purview' => 'c_List', 'linkurl' => 'diy_main.php' ), ) ); $actionSearch[4] = array( - 'toptitle' => Lang('manage'), - 'title' => Lang('batch_main'), - 'description' => Lang('batch_main_desc'), + 'toptitle' => '运维', + 'title' => '批量维护', + 'description' => '对一些东西进行批量的删除，添加等等', 'soniterm' => array( 0 => array( - 'title' => Lang('sys_cache_up'), - 'description' => Lang('sys_cache_up_desc'), + 'title' => '更新系统缓存 ', + 'description' => '更新栏目缓存、更新枚举缓存 、清理arclist调用缓存 、清理过期会员访问历史 、删除过期短信', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_cache_up.php' ), 1 => array( - 'title' => Lang('content_batch_up'), - 'description' => Lang('content_batch_up_desc'), + 'title' => '文档批量维护 ', + 'description' => '批量的对某个栏目或者全部栏目的内容进行审核文档、更新HTML、移动文档、删除文档', 'purview' => 'sys_ArcBatch', 'linkurl' => 'content_batch_up.php' ), 2 => array( - 'title' => Lang('search_keywords_main'), - 'description' => Lang('search_keywords_main_desc'), + 'title' => '搜索关键词维护 ', + 'description' => '对已经进行的所有所搜的关键词进行管理', 'purview' => 'sys_Keyword', 'linkurl' => 'search_keywords_main.php?dopost=filemanager' ), 3 => array( - 'title' => Lang('article_keywords_main'), - 'description' => Lang('article_keywords_main_desc'), + 'title' => '文档关键词维护 ', + 'description' => '对文档中的关键词进行批量的维护', 'purview' => 'sys_Keyword', 'linkurl' => 'article_keywords_main.php' ), 4 => array( - 'title' => Lang('article_test_same'), - 'description' => Lang('article_test_same_desc'), + 'title' => '重复文档检测 ', + 'description' => '可以对网站中出现的重复标题的文档进行处理', 'purview' => 'sys_ArcBatch', 'linkurl' => 'article_test_same.php' ), 5 => array( - 'title' => Lang('article_description_main'), - 'description' => Lang('article_description_main_desc'), + 'title' => '自动摘要|分页 ', + 'description' => '用于自动更新您系统没有填写摘要的文档的摘要信息或更新没分页的文档的自动分页标识', 'purview' => 'sys_Keyword', 'linkurl' => 'article_description_main.php' ), 6 => array( - 'title' => Lang('tags_main'), - 'description' => Lang('tags_main_desc'), + 'title' => 'Tag标签管理 ', + 'description' => '对整个网站的tag进行批量的维护', 'purview' => 'sys_Keyword', 'linkurl' => 'tags_main.php' ), 7 => array( - 'title' => Lang('sys_data_replace'), - 'description' => Lang('sys_data_replace_desc'), + 'title' => '数据库内容替换 ', + 'description' => '可以对数据库中的某张表中的字段进行内容的批量替换', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_data_replace.php' ), ) ); $actionSearch[5] = array( - 'toptitle' => Lang('member'), - 'title' => Lang('member_main2'), - 'description' => Lang('member_main2_desc'), + 'toptitle' => '会员', + 'title' => '会员管理', + 'description' => '注册会员及积分等配置管理', 'soniterm' => array( 0 => array( - 'title' => Lang('member_main'), - 'description' => Lang('member_main_desc'), + 'title' => '注册会员列表', + 'description' => '所有注册会员的管理项，其中包含修改删除，查看会员文档以及提升管理员等操作', 'purview' => 'member_List', 'linkurl' => 'member_main.php' ), 1 => array( - 'title' => Lang('member_rank'), - 'description' => Lang('member_rank_desc'), + 'title' => '会员级别设置', + 'description' => '设置会员的级别，可以通过设计不同会员的访问权限来对会员级别进行一个扩展', 'purview' => 'member_Type', 'linkurl' => 'member_rank.php' ), 2 => array( - 'title' => Lang('member_scores'), - 'description' => Lang('member_scores_desc'), + 'title' => '积分头衔设置', + 'description' => '会员积分等级设置，根据会员活动积分对会员进行头衔划分', 'purview' => 'member_Type', 'linkurl' => 'member_scores.php' ), 4 => array( - 'title' => Lang('member_pm'), - 'description' => Lang('member_pm_desc'), + 'title' => '会员短信管理', + 'description' => '会员之间发送的短消息管理，其中包含群发短消息和对单个会员发送短消息两种', 'purview' => 'member_Type', 'linkurl' => 'member_pm.php' ), ) ); $actionSearch[6] = array( - 'toptitle' => Lang('member'), - 'title' => Lang('pay_tools'), - 'description' => Lang('pay_tools_desc'), + 'toptitle' => '会员', + 'title' => '支付工具', + 'description' => '站点财务相关设置，包含点卡，商店订单等操作', 'soniterm' => array( 0 => array( - 'title' => Lang('cards_type'), - 'description' => Lang('cards_type_desc'), + 'title' => '点卡产品分类', + 'description' => '网站点卡产品分类，可以添加不同点数的点卡产品类型', 'purview' => 'sys_Data', 'linkurl' => 'cards_type.php' ), 1 => array( - 'title' => Lang('cards_manage'), - 'description' => Lang('cards_manage_desc'), + 'title' => '点卡产品管理', + 'description' => '管理网站点卡，可以在这里生成点卡以及查看点卡的当前状态', 'purview' => 'sys_Data', 'linkurl' => 'cards_manage.php' ), 2 => array( - 'title' => Lang('member_type'), - 'description' => Lang('member_type_desc'), + 'title' => '会员产品分类', + 'description' => '可以将会员类型进行产品划分，比如出售高级会员1年这种，在这里可以对会员产品进行定义', 'purview' => 'sys_Data', 'linkurl' => 'member_type.php' ), 3 => array( - 'title' => Lang('member_operations'), - 'description' => Lang('member_operations_desc'), + 'title' => '会员消费记录', + 'description' => '会员在前台进行操作、消费积分的消费记录，同时可以查看消费充值订单的付款情况', 'purview' => 'sys_Data', 'linkurl' => 'member_operations.php' ), 4 => array( - 'title' => Lang('shops_operations'), - 'description' => Lang('shops_operations_desc'), + 'title' => '商店订单记录', + 'description' => '前台会员商店提交的订单记录，这里可以对这些订单进行一个统一的管理', 'purview' => 'sys_Data', 'linkurl' => 'shops_operations.php' ), 5 => array( - 'title' => Lang('sys_payment'), - 'description' => Lang('sys_payment_desc'), + 'title' => '支付接口设置', + 'description' => '商店以及会员产品付款用到的在线付款方式需要设置的支付接口，这里含有常用的接口', 'purview' => 'sys_Data', 'linkurl' => 'sys_payment.php' ), + 6 => array( + 'title' => '配货方式设置', + 'description' => '网站在线商城的送货方式，这里可以对其进行编辑管理', + 'purview' => 'sys_Data', + 'linkurl' => 'shops_delivery.php' + ), + 7 => array( + 'title' => '汇款账号设置', + 'description' => '银行付款的账号设置，用户可以查看到您的银行付款账号方便支付', + 'purview' => 'sys_Data', + 'linkurl' => 'shops_bank.php' + ), ) ); $actionSearch[7] = array( - 'toptitle' => Lang('makehtml'), - 'title' => Lang('makehtml_task'), - 'description' => Lang('makehtml_task_desc'), + 'toptitle' => '生成', + 'title' => '更新任务', + 'description' => '一键生成静态管理', 'soniterm' => array( 0 => array( - 'title' => Lang('makehtml_all'), - 'description' => Lang('makehtml_all_desc'), + 'title' => '更新网站', + 'description' => '可以一键生成所有静态页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_all.php' ), 1 => array( - 'title' => Lang('makehtml_homepage'), - 'description' => Lang('makehtml_homepage_desc'), + 'title' => '更新主页', + 'description' => '生成网站主页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_homepage.php' ), 2 => array( - 'title' => Lang('makehtml_list'), - 'description' => Lang('makehtml_list_desc'), + 'title' => '更新栏目', + 'description' => '对每个栏目进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_list.php' ), 3 => array( - 'title' => Lang('makehtml_archives'), - 'description' => Lang('makehtml_archives_desc'), + 'title' => '更新文档', + 'description' => '对每个栏目下的文档进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_archives.php' ), 4 => array( - 'title' => Lang('makehtml_spec'), - 'description' => Lang('makehtml_spec_desc'), + 'title' => '更新专题', + 'description' => '对专题进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_spec.php' ), 5 => array( - 'title' => Lang('sys_cache_up'), - 'description' => Lang('sys_cache_up_desc'), + 'title' => '更新缓存', + 'description' => '更新栏目缓存、更新枚举缓存、清理arclist调用缓存、清理过期会员访问历史、删除过期短信 ', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_cache_up.php' ), ) ); $actionSearch[8] = DEDEBIZ_SAFE_MODE? null : array( - 'toptitle' => Lang('template'), - 'title' => Lang('templets_main'), - 'description' => Lang('templets_main_desc'), + 'toptitle' => '模板', + 'title' => '模板管理', + 'description' => '针对主页、栏目、文档、专题等等进行更新', 'soniterm' => array( 0 => array( - 'title' => Lang('templets_main2'), - 'description' => Lang('templets_main2_desc'), + 'title' => '默认模板管理 ', + 'description' => '对网站正在采用的模板文件进行管理', 'purview' => 'temp_All', 'linkurl' => 'templets_main.php' ), 1 => array( - 'title' => Lang('templets_tagsource'), - 'description' => Lang('templets_tagsource_desc'), + 'title' => '标签源码管理 ', + 'description' => '对现有的标签文件进行修改添加', 'purview' => 'temp_All', 'linkurl' => 'templets_tagsource.php' ), 2 => array( - 'title' => Lang('mytag_main'), - 'description' => Lang('mytag_main_desc'), + 'title' => '自定义宏标记', + 'description' => '管理自定义标记', 'purview' => 'temp_MyTag', 'linkurl' => 'mytag_main.php' ), 3 => array( - 'title' => Lang('mytag_tag_guide'), - 'description' => Lang('mytag_tag_guide_desc'), + 'title' => '智能标记向导', + 'description' => '可以根据需要生成相应的调用标签', 'purview' => 'temp_Other', 'linkurl' => 'mytag_tag_guide.php' ), 4 => array( - 'title' => Lang('tag_test'), - 'description' => Lang('tag_test_desc'), + 'title' => '全局标记测试 ', + 'description' => '可以对全局的标签调用进行测试', 'purview' => 'temp_Test', 'linkurl' => 'tag_test.php' ), ) ); $actionSearch[9] = array( - 'toptitle' => Lang('system'), - 'title' => Lang('setting'), - 'description' => Lang('setting_desc'), + 'toptitle' => '系统', + 'title' => '系统设置', + 'description' => '对网站的一些基本信息和配置进行管理', 'soniterm' => array( 0 => array( - 'title' => Lang('sys_info'), - 'description' => Lang('sys_info_desc'), + 'title' => '系统配置变量', + 'description' => '包含站点设置、核心设置 、附件设置、会员设置、互动设置、性能选项、其它选项、添加新变量等分类，其中有网站基本信息和网站的基本设置选项', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info.php' ), 1 => array( - 'title' => Lang('sys_admin_user'), - 'description' => Lang('sys_admin_user_desc'), + 'title' => '系统用户管理', + 'description' => '对现有的网站管理员进行管理', 'purview' => 'sys_User', 'linkurl' => 'sys_admin_user.php' ), 2 => array( - 'title' => Lang('sys_group'), - 'description' => Lang('sys_group_desc'), + 'title' => '用户组设定', + 'description' => '对网站管理员进行用户组别的划分', 'purview' => 'sys_Group', 'linkurl' => 'sys_group.php' ), 3 => array( - 'title' => Lang('log_list'), - 'description' => Lang('log_list_desc'), + 'title' => '系统日志管理', + 'description' => '对每个登录后台的管理员进行的操作进行记录', 'purview' => 'sys_Log', 'linkurl' => 'log_list.php' ), 5 => array( - 'title' => Lang('sys_info_mark'), - 'description' => Lang('sys_info_mark_desc'), + 'title' => '图片水印设置', + 'description' => '对于上传的图片添加的水印进行配置', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info_mark.php' ), 6 => array( - 'title' => Lang('content_att'), - 'description' => Lang('content_att_desc'), + 'title' => '自定义文档属性', + 'description' => '在以往的版本中，网站主页、频道封面的设计，都只能单调的用 arclist 标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档', 'purview' => 'sys_Att', 'linkurl' => 'content_att.php' ), 7 => array( - 'title' => Lang('soft_config'), - 'description' => Lang('soft_config_desc'), + 'title' => '软件频道设置', + 'description' => '可以对软件下载时的连接显示方式，下载方式，镜像服务器等等进行配置', 'purview' => 'sys_SoftConfig', 'linkurl' => 'soft_config.php' ), 8 => array( - 'title' => Lang('article_string_mix'), - 'description' => Lang('article_string_mix_desc'), + 'title' => '防采集串混淆', + 'description' => '防采集混淆字符串管理', 'purview' => 'sys_StringMix', 'linkurl' => 'article_string_mix.php' ), 9 => array( - 'title' => Lang('article_template_rand'), - 'description' => Lang('article_template_rand_desc'), + 'title' => '随机模板设置', + 'description' => '本设置仅适用于系统默认的文档模型，设置后发布文档时会自动按指定的模板随机获取一个，如果不想使用此功能，把它设置为空即可', 'purview' => 'sys_StringMix', 'linkurl' => 'article_template_rand.php' ), 11 => array( - 'title' => Lang('sys_data'), - 'description' => Lang('sys_data_desc'), + 'title' => '数据库备份还原', + 'description' => '对数据库进行备份和还原', 'purview' => 'sys_data', 'linkurl' => 'sys_data.php' ), 12 => DEDEBIZ_SAFE_MODE? null : array( - 'title' => Lang('sys_sql_query'), - 'description' => Lang('sys_sql_query_desc'), + 'title' => 'SQL命令行工具', + 'description' => '可以在针对每张数据表执行单行或者多行的SQL语句', 'purview' => 'sys_data', 'linkurl' => 'sys_sql_query.php' ), 14 => array( - 'title' => Lang('sys_safetest'), - 'description' => Lang('sys_safetest_desc'), + 'title' => '病毒扫描', + 'description' => '以DedeBIZ开发模式为标准对现有的文件进行扫描并进行判断', 'purview' => 'sys_verifies', 'linkurl' => 'sys_safetest.php' ), 15 => array( - 'title' => Lang('sys_repair'), - 'description' => Lang('sys_repair_desc'), + 'title' => '系统错误修复', + 'description' => '由于手动升级时用户没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，可能会导致一些错误，使用本工具会自动检测并处理', 'purview' => 'sys_verifies', 'linkurl' => 'sys_repair.php' ), diff --git a/src/admin/inc/inc_admin_channel.php b/src/admin/inc/inc_admin_channel.php index f1fe513a..2d65ee23 100644 --- a/src/admin/inc/inc_admin_channel.php +++ b/src/admin/inc/inc_admin_channel.php @@ -1,13 +1,4 @@ 255) $mxlen = 100; + if(empty($dfvalue)) $dfvalue = ''; + if($mxlen=="") $mxlen = 200; + if($mxlen > 255) $mxlen = 100; $fields[0] = " `$fieldname` varchar($mxlen) NOT NULL default '$dfvalue';"; $fields[1] = "varchar($mxlen)"; } - else if ($dtype == "multitext" || $dtype == "htmltext") + else if($dtype == "multitext" || $dtype == "htmltext") { $fields[0] = " `$fieldname` mediumtext;"; $fields[1] = "mediumtext"; } - else if ($dtype=="textdata") + else if($dtype=="textdata") { - if (empty($dfvalue)) $dfvalue = ''; + if(empty($dfvalue)) $dfvalue = ''; $fields[0] = " `$fieldname` varchar(100) NOT NULL default '';"; $fields[1] = "varchar(100)"; } - else if ($dtype=="relation") { - if (empty($dfvalue)) $dfvalue = ''; + else if($dtype=="relation") { + if(empty($dfvalue)) $dfvalue = ''; $fields[0] = " `$fieldname` TEXT NOT NULL default '$dfvalue';"; $fields[1] = "TEXT"; } - else if ($dtype=="textchar") + else if($dtype=="textchar") { - if (empty($dfvalue)) $dfvalue = ''; + if(empty($dfvalue)) $dfvalue = ''; $fields[0] = " `$fieldname` char(100) NOT NULL default '$dfvalue';"; $fields[1] = "char(100)"; } - else if ($dtype=="checkbox") + else if($dtype=="checkbox") { $dfvalue = str_replace(',',"','",$dfvalue); $dfvalue = "'".$dfvalue."'"; $fields[0] = " `$fieldname` SET($dfvalue) NULL;"; $fields[1] = "SET($dfvalue)"; } - else if ($dtype=="select" || $dtype=="radio") + else if($dtype=="select" || $dtype=="radio") { $dfvalue = str_replace(',', "','", $dfvalue); $dfvalue = "'".$dfvalue."'"; $fields[0] = " `$fieldname` enum($dfvalue) NULL;"; $fields[1] = "enum($dfvalue)"; } else { - if (empty($dfvalue)) + if(empty($dfvalue)) { $dfvalue = ''; } - if (empty($mxlen)) + if(empty($mxlen)) { $mxlen = 100; } - if ($mxlen > 255) + if($mxlen > 255) { $mxlen = 250; } @@ -123,11 +114,11 @@ function GetAddFieldList(&$dtp,&$oksetting) $oklist = ''; $dtp->SetNameSpace("field","<",">"); $dtp->LoadSource($oksetting); - if (is_array($dtp->CTags)) + if(is_array($dtp->CTags)) { foreach($dtp->CTags as $tagid=>$ctag) { - if ($ctag->GetAtt('islist')==1) + if($ctag->GetAtt('islist')==1) { $oklist .= ($oklist=='' ? strtolower($ctag->GetName()) : ','.strtolower($ctag->GetName()) ); } diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 792378a9..109f2465 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -2,24 +2,20 @@ /** * 文档操作相关函数 * - * @version $Id: inc_archives_functions.php 2022-07-01 tianya $ + * @version $Id: inc_archives_functions.php 1 9:56 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\Archives; -use DedeBIZ\Database\DedeSql; -use DedeBIZ\libraries\DedeBIZ; -use DedeBIZ\libraries\DedeHttpDown; -use DedeBIZ\libraries\SplitWord; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; -helper('dedecollection'); -helper('customfields'); -helper('image'); +require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); +require_once(DEDEINC.'/image.func.php'); +require_once(DEDEINC.'/archive/partview.class.php'); $backurl = !empty($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : ''; -$backurl = preg_match("#content_#", $backurl) ? "".Lang('content_list_remeber')."" : ''; +$backurl = preg_match("#content_#", $backurl) ? "记忆的列表页" : ''; +if (!isset($_NOT_ARCHIVES)) { + require_once(DEDEINC.'/customfields.func.php'); +} /** * 获得HTML里的外部资源，针对图集 * @@ -32,7 +28,8 @@ $backurl = preg_match("#content_#", $backurl) ? "getUserID()."');"; + $inquery = "INSERT INTO `#@__uploads` (arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','$iurl','1','{$imginfos[0]}','$imginfos[1]','0','$fsize','".time()."','".$cuserLogin->getUserID()."'); "; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); - UserLogin::AddMyAddon($fid, $iurl); + AddMyAddon($fid, $iurl); if ($pagestyle > 2) { $litpicname = GetImageMapDD($iurl, $cfg_ddimg_width); } else { @@ -98,7 +95,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) */ function GetCurContent($body) { - global $cfg_multi_site, $cfg_basehost, $cfg_basedir, $cfg_image_dir, $arcID, $cUserLogin, $dsql; + global $cfg_multi_site, $cfg_basehost, $cfg_basedir, $cfg_image_dir, $arcID, $cuserLogin, $dsql; $cfg_uploaddir = $cfg_image_dir; $htd = new DedeHttpDown(); $basehost = IsSSL()? "https://".$_SERVER["HTTP_HOST"] : "http://".$_SERVER["HTTP_HOST"]; @@ -124,6 +121,7 @@ function GetCurContent($body) continue; } $htd->OpenUrl($value); + $itype = $htd->GetHead("content-type"); $isImage = true; if ($itype == 'image/gif') { @@ -133,11 +131,11 @@ function GetCurContent($body) } else if ($itype == 'audio/mpeg'){ $itype = ".mp3"; $isImage = false; - } else if ($itype == 'image/jpeg') { + } else if($itype == 'image/jpeg') { $itype = '.jpg'; - } else if ($itype == 'image/bmp') { + } else if($itype == 'image/bmp') { $itype = '.bmp'; - } else if ($itype == 'image/svg+xml') { + } else if($itype == 'image/svg+xml') { $itype = '.svg'; $isImage = false; } else { @@ -156,10 +154,10 @@ function GetCurContent($body) } $fsize = filesize($rndFileName); //保存图片附件信息 - $inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$arcID}','$rndFileName','$fileurl','1','{$imginfos[0]}','$imginfos[1]','0','$fsize','".time()."','".$cUserLogin->getUserID()."');"; + $inquery = "INSERT INTO `#@__uploads` (arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$arcID}','$rndFileName','$fileurl','1','{$imginfos[0]}','$imginfos[1]','0','$fsize','".time()."','".$cuserLogin->getUserID()."'); "; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); - UserLogin::AddMyAddon($fid, $fileurl); + AddMyAddon($fid, $fileurl); if ($cfg_multi_site == 'Y') { $fileurl = $cfg_basehost.$fileurl; } @@ -232,7 +230,7 @@ function CheckChannel($typeid, $channelid) { global $dsql; if ($typeid == 0) return TRUE; - $row = $dsql->GetOne("SELECT ispart,channeltype FROM `#@__arctype` WHERE id='$typeid'"); + $row = $dsql->GetOne("SELECT ispart,channeltype FROM `#@__arctype` WHERE id='$typeid' "); if ($row['ispart'] != 0 || $row['channeltype'] != $channelid) return FALSE; else return TRUE; } @@ -247,7 +245,7 @@ function CheckChannel($typeid, $channelid) function CheckArcAdmin($aid, $adminid) { global $dsql; - $row = $dsql->GetOne("SELECT mid FROM `#@__archives` WHERE id='$aid'"); + $row = $dsql->GetOne("SELECT mid FROM `#@__archives` WHERE id='$aid' "); if ($row['mid'] != $adminid) return FALSE; else return TRUE; } @@ -308,14 +306,16 @@ function SpLongBody($mybody, $spsize, $sptag) * @access public * @param string $aid 文档id * @param string $ismakesign 生成标志 + * @param int $isremote 是否远程 * @return string */ -function MakeArt($aid, $mkindex = FALSE, $ismakesign = FALSE) +function MakeArt($aid, $mkindex = FALSE, $ismakesign = FALSE, $isremote = 0) { global $envs, $typeid; + require_once(DEDEINC.'/archive/archives.class.php'); if ($ismakesign) $envs['makesign'] = 'yes'; $arc = new Archives($aid); - $reurl = $arc->MakeHtml(); + $reurl = $arc->MakeHtml($isremote); return $reurl; } /** @@ -348,7 +348,7 @@ function GetDDImgFromBody(&$body) */ function GetDDImage($litpic, $picname, $isremote) { - global $cUserLogin, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir, $cfg_image_dir, $cfg_addon_savetype; + global $cuserLogin, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir, $cfg_image_dir, $cfg_addon_savetype; $ntime = time(); if (($litpic != 'none' || $litpic != 'ddfirst') && !empty($_FILES[$litpic]['tmp_name']) && is_uploaded_file($_FILES[$litpic]['tmp_name']) ) { @@ -357,12 +357,12 @@ function GetDDImage($litpic, $picname, $isremote) $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$litpic]['type'] = strtolower(trim($_FILES[$litpic]['type'])); if (!in_array($_FILES[$litpic]['type'], $sparr)) { - ShowMsg(Lang("dialog_err_imageformat"), "-1"); + ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG格式的其中一种", "-1"); exit(); } $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cUserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); if (strtolower($_FILES[$litpic]['type']) == "image/gif") { $fullUrl = $fullUrl.".gif"; } else if (strtolower($_FILES[$litpic]['type']) == "image/png") { @@ -372,11 +372,11 @@ function GetDDImage($litpic, $picname, $isremote) } $mime = get_mime_type($_FILES[$litpic]['tmp_name']); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } @move_uploaded_file($_FILES[$litpic]['tmp_name'], $cfg_basedir.$fullUrl); @@ -388,7 +388,7 @@ function GetDDImage($litpic, $picname, $isremote) $picname = trim($picname); if ($isremote == 1 && preg_match("#^http:\/\/#i", $picname)) { $litpic = $picname; - $ddinfos = GetRemoteImage($litpic, $cUserLogin->getUserID()); + $ddinfos = GetRemoteImage($litpic, $cuserLogin->getUserID()); if (!is_array($ddinfos)) { $litpic = ''; } else { @@ -401,7 +401,7 @@ function GetDDImage($litpic, $picname, $isremote) } else { if ($litpic == 'ddfirst' && !preg_match("#^http:\/\/#i", $picname)) { $oldpic = $cfg_basedir.$picname; - $litpic = str_replace('.', '-icon.', $picname); + $litpic = str_replace('.', '-ty.', $picname); if ($GLOBALS['cfg_ddimg_full'] == 'Y') @ImageResizeNew($oldpic, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir.$litpic); else @ImageResize($oldpic, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir.$litpic); if (!is_file($cfg_basedir.$litpic)) $litpic = ''; @@ -519,7 +519,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all') */ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = '') { - global $autolitpic, $remote, $dellink, $autokey, $cfg_basehost, $cfg_auot_description, $id, $title; + global $autolitpic, $remote, $dellink, $autokey, $cfg_basehost, $cfg_auot_description, $id, $title, $cfg_soft_lang; global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port; $autolitpic = (empty($autolitpic) ? '' : $autolitpic); $body = stripslashes($body); @@ -547,25 +547,26 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = '' $litpic = GetDDImgFromBody($body); } //自动获取关键词 - if ($autokey == 1 && $keywords == '') { + if ($autokey == 2 && $keywords == '') { $subject = $title; $message = $body; //采用DedeBIZ Core分词组件分词 if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { $keywords = ''; - $client = new DedeBIZ($cfg_bizcore_hostname, $cfg_bizcore_port); + $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client->appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $data = $client->Spliteword($subject.Html2Text($message)); $keywords = $data->data; $client->Close(); } else { + include_once(DEDEINC.'/libraries/splitword.class.php'); $keywords = ''; - $sp = new SplitWord(); - $sp->SetSource($subject); + $sp = new SplitWord($cfg_soft_lang, $cfg_soft_lang); + $sp->SetSource($subject, $cfg_soft_lang, $cfg_soft_lang); $sp->StartAnalysis(); $titleindexs = preg_replace("/#p#|#e#/", '', $sp->GetFinallyIndex()); - $sp->SetSource(Html2Text($message)); + $sp->SetSource(Html2Text($message), $cfg_soft_lang, $cfg_soft_lang); $sp->StartAnalysis(); $allindexs = preg_replace("/#p#|#e#/", '', $sp->GetFinallyIndex()); if (is_array($allindexs) && is_array($titleindexs)) { @@ -637,9 +638,9 @@ function Replace_Links(&$body, $allow_urls = array()) */ function GetImageMapDD($filename, $maxwidth) { - global $cUserLogin, $dsql, $cfg_ddimg_height, $cfg_ddimg_full; + global $cuserLogin, $dsql, $cfg_ddimg_height, $cfg_ddimg_full; $ddn = substr($filename, -3); - $ddpicok = preg_replace("#\.".$ddn."$#", "-icon.".$ddn, $filename); + $ddpicok = preg_replace("#\.".$ddn."$#", "-ty.".$ddn, $filename); $toFile = $GLOBALS['cfg_basedir'].$ddpicok; if ($cfg_ddimg_full == 'Y') ImageResizeNew($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile); else ImageResize($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile); @@ -647,12 +648,104 @@ function GetImageMapDD($filename, $maxwidth) $fsize = filesize($toFile); $ddpicoks = explode('/', $ddpicok); $filename = $ddpicoks[count($ddpicoks) - 1]; - $inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','$ddpicok','1','0','0','0','$fsize','".time()."','".$cUserLogin->getUserID()."');"; + $inquery = "INSERT INTO `#@__uploads` (arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('0','$filename','$ddpicok','1','0','0','0','$fsize','".time()."','".$cuserLogin->getUserID()."'); "; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); - UserLogin::AddMyAddon($fid, $ddpicok); + AddMyAddon($fid, $ddpicok); return $ddpicok; } +/** + * 上传一个未经处理的图片 + * + * @access public + * @param string $upname 上传框名称 + * @param string $handurl 手工填写的网址 + * @param string $ddisremote 是否下载远程图片 0 不下, 1 下载 + * @param string $ntitle 注解文字 如果表单有 title 字段可不管 + * @return mixed + */ +function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') +{ + global $cuserLogin, $cfg_basedir, $cfg_image_dir, $title, $dsql; + if ($ntitle != '') { + $title = $ntitle; + } + $ntime = time(); + $filename = ''; + $isrm_up = FALSE; + $handurl = trim($handurl); + //如果用户自行上传了图片 + if (!empty($_FILES[$upname]['tmp_name']) && is_uploaded_file($_FILES[$upname]['tmp_name'])) { + $istype = 0; + $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); + $_FILES[$upname]['type'] = strtolower(trim($_FILES[$upname]['type'])); + if (!in_array($_FILES[$upname]['type'], $sparr)) { + ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG格式的其中一种", "-1"); + exit(); + } + if (!empty($handurl) && !preg_match("#^http:\/\/#i", $handurl) && file_exists($cfg_basedir.$handurl)) { + if (!is_object($dsql)) { + $dsql = new DedeSqli(); + } + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '$handurl' "); + $fullUrl = preg_replace("#\.([a-z]*)$#i", "", $handurl); + } else { + $savepath = $cfg_image_dir.'/'.date("%Y-%m", $ntime); + CreateDir($savepath); + $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999)); + } + if (strtolower($_FILES[$upname]['type']) == "image/gif") { + $fullUrl = $fullUrl.".gif"; + } else if (strtolower($_FILES[$upname]['type']) == "image/png") { + $fullUrl = $fullUrl.".png"; + } else { + $fullUrl = $fullUrl.".jpg"; + } + $mime = get_mime_type($_FILES[$upname]['tmp_name']); + if (preg_match("#^unknow#", $mime)) { + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); + exit; + } + if (!preg_match("#^(image|video|audio|application)#i", $mime)) { + ShowMsg("仅支持媒体文件及应用程序上传", -1); + exit; + } + //保存 + @move_uploaded_file($_FILES[$upname]['tmp_name'], $cfg_basedir.$fullUrl); + $filename = $fullUrl; + //水印 + @WaterImg($cfg_basedir.$fullUrl, 'up'); + $isrm_up = TRUE; + } + //远程或选择本地图片 + else { + if ($handurl == '') { + return ''; + } + //远程图片并要求本地化 + if ($isremote == 1 && preg_match("#^http[s]?:\/\/#i", $handurl)) { + $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID()); + if (!is_array($ddinfos)) { + $litpic = ""; + } else { + $filename = $ddinfos[0]; + } + $isrm_up = TRUE; + //本地图片或远程不要求本地化 + } else { + $filename = $handurl; + } + } + $imgfile = $cfg_basedir.$filename; + if (is_file($imgfile) && $isrm_up && $filename != '') { + $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()."');"; + $dsql->ExecuteNoneQuery($inquery); + } + return $filename; +} /** * 获取更新测试信息 * diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 8df45007..9a7210d3 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -2,13 +2,12 @@ /** * 文档操作相关函数 * - * @version $Id: inc_batchup.php 2022-07-01 tianya $ + * @version $Id: inc_batchup.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; /** * 删除文档信息 * @@ -21,7 +20,7 @@ use DedeBIZ\Login\UserLogin; function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) { global $dsql, $cfg_cookie_encode, $cfg_multi_site, $cfg_medias_dir; - global $cUserLogin, $cfg_upload_switch, $cfg_delete, $cfg_basedir; + global $cuserLogin, $cfg_upload_switch, $cfg_delete, $cfg_basedir; global $admin_catalogs, $cfg_admin_channel; if ($cfg_delete == 'N') $type = 'OK'; if (empty($aid)) return; @@ -30,7 +29,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) if ($recycle == 1) $whererecycle = "AND arcrank = '-2'"; 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'"; + $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); $nid = $row['nid']; $maintable = (trim($row['maintable']) == '' ? '#@__archives' : trim($row['maintable'])); @@ -38,19 +37,19 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) $issystem = $row['issystem']; //查询档案信息 if ($issystem == -1) { - $arcQuery = "SELECT arc.*,tp.* from `$addtable` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.aid='$aid'"; + $arcQuery = "SELECT arc.*,tp.* FROM `$addtable` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.aid='$aid' "; } else { - $arcQuery = "SELECT arc.*,tp.*,arc.id AS aid FROM `$maintable` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.id='$aid'"; + $arcQuery = "SELECT arc.*,tp.*,arc.id AS aid FROM `$maintable` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.id='$aid' "; } $arcRow = $dsql->GetOne($arcQuery); //检测权限 - if (!UserLogin::TestPurview('a_Del,sys_ArcBatch')) { - if (UserLogin::TestPurview('a_AccDel')) { + if (!TestPurview('a_Del,sys_ArcBatch')) { + if (TestPurview('a_AccDel')) { if (!in_array($arcRow['typeid'], $admin_catalogs) && (count($admin_catalogs) != 0 || $cfg_admin_channel != 'all')) { return FALSE; } - } else if (UserLogin::TestPurview('a_MyDel')) { - if ($arcRow['mid'] != $cUserLogin->getUserID()) { + } else if (TestPurview('a_MyDel')) { + if ($arcRow['mid'] != $cuserLogin->getUserID()) { return FALSE; } } else { @@ -62,22 +61,22 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) if (!is_array($arcRow)) return FALSE; /** 删除到回收站 **/ if ($cfg_delete == 'Y' && $type == 'ON') { - $dsql->ExecuteNoneQuery("UPDATE `$maintable` SET arcrank='-2' WHERE id='$aid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid';"); + $dsql->ExecuteNoneQuery("UPDATE `$maintable` SET arcrank='-2' WHERE id='$aid' "); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid'; "); } else { //删除数据库记录 if (!$onlyfile) { - $query = "Delete From `#@__arctiny` where id='$aid' $whererecycle"; + $query = "DELETE FROM `#@__arctiny` WHERE id='$aid' $whererecycle"; if ($dsql->ExecuteNoneQuery($query)) { - $dsql->ExecuteNoneQuery("Delete From `#@__feedback` where aid='$aid'"); - $dsql->ExecuteNoneQuery("Delete From `#@__member_stow` where aid='$aid'"); - $dsql->ExecuteNoneQuery("Delete From `#@__taglist` where aid='$aid'"); - $dsql->ExecuteNoneQuery("Delete From `#@__erradd` where aid='$aid'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE aid='$aid' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE aid='$aid' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__taglist` WHERE aid='$aid' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__erradd` WHERE aid='$aid' "); if ($addtable != '') { - $dsql->ExecuteNoneQuery("Delete From `$addtable` where aid='$aid'"); + $dsql->ExecuteNoneQuery("DELETE FROM `$addtable` WHERE aid='$aid'"); } if ($issystem != -1) { - $dsql->ExecuteNoneQuery("Delete From `#@__archives` where id='$aid' $whererecycle"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$aid' $whererecycle"); } //删除相关附件 if ($cfg_upload_switch == 'Y') { @@ -85,7 +84,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) while ($row = $dsql->GetArray('me')) { $addfile = $row['url']; $aid = $row['aid']; - $dsql->ExecuteNoneQuery("Delete From `#@__uploads` where aid = '$aid'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE aid = '$aid' "); $upfile = $cfg_basedir.$addfile; if (@file_exists($upfile)) @unlink($upfile); } diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index 1d6b75c1..f60ed5f6 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -2,7 +2,7 @@ /** * 栏目选项函数 * - * @version $Id: inc_catalog_options.php 2022-07-01 tianya $ + * @version $Id: inc_catalog_options.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -20,7 +20,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) { global $OptionArrayList, $channels, $dsql, $cfg_admin_channel, $admin_catalogs; - $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype`"); + $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` "); $dsql->Execute('dd'); $channels = array(); while ($row = $dsql->GetObject('dd')) $channels[$row->id] = $row->typename; @@ -34,10 +34,10 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) //是否限定用户管理的栏目 if ($cfg_admin_channel == 'array') { if (count($admin_catalogs) == 0) { - $query = "SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE 1=2"; + $query = "SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE 1=2 "; } else { $admin_catalog = join(',', $admin_catalogs); - $dsql->SetQuery("SELECT reid FROM `#@__arctype` WHERE id IN($admin_catalog) GROUP BY reid"); + $dsql->SetQuery("SELECT reid FROM `#@__arctype` WHERE id IN($admin_catalog) GROUP BY reid "); $dsql->Execute('qq'); $topidstr = ''; while ($row = $dsql->GetObject('qq')) { @@ -49,10 +49,10 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $admin_catalogs = array_unique($admin_catalogs); $admin_catalog = join(',', $admin_catalogs); $admin_catalog = preg_replace("#,$#", '', $admin_catalog); - $query = "SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id in($admin_catalog) And reid=0"; + $query = "Select id,typename,ispart,channeltype From `#@__arctype` where id in($admin_catalog) And reid=0"; } } else { - $query = "SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE reid=0 ORDER BY sortrank ASC"; + $query = "Select id,typename,ispart,channeltype From `#@__arctype` where reid=0 order by sortrank asc"; } $dsql->SetQuery($query); $dsql->Execute('cc'); @@ -61,7 +61,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats); if ($sonCats != '') { if ($row->ispart == 1) $OptionArrayList .= ""; - else if ($row->ispart == 2) $OptionArrayList .= ""; + else if($row->ispart == 2) $OptionArrayList .= ""; else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; else $OptionArrayList .= ""; $OptionArrayList .= $sonCats; @@ -78,7 +78,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats) { global $OptionArrayList, $channels, $cfg_admin_channel, $admin_catalogs; - $dsql->SetQuery("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE reid='".$id."' ORDER BY sortrank ASC"); + $dsql->SetQuery("Select id,typename,ispart,channeltype From `#@__arctype` where reid='".$id."' order by sortrank asc"); $dsql->Execute($id); while ($row = $dsql->GetObject($id)) { if ($cfg_admin_channel != 'all' && !in_array($row->id, $admin_catalogs)) { diff --git a/src/admin/inc/inc_coonepage.php b/src/admin/inc/inc_coonepage.php index 24fad4f3..2cf528de 100644 --- a/src/admin/inc/inc_coonepage.php +++ b/src/admin/inc/inc_coonepage.php @@ -2,14 +2,13 @@ /** * 采集指定页面作为文档发布源 * - * @version $Id: inc_coonepage.php 2022-07-01 tianya $ + * @version $Id: inc_coonepage.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeHttpDown; -helper("charset"); +require_once(DEDEINC.'/charset.func.php'); /** * 获取一个页面 * @@ -19,11 +18,11 @@ helper("charset"); */ function CoOnePage($gurl) { - global $dsql, $cfg_auot_description; + global $dsql, $cfg_auot_description, $cfg_soft_lang; $redatas = array('title' => '', 'body' => '', 'source' => '', 'writer' => '', 'description' => '', 'keywords' => ''); $redatas['source'] = preg_replace("/(http|https):\/\//i", "", $gurl); $redatas['source'] = preg_replace("/\/(.*)$/i", "", $redatas['source']); - $row = $dsql->GetOne("SELECT * FROM `#@__co_onepage` WHERE url LIKE '".$redatas['source']."'"); + $row = $dsql->GetOne("SELECT * FROM `#@__co_onepage` WHERE url LIKE '".$redatas['source']."' "); $s = $e = ''; if (is_array($row)) { list($s, $e) = explode('{@body}', $row['rule']); @@ -38,8 +37,14 @@ function CoOnePage($gurl) $body = $htd->GetHtml(); if ($body != '') { //编码自动转换 - if ($row['lang'] == 'gb2312') { - $body = gb2utf8($body); + if ($cfg_soft_lang == 'utf-8') { + if ($row['lang'] == 'gb2312') { + $body = gb2utf8($body); + } + } else if ($cfg_soft_lang == 'gb2312') { + if ($row['lang'] == 'utf-8') { + $body = utf82gb($body); + } } //获取标题 $inarr = array(); diff --git a/src/admin/inc/inc_list_functions.php b/src/admin/inc/inc_list_functions.php index b5948527..2eff082d 100644 --- a/src/admin/inc/inc_list_functions.php +++ b/src/admin/inc/inc_list_functions.php @@ -2,7 +2,7 @@ /** * 列表对应函数 * - * @version $Id: inc_list_functions.php 2022-07-01 tianya $ + * @version $Id: inc_list_functions.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -23,7 +23,7 @@ function GetTypename($tid) return base64_decode($cfg_Cs[$tid][3]); } } else { - $row = $dsql->GetOne("SELECT typename FROM `#@__arctype` WHERE id = '{$tid}'"); + $row = $dsql->GetOne("SELECT typename FROM #@__arctype WHERE id = '{$tid}'"); unset($dsql); unset($cfg_Cs); return isset($row['typename']) ? $row['typename'] : ''; @@ -70,18 +70,18 @@ function CheckPic($picname) if ($picname != "") { return $picname; } else { - return "/static/web/img/thumbnail.jpg"; + return "/static/web/img/defaultpic.jpg"; } } //判断内容是否生成网页 function IsHtmlArchives($ismake) { if ($ismake == 1) { - return Lang("ismake_1"); + return "已生成"; } else if ($ismake == -1) { - return Lang("ismake_-1"); + return "仅动态"; } else { - return "".Lang('ismake_0').""; + return "未生成"; } } //获得内容的限定级别名称 @@ -89,7 +89,7 @@ function GetRankName($arcrank) { global $arcArray, $dsql; if (!is_array($arcArray)) { - $dsql->SetQuery("SELECT * FROM `#@__arcrank`"); + $dsql->SetQuery("SELECT * FROM `#@__arcrank` "); $dsql->Execute(); while ($row = $dsql->GetObject()) { $arcArray[$row->rank] = $row->membername; @@ -98,14 +98,14 @@ function GetRankName($arcrank) if (isset($arcArray[$arcrank])) { return $arcArray[$arcrank]; } else { - return Lang("unlimited"); + return "不限"; } } //判断内容是否为图片文档 function IsPicArchives($picname) { if ($picname != '') { - return "[".Lang('img')."]"; + return "[图]"; } else { return ''; } diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 9eb279bd..d1043081 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -2,22 +2,21 @@ /** * 后台管理菜单项 * - * @version $Id: inc_menu.php 2022-07-01 tianya $ + * @version $Id: inc_menu.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/../config.php"); -require_once(dirname(__FILE__)."/inc_menu_module.php"); //载入可发布频道 $addset = ''; //检测可用的内容模型 if ($cfg_admin_channel = 'array' && count($admin_catalogs) > 0) { $admin_catalog = join(',', $admin_catalogs); - $dsql->SetQuery("SELECT channeltype FROM `#@__arctype` WHERE id IN({$admin_catalog}) GROUP BY channeltype"); + $dsql->SetQuery("SELECT channeltype FROM `#@__arctype` WHERE id IN({$admin_catalog}) GROUP BY channeltype "); } else { - $dsql->SetQuery("SELECT channeltype FROM `#@__arctype` GROUP BY channeltype"); + $dsql->SetQuery("SELECT channeltype FROM `#@__arctype` GROUP BY channeltype "); } $dsql->Execute(); $candoChannel = ''; @@ -25,104 +24,100 @@ while ($row = $dsql->GetObject()) { $candoChannel .= ($candoChannel == '' ? $row->channeltype : ','.$row->channeltype); } if (empty($candoChannel)) $candoChannel = 1; -$dsql->SetQuery("SELECT id,nid,typename,addcon,mancon FROM `#@__channeltype` WHERE id IN({$candoChannel}) AND id<>-1 AND isshow=1 ORDER BY id ASC"); +$dsql->SetQuery("SELECT id,typename,addcon,mancon FROM `#@__channeltype` WHERE id IN({$candoChannel}) AND id<>-1 AND isshow=1 ORDER BY id ASC"); $dsql->Execute('mm'); while ($row = $dsql->GetObject('mm')) { - $name = $row->typename; - if ($dlang->Exists("ch_{$row->nid}")) { - $name = "ch_{$row->nid}"; - } - $addset .= ""; + $addset .= ""; } $helpUrl = DEDEBIZURL."/help"; $gitUrl = DEDEBIZURL."/git"; $dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; -if ($cUserLogin->getUserType() >= 10) { - $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " - - - - - +if ($cuserLogin->getUserType() >= 10) { + $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " + + + + + ")." - - - - - - + + + + + + "; - $adminMenu2 = " - - - - - - + $adminMenu2 = " + + + + + + + - - - - - - - - - - - ".(DEDEBIZ_SAFE_MODE? "" : "")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." - - + + + + + + + + + + + ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE? "" : "")." + + "; } -$menusMain = " - - - - - - +$menusMain = " + + + + + + - + $addset - + - - - - + + + + $adminMenu1 - - - - - - - - ".(DEDEBIZ_SAFE_MODE? "" : "")." + + + + + + + + ".(DEDEBIZ_SAFE_MODE? "" : "")." -{$GLOBALS['menusMoudle']} - - - - - - - - + + + + + + + + - - - - - + + + + + $adminMenu2 - - - + + + "; ?> \ No newline at end of file diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index 731e4f19..a59c629b 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -2,17 +2,16 @@ /** * 管理菜单函数 * - * @version $Id: inc_menu_func.php 2022-07-01 tianya $ + * @version $Id: inc_menu_func.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/../config.php"); -$headTemplet = '
  • ~channelname~
      '; -$footTemplet = "
    • "; +require_once(DEDEINC."/dedetag.class.php"); +$headTemplet = "
    ~channelname~
      "; +$footTemplet = "
    "; $itemTemplet = "
  • ~link~
    • "; function GetMenus($userrank, $topos = 'main') { @@ -31,9 +30,11 @@ function GetMenus($userrank, $topos = 'main') $dtp2->SetNameSpace('m', '<', '>'); $m = 0; foreach ($dtp->CTags as $i => $ctag) { - if ($ctag->GetName() == 'top' && ($ctag->GetAtt('rank') == '' || UserLogin::TestPurview($ctag->GetAtt('rank')))) { + if ($ctag->GetName() == 'top' && ($ctag->GetAtt('rank') == '' || TestPurview($ctag->GetAtt('rank')))) { if ($openitem != 999 && !preg_match("#".$openitem.'_'."#", $ctag->GetAtt('item')) && $openitem != 100) continue; - $htmp = str_replace("~channelname~", Lang($ctag->GetAtt("name")), $headTemplet); + $m++; + echo ""; + $htmp = str_replace("~channelname~", $ctag->GetAtt("name"), $headTemplet); if (empty($openitem) || $openitem == 100) { if ($ctag->GetAtt('notshowall') == '1') continue; $htmp = str_replace('~display~', $ctag->GetAtt('display'), $htmp); @@ -43,21 +44,16 @@ function GetMenus($userrank, $topos = 'main') else $htmp = str_replace('~display~', 'none', $htmp); } - $icon = 'fa-plug'; - if ($ctag->GetAtt('icon') != '') { - $icon = $ctag->GetAtt('icon'); - } - $htmp = str_replace('~icon~', $icon, $htmp); $htmp = str_replace('~cc~', $m.'_'.$openitem, $htmp); echo $htmp; $dtp2->LoadSource($ctag->InnerText); foreach ($dtp2->CTags as $j => $ctag2) { $ischannel = trim($ctag2->GetAtt('ischannel')); - if ($ctag2->GetName() == 'item' && ($ctag2->GetAtt('rank') == '' || UserLogin::TestPurview($ctag2->GetAtt('rank')))) { - $link = "    ".Lang($ctag2->GetAtt('name')).""; + if ($ctag2->GetName() == 'item' && ($ctag2->GetAtt('rank') == '' || TestPurview($ctag2->GetAtt('rank')))) { + $link = "".$ctag2->GetAtt('name').""; if ($ischannel == '1') { if ($ctag2->GetAtt('addalt') != '') { - $addalt = Lang($ctag2->GetAtt('addalt')); + $addalt = $ctag2->GetAtt('addalt'); } else { $addalt = '录入新内容'; } @@ -66,7 +62,10 @@ function GetMenus($userrank, $topos = 'main') } else { $addico = 'fa-plus-circle'; } - $link = "$link"; + $link = "
    +
    $link
    +
    +
    "; } else { $link .= ""; } @@ -75,6 +74,7 @@ function GetMenus($userrank, $topos = 'main') } } echo $footTemplet; + echo ""; } } }//End Function diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php index bf359aca..c26da7c7 100644 --- a/src/admin/inc/inc_menu_module.php +++ b/src/admin/inc/inc_menu_module.php @@ -2,7 +2,7 @@ /** * 模块菜单 * - * @version $Id: inc_menu_module.php 2022-07-01 tianya $ + * @version $Id: inc_menu_module.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license @@ -34,17 +34,17 @@ while ($row = $dsql->GetObject()) { $plusset .= $row->menustring."\r\n"; } $adminMenu = ''; -if ($cUserLogin->getUserType() >= 10) { - $adminMenu = DEDEBIZ_SAFE_MODE? "" : " - - - +if ($cuserLogin->getUserType() >= 10) { + $adminMenu = DEDEBIZ_SAFE_MODE? "" : " + + + "; } $menusMoudle = " $adminMenu - - + + $plusset $moduleset diff --git a/src/admin/index.php b/src/admin/index.php index e795ff3d..f291ce00 100644 --- a/src/admin/index.php +++ b/src/admin/index.php @@ -15,6 +15,7 @@ if (preg_match("#PHP (.*) Development Server#", $_SERVER['SERVER_SOFTWARE'])) { } } require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC.'/dedetag.class.php'); include(DEDEADMIN.'/templets/index.htm'); exit(); ?> \ No newline at end of file diff --git a/src/admin/index_body.php b/src/admin/index_body.php index 4d81acbc..7426e368 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeBIZ; -use DedeBIZ\libraries\DedeStatistics; require(dirname(__FILE__).'/config.php'); -helper('image'); +require(DEDEINC.'/image.func.php'); +require(DEDEINC.'/dedetag.class.php'); //默认主页 if (empty($dopost)) { require(DEDEINC.'/inc/inc_fun_funAdmin.php'); @@ -32,7 +31,7 @@ else if ($dopost == 'setskin') { } elseif ($dopost == 'get_seo') { //直接采用DedeBIZ重写方法 exit; -} elseif ($dopost == 'get_articles'){ +} elseif($dopost == 'get_articles'){ ?> 1) + if(count($arcArr) > 1) { foreach($arcArr as $row) { - if (trim($row['editcon'])==''){ + if(trim($row['editcon'])==''){ $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank']==-1? " [".Lang('not_approved')."]":""; + $rowarcrank = $row['arcrank']==-1? " [未审核]":""; $pubdate = GetDateMk($row['pubdate']); echo ""; } } else { ?> - +
    {$row['title']}{$rowarcrank}{$pubdate}
    暂无文档
    -1001, - "msg" => Lang('admin_auth_no_openssl'), + "msg" => "PHP不支持OpenSSL，无法完成商业版授权。", "result" => null, )); exit; @@ -75,7 +74,7 @@ else if ($dopost == 'setskin') { if (empty($cfg_auth_code)) { echo json_encode(array( "code" => -1002, - "msg" => Lang('admin_auth_no_enabled'), + "msg" => "无法启动商业版组件《商业版授权》", "result" => null, )); exit; @@ -83,7 +82,7 @@ else if ($dopost == 'setskin') { openssl_public_decrypt(base64_decode($cfg_auth_code), $decotent, DEDEPUB); $core_info = new stdClass; if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { - $client = new DedeBIZ($cfg_bizcore_hostname, $cfg_bizcore_port); + $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client->appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $core_info = $client->SystemInfo(); @@ -98,7 +97,7 @@ else if ($dopost == 'setskin') { "result" => array( "domain" => $res->domain, "title" => $res->title, - "stype" => $res->stype == 1 ? Lang('company') : Lang('person'), + "stype" => $res->stype == 1 ? "企业单位" : "个人", "auth_version" => $res->auth_version, "auth_at" => date("Y-m-d", $res->auth_at), "core" => $core_info, @@ -107,6 +106,7 @@ else if ($dopost == 'setskin') { } } } elseif ($dopost == 'get_statistics') { + require_once(DEDEINC."/libraries/statistics.class.php"); //获取统计信息 $sdate = empty($sdate) ? 0 : intval($sdate); $stat = new DedeStatistics; @@ -118,6 +118,7 @@ else if ($dopost == 'setskin') { )); exit; } elseif ($dopost == 'get_statistics_multi') { + require_once(DEDEINC."/libraries/statistics.class.php"); //获取统计信息 $sdates = empty($sdates) ? array() : explode(",",preg_replace("[^\d\,]","",$sdates)) ; $stat = new DedeStatistics; @@ -129,8 +130,8 @@ else if ($dopost == 'setskin') { )); exit; } elseif ($dopost == 'safe_mode') { - $safemsg = Lang('admin_safe_msg'); - $unsafemsg = Lang('admin_unsafe_msg'); + $safemsg = "系统环境运行模式为：安全模式，安全模式下无法使用“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能，如果您需要使用这些功能，在/system/common.inc.php文件中代码`DEDEBIZ_SAFE_MODE`后面值TRUE修改为FALSE"; + $unsafemsg = "系统环境运行模式为：非安全模式，系统“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能，存在一定安全风险，强烈建议，您在/system/common.inc.php文件中代码`DEDEBIZ_SAFE_MODE`后面值FALSE修改为TRUE"; $modeStr = DEDEBIZ_SAFE_MODE? $safemsg : $unsafemsg; ShowMsg($modeStr, "javascript:;"); exit; diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index 14083537..4536bafa 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -1,13 +1,4 @@ GetOne($sql); if (is_array($row)) { if ($row['pwd'] == 'f297a57a5a743894a0e4') { @@ -132,29 +123,29 @@ if (!function_exists('IsWritable')) { $safeMsg = array(); $dirname = str_replace('index_body.php', '', strtolower($_SERVER['PHP_SELF'])); if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) { - $safeMsg[] = Lang('admin_testenv_admin'); + $safeMsg[] = '后台管理名称包默认名称admin，强烈建议您进行修改'; } if (IsWritable(DEDEDATA.'/common.inc.php')) { - $safeMsg[] = Lang('admin_testenv_writeable'); + $safeMsg[] = '数据配置data/common.inc.php文件，强烈建议以管理员权限设置禁止写入和执行'; } if (!IsSSL()) { - $safeMsg[] = Lang('admin_testenv_isssl'); + $safeMsg[] = '站点尚未启用HTTPS，强烈建议您配置HTTPS证书'; } if (version_compare(PHP_VERSION, '5.3.0', '<')) { - $safeMsg[] = Lang('admin_testenv_phpver'); + $safeMsg[] = 'PHP版本过低会无法正常使用系统，强烈建议升级到PHP7.X'; } if (!DEDEBIZ_SAFE_MODE) { - $safeMsg[] = Lang('admin_testenv_safemode'); + $safeMsg[] = '系统运行环境为：非安全模式，强烈建议启用安全模式 [查看]'; } $rs = TestAdminPWD(); if ($rs < 0) { - $linkurl = '['.Lang('edit').']'; + $linkurl = '[修改]'; switch ($rs) { case -1: - $msg = Lang('admin_testenv_name',array('link'=>$linkurl)); + $msg = "默认管理员名称admin没有修改，建议您修改 {$linkurl}"; break; case -2: - $msg = Lang('admin_testenv_pwd',array('link'=>$linkurl)); + $msg = "默认管理员名称和密码没有修改，建议您修改 {$linkurl}"; break; } $safeMsg[] = $msg; @@ -163,7 +154,7 @@ if ($rs < 0) { 0) { ?> -
    +
    $val) { @@ -174,4 +165,6 @@ if (count($safeMsg) > 0) { } ?>
    - \ No newline at end of file + \ No newline at end of file diff --git a/src/admin/js/album.js b/src/admin/js/album.js index 76e451e5..765ec6e9 100644 --- a/src/admin/js/album.js +++ b/src/admin/js/album.js @@ -95,7 +95,7 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) { newobj.style.top = hpos; newobj.style.left = 100; document.body.appendChild(newobj); - newobj.innerHTML = ' 正在上传'; + newobj.innerHTML = ''; } newobj.style.display = 'block'; //提交后还原form的action等参数 diff --git a/src/admin/js/codemirror.js b/src/admin/js/codemirror.js index e142f1db..392fc73c 100644 --- a/src/admin/js/codemirror.js +++ b/src/admin/js/codemirror.js @@ -1543,7 +1543,7 @@ var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue } if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) || - fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) + FROMCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) { return true } } } } @@ -3423,10 +3423,10 @@ if (viewport && viewport.ensure) { var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line; if (ensureFrom < from) { - from = ensureFrom; + FROM = ensureFrom; to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight); } else if (Math.min(ensureTo, doc.lastLine()) >= to) { - from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); + FROM = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); to = ensureTo; } } @@ -4130,7 +4130,7 @@ if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom); } if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo); } if (sawCollapsedSpans) { - from = visualLineNo(cm.doc, from); + FROM = visualLineNo(cm.doc, from); to = visualLineEndNo(cm.doc, to); } @@ -5276,7 +5276,7 @@ function filterChange(doc, change, update) { var obj = { canceled: false, - from: change.from, + FROM: change.from, to: change.to, text: change.text, origin: change.origin, @@ -5515,7 +5515,7 @@ var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change"); if (changeHandler || changesHandler) { var obj = { - from: from, to: to, + FROM: from, to: to, text: change.text, removed: change.removed, origin: change.origin @@ -5911,7 +5911,7 @@ var line = this.lines[i]; var span = getMarkedSpanFor(line.markedSpans, this); if (span.from != null) { - from = Pos(lineObj ? line : lineNo(line), span.from); + FROM = Pos(lineObj ? line : lineNo(line), span.from); if (side == -1) { return from } } if (span.to != null) { @@ -5989,7 +5989,7 @@ } if (marker.collapsed) { if (conflictingCollapsedRange(doc, from.line, from, to, marker) || - from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) + FROM.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) { throw new Error("Inserting collapsed marker partially overlapping an existing one") } seeCollapsedSpans(); } @@ -6169,7 +6169,7 @@ setSelection(this, simpleSelection(top), sel_dontScroll); }), replaceRange: function(code, from, to, origin) { - from = clipPos(this, from); + FROM = clipPos(this, from); to = to ? clipPos(this, to) : from; replaceRange(this, code, from, to, origin); }, @@ -6413,7 +6413,7 @@ return markers }, findMarks: function(from, to, filter) { - from = clipPos(this, from); to = clipPos(this, to); + FROM = clipPos(this, from); to = clipPos(this, to); var found = [], lineNo = from.line; this.iter(from.line, to.line + 1, function (line) { var spans = line.markedSpans; @@ -6997,11 +6997,11 @@ } }); }, deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({ - from: Pos(range.from().line, 0), + FROM: Pos(range.from().line, 0), to: clipPos(cm.doc, Pos(range.to().line + 1, 0)) }); }); }, delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({ - from: Pos(range.from().line, 0), to: range.from() + FROM: Pos(range.from().line, 0), to: range.from() }); }); }, delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { var top = cm.charCoords(range.head, "div").top + 5; @@ -9073,11 +9073,11 @@ var fromIndex, fromLine, fromNode; if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { - fromLine = lineNo(display.view[0].line); - fromNode = display.view[0].node; + FROMLine = lineNo(display.view[0].line); + FROMNode = display.view[0].node; } else { - fromLine = lineNo(display.view[fromIndex].line); - fromNode = display.view[fromIndex - 1].node.nextSibling; + FROMLine = lineNo(display.view[fromIndex].line); + FROMNode = display.view[fromIndex - 1].node.nextSibling; } var toIndex = findViewIndex(cm, to.line); var toLine, toNode; @@ -9254,7 +9254,7 @@ for (;;) { walk(from); if (from == to) { break } - from = from.nextSibling; + FROM = from.nextSibling; extraLinebreak = false; } return text diff --git a/src/admin/js/dialog.js b/src/admin/js/dialog.js index 61957758..9da64a9a 100644 --- a/src/admin/js/dialog.js +++ b/src/admin/js/dialog.js @@ -23,7 +23,7 @@ function AlertMsg(title, id) { titlecolor = "#254015";//标题颜色 titlebg = "#f8f8f8"; //遮罩背景设置 - content = "
    "+dedeLang('load_failed')+"
    "; + content = "
    载入失败
    "; var sWidth, sHeight; sWidth = screen.availWidth; if (screen.availHeight > document.body.scrollHeight) { @@ -65,7 +65,7 @@ function AlertMsg(title, id) { thObj.style.color = titlecolor; thObj.style.fontWeight = 'bold'; thObj.style.background = titlebg; - var titleStr = "    "+dedeLang('close')+"" + "" + title + ""; + var titleStr = "关闭" + "" + title + ""; thObj.innerHTML = titleStr; //创建内容 var bodyObj = document.createElement("div"); diff --git a/src/admin/js/global.js b/src/admin/js/global.js index 5e410589..86768ef9 100644 --- a/src/admin/js/global.js +++ b/src/admin/js/global.js @@ -14,7 +14,7 @@ function browserVersion(types) { var matches = re.exec(USERAGENT); var ver = matches != null ? matches[2] : 0; other = ver !== 0 ? 0 : other; - } else { + }else { var ver = 0; } eval('BROWSER.' + i + '= ver'); diff --git a/src/admin/js/handlers.js b/src/admin/js/handlers.js index 776f2093..4078bf79 100644 --- a/src/admin/js/handlers.js +++ b/src/admin/js/handlers.js @@ -14,7 +14,7 @@ function addImage(src, pid) { albImg++; if (pid != 0) { albImg = 'ok' + pid; - delstr = 'Lang("delete")'; + delstr = '删除'; } else { albImg = 'err' + albImg; } @@ -25,8 +25,8 @@ function addImage(src, pid) { if (typeof arctype != 'undefined' && arctype == 'article') { iptwidth = 100; if (pid != 0) { - newImgDiv.innerHTML = ''+delstr; + newImgDiv.innerHTML = '' + delstr; } } - newImgDiv.innerHTML += '
    简介：
    '; + newImgDiv.innerHTML += '
    名称：
    '; } \ No newline at end of file diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 029a8b6b..7b258240 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -20,7 +20,7 @@ function DedeCopyToClipboard(text) { } else { var textarea = document.createElement('textarea'); document.body.appendChild(textarea); - //隐藏此输入框 + // 隐藏此输入框 textarea.style.position = 'fixed'; textarea.style.clip = 'rect(0 0 0 0)'; textarea.style.top = '10px'; @@ -43,32 +43,33 @@ $(function () { } }); }); -function copy(){ +function copyFn(){ var val = document.getElementById('text'); window.getSelection().selectAllChildren(val); - document.execCommand ("copy"); + document.execCommand ("Copy"); //alert("成功复制系统信息"); } //Dedebiz info var dedebizInfo; function ViewDedeBIZ() { + console.log(dedebizInfo); ShowMsg(` - + - + - + - + @@ -83,32 +84,24 @@ function LoadServer() { if (typeof rsp.result.domain !== "undefined") { infoStr += ` - - + + `; } if (typeof rsp.result.title !== "undefined") { infoStr += ` - - - - `; - } - if (typeof rsp.result.stype !== "undefined") { - infoStr += ` - - - + + `; } if (typeof rsp.result.auth_version !== "undefined" && typeof rsp.result.auth_at !== "undefined") { infoStr += ` - - + + `; } @@ -116,16 +109,16 @@ function LoadServer() { //下面是DedeBIZ Core组件信息 infoStr += ` - - + + `; } else { dedebizInfo = JSON.parse(rsp.result.core.data); infoStr += ` - - + + `; } @@ -133,13 +126,13 @@ function LoadServer() { $("#system-info").html(infoStr); } else { $("#system-info").html(` -
    版本号：版本号： V${dedebizInfo.result.server_version}
    运行时间：运行时间： ${dedebizInfo.result.server_run_time}
    服务器系统：服务器系统： ${dedebizInfo.result.server_goos}（${dedebizInfo.result.server_goarch}）
    内存占用：内存占用： ${dedebizInfo.result.server_memory_usage}%
    `+dedeLang('admin_auth_domain')+`${rsp.result.domain} 证书授权域名：${rsp.result.domain}
    `+dedeLang('admin_auth_sitename')+`${rsp.result.title}
    `+dedeLang('admin_auth_sitetype')+`${rsp.result.stype}站点名称：${rsp.result.title}（${rsp.result.stype}）
    `+dedeLang('admin_auth_version')+`V${rsp.result.auth_version}.x.x（`+dedeLang('time')+`：${rsp.result.auth_at}）授权版本：${rsp.result.auth_version}.x.x（时间：${rsp.result.auth_at}）
    `+dedeLang('admin_auth_corever')+``+dedeLang('admin_auth_enable_core')+`版本组件：启动组件
    `+dedeLang('admin_auth_corever')+``+dedeLang('admin_auth_core_info')+`版本组件：组件信息
    +
    - + - +
    `+dedeLang('admin_auth_no_bizcore')+`，${rsp.msg}当前站点为社区版，${rsp.msg}
    `+dedeLang('admin_auth_noauth_msg')+`如果您已购买商业版授权，可以在我们的授权中心查询到相信关授权信息，如果查询结果与实际授权不符，则说明您可能购买了非法商业授权，请及时与我们取得联系。
    @@ -258,7 +251,7 @@ async function LoadStatChart() { borderWidth: 1 } , { - label: dedeLang('admin_stat_view'), + label: 'VV', data: vvs, borderColor: 'rgba(75, 192, 192, 1)', backgroundColor: 'rgba(75, 192, 192, 0.2)', diff --git a/src/admin/js/list.js b/src/admin/js/list.js index 9a88253b..45e553e5 100644 --- a/src/admin/js/list.js +++ b/src/admin/js/list.js @@ -38,7 +38,7 @@ function moveArc(e, obj, cid){ ShowMsg('必须选择一个或多个文档'); return; } - LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', '450px', '180px'); + LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', '460px', '180px'); ChangeFullDiv('show'); } function adArc(aid){ @@ -55,7 +55,7 @@ function cAtts(jname, e, obj) ShowMsg('必须选择一个或多个文档'); return; } - LoadQuickDiv(e, 'archives_do.php?dopost=attsDlg&qstr='+qstr+'&dojob='+jname+'&rnd='+Math.random(), 'attsDlg', '450px', '180px'); + LoadQuickDiv(e, 'archives_do.php?dopost=attsDlg&qstr='+qstr+'&dojob='+jname+'&rnd='+Math.random(), 'attsDlg', '460px', '180px'); ChangeFullDiv('show', screeheight); } function delArc(aid){ diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 420d04e7..391be322 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -102,7 +102,7 @@ function SeePicNew(f, imgdid, frname, hpos, acname) { newobj.style.left = 100; newobj.style.display = 'block'; document.body.appendChild(newobj); - newobj.innerHTML = '上传中...'; + newobj.innerHTML = '上传中...'; } newobj.style.display = 'block'; //提交后还原form的action等参数 @@ -177,6 +177,7 @@ function PutVote(str) { parent.document.form1.voteid.value = str; tb_remove(true); } + } function ClearDivCt(objname) { if (!$Obj(objname)) return; @@ -212,7 +213,7 @@ function LoadNewDiv(e, surl, oname) { if ($Nav() == 'IE') { var posLeft = window.event.clientX - 20; var posTop = window.event.clientY - 30; - //IE下scrollTop的兼容性问题 + // IE下scrollTop的兼容性问题 var scrollTop = document.documentElement.scrollTop || window.pageYOffset; if (typeof (scrollTop) == 'undefined') scrollTop = document.body.scrollTop; posTop += scrollTop; @@ -313,10 +314,10 @@ function LoadQuickDiv(e, surl, oname, w, h) { } if (posTop > 500) posTop = 500; if (posLeft < 50) posLeft = 50; - newobj.style.minWidth = "450px"; + newobj.style.minWidth = "460px"; newobj.style.top = posTop + "px"; newobj.style.left = posLeft + "px"; - newobj.innerHTML = '
    Loading...
    '; + newobj.innerHTML = ''; newobj.style.display = 'block'; fetch(surl).then(resp => resp.text()).then((d) => { newobj.innerHTML = d; @@ -342,14 +343,14 @@ function getEvent() { } return null; } -/* -模拟ondrop事件相关代码 +//模拟ondrop事件相关代码 +/*---------------------------- leftLeaning = 300; 如果对象内容固定，用onmousedown=DropStart去除底下的DropStop newobj.ondblclick = DropStart; newobj.onmousemove = DropMove; newobj.onmousedown = DropStop; -*/ +----------------------------*/ function DropStart() { this.style.cursor = 'move'; } @@ -370,12 +371,12 @@ function DropMove() { this.style.top = posTop; this.style.left = posLeft - leftLeaning; } -/* -对指定的元素绑定move事件 +//对指定的元素绑定move事件 +/*----------------------------- onmousemove="DropMoveHand('divname', 225);" onmousedown="DropStartHand();" onmouseup="DropStopHand();" -*/ +-----------------------------*/ function DropStartHand() { canMove = (canMove ? false : true); } @@ -511,18 +512,18 @@ function guid() { } return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4()); } -//函数会返回一个modalID，通过这个ID可自已定义一些方法 -//这里用到了一个展开语法 -//https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax +// 函数会返回一个modalID，通过这个ID可自已定义一些方法 +// 这里用到了一个展开语法 +// https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax function ShowMsg(content, ...args) { - title = typeof dedeLang==="function"? dedeLang("msg_title") : '信息提示'; + title = "系统提示"; size = ""; if (typeof content == "undefined") content = ""; modalID = guid(); var footer = ``; var noClose = false; if (args.length == 1) { - //存在args参数 + // 存在args参数 if (typeof args[0].title !== 'undefined' && args[0].title != "") { title = args[0].title; } @@ -641,7 +642,7 @@ $(document).ready(function () { litpicImgSrc = ""; litpicImg = ""; $("#picname").val(litpicImg); - $("#litPic").attr("src", "../../static/web/img/thumbnail.jpg"); + $("#litPic").attr("src", "../../static/web/img/defaultpic.jpg"); }) //添加图片 $("#iptAddImages").change(function (event) { @@ -688,7 +689,7 @@ $(document).ready(function () { '"0>

    宽度：px，高度：px

    ' + optButton + '
    ', { footer: footer, noClose: false, - title: 'DedeBIZ缩略图裁剪', + title: '缩略图裁剪', }); setTimeout(function () { $("#cropImg" + mdlCropperID).cropper(optCropper); diff --git a/src/admin/log_edit.php b/src/admin/log_edit.php index f21bca6b..6aff6504 100644 --- a/src/admin/log_edit.php +++ b/src/admin/log_edit.php @@ -8,17 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Log'); +CheckPurview('sys_Log'); if (empty($dopost)) { - ShowMsg(Lang("log_list_err_noparms"), "javascript:;"); + ShowMsg("您没指定任何参数", "javascript:;"); exit(); } //清空所有日志 if ($dopost == "clear") { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__log`"); - ShowMsg(Lang("log_list_success_clearall"), "log_list.php"); + $dsql->ExecuteNoneQuery("DELETE FROM #@__log"); + ShowMsg("成功清空所有日志", "log_list.php"); exit(); } else if ($dopost == "del") { $bkurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "log_list.php"; @@ -32,11 +31,11 @@ if ($dopost == "clear") { } } if ($dquery != "") $dquery = " where ".$dquery; - $dsql->ExecuteNoneQuery("DELETE FROM `#@__log` $dquery"); - ShowMsg(Lang("content_delete_success"), $bkurl); + $dsql->ExecuteNoneQuery("DELETE FROM #@__log $dquery"); + ShowMsg("成功删除指定的日志", $bkurl); exit(); } else { - ShowMsg(Lang("log_list_err_nomethod"), "javascript:;"); + ShowMsg("无法识别您的请求", "javascript:;"); exit(); } ?> \ No newline at end of file diff --git a/src/admin/log_list.php b/src/admin/log_list.php index 5bff642e..66f090f0 100644 --- a/src/admin/log_list.php +++ b/src/admin/log_list.php @@ -8,22 +8,21 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Log'); +CheckPurview('sys_Log'); +require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEINC."/common.func.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $sql = $where = ""; if (empty($adminid)) $adminid = 0; 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%' "; +if ($adminid > 0) $where .= " AND #@__log.adminid='$adminid' "; +if ($cip != "") $where .= " AND #@__log.cip LIKE '%$cip%' "; if ($dtime > 0) { $nowtime = time(); $starttime = $nowtime - ($dtime * 24 * 3600); - $where .= " AND `#@__log`.dtime>'$starttime' "; + $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 = ""; diff --git a/src/admin/login.php b/src/admin/login.php index 059d3ed4..c013f3d4 100644 --- a/src/admin/login.php +++ b/src/admin/login.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -define('LANGSECTION', 'admin'); require_once(dirname(__FILE__).'/../system/common.inc.php'); +require_once(DEDEINC.'/userlogin.class.php'); if (empty($dopost)) $dopost = ''; if (empty($gotopage)) $gotopage = ''; $gotopage = RemoveXSS($gotopage); //检测安装目录安全性 if (is_dir(dirname(__FILE__).'/../install')) { if (!file_exists(dirname(__FILE__).'/../install/install_lock.txt')) { - $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or DedeAlert(Lang('installed_not_writeable'), ALERT_DANGER); + $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限，无法进行写入锁定文件，请安装完毕删除安装目录'); fwrite($fp, 'ok'); fclose($fp); } @@ -31,7 +30,7 @@ if (is_dir(dirname(__FILE__).'/../install')) { //检测后台目录是否更名 $cururl = GetCurUrl(); if (preg_match('/admin\/login/i', $cururl)) { - $redmsg = '
    '.Lang('admin_path_suggest').'
    '; + $redmsg = '
    您的管理目录的名称中包含默认名称admin，建议把它修改为其它名称，那样会更安全
    '; } else { $redmsg = ''; } @@ -43,38 +42,38 @@ if ($dopost == 'login') { $svali = strtolower(GetCkVdValue()); if ($validate == '' || $validate != $svali) { ResetVdValue(); - ShowMsg(Lang('incorrect_verification_code'), 'login.php', 0, 1000); + ShowMsg('验证码不正确', 'login.php', 0, 1000); exit; } else { - $cUserLogin = new UserLogin($admindir); + $cuserLogin = new userLogin($admindir); if (!empty($userid) && !empty($pwd)) { - $res = $cUserLogin->checkUser($userid, $pwd); + $res = $cuserLogin->checkUser($userid, $pwd); //success if ($res == 1) { - $cUserLogin->keepUser(); + $cuserLogin->keepUser(); if (!empty($gotopage)) { - ShowMsg(Lang('login_success'), $gotopage); + ShowMsg('成功登录，正在转向管理管理主页', $gotopage); exit(); } else { - ShowMsg(Lang('login_success'), 'index.php'); + ShowMsg('成功登录，正在转向管理管理主页', 'index.php'); exit(); } } //error else if ($res == -1) { ResetVdValue(); - ShowMsg(Lang('username_not_exists'), 'login.php', 0, 1000); + ShowMsg('您的用户名不存在', 'login.php', 0, 1000); exit; } else { ResetVdValue(); - ShowMsg(Lang('password_incorrect'), 'login.php', 0, 1000); + ShowMsg('您的密码错误', 'login.php', 0, 1000); exit; } } //password empty else { ResetVdValue(); - ShowMsg(Lang('username_password_incorrect'), 'login.php', 0, 1000); + ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000); exit; } } diff --git a/src/admin/makehtml_all.php b/src/admin/makehtml_all.php index 88fb7ea5..617cf490 100644 --- a/src/admin/makehtml_all.php +++ b/src/admin/makehtml_all.php @@ -8,32 +8,42 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\PartView; require_once(dirname(__FILE__)."/config.php"); -require_once(DEDEINC."/channel/channelunit.func.php"); +require_once(DEDEINC."/channelunit.func.php"); $action = (empty($action) ? '' : $action); if ($action == '') { require_once(DEDEADMIN."/templets/makehtml_all.htm"); exit(); } else if ($action == 'make') { + //step = 1 更新主页、step = 2 更新内容、step = 3 更新栏目 if (empty($step)) $step = 1; //更新文档前优化数据 + /*------------------- + function _1_OptimizeData1() + ---------------------*/ if ($step == 1) { $starttime = GetMkTime($starttime); $mkvalue = ($uptype == 'time' ? $starttime : $startid); OptimizeData($dsql); - ShowMsg(Lang("makehtml_all_step_1"), "makehtml_all.php?action=make&step=2&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成数据优化，现在开始更新文档", "makehtml_all.php?action=make&step=2&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新文档 - else if ($step == 2) { + /*------------------- + function _2_MakeArchives() + ---------------------*/ +else if ($step == 2) { include_once(DEDEADMIN."/makehtml_archives_action.php"); exit(); } //更新主页 + /*------------------------- + function _3_MakeHomePage() + -------------------*/ if ($step == 3) { + include_once(DEDEINC."/archive/partview.class.php"); $pv = new PartView(); - $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset`"); + $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset` "); $templet = str_replace("{style}", $cfg_df_style, $row['templet']); $homeFile = DEDEADMIN.'/'.$row['position']; $homeFile = str_replace("\\", '/', $homeFile); @@ -43,19 +53,22 @@ if ($action == '') { $pv->SaveToHtml($homeFile); $pv->Close(); } else { - if (file_exists($homeFile)) echo Lang("makehtml_all_suggest_delete")+$homeFile; + if (file_exists($homeFile)) echo "启用静态生成，建议删除"+$homeFile; } - ShowMsg(Lang("makehtml_all_step_3"), "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成更新所有文档，现在开始更新栏目页", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新栏目 - else if ($step == 4) { + /*------------------- + function _4_MakeCatalog() + --------------------*/ +else if ($step == 4) { $mkvalue = intval($mkvalue); $typeidsok = $typeids = array(); - $adminID = $cUserLogin->getUserID(); + $adminID = $cuserLogin->getUserID(); $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; if ($uptype == 'all' || empty($mkvalue)) { - ShowMsg(Lang("makehtml_all_empty_aids"), "makehtml_list_action.php?gotype=mkallct"); + ShowMsg("不需要进行初处理，现更新所有栏目", "makehtml_list_action.php?gotype=mkallct"); exit(); } else { if ($uptype == 'time') { @@ -81,7 +94,7 @@ if ($action == '') { } } } - $fp = fopen($mkcachefile, 'w') or die(Lang('makehtml_all_err_cache',array('mkcachefile'=>$mkcachefile))); + $fp = fopen($mkcachefile, 'w') or die("无法写入缓存文件：{$mkcachefile} 所以无法更新栏目"); if (count($typeidsok) > 0) { fwrite($fp, "<"."?php\r\n"); $i = -1; @@ -93,24 +106,28 @@ if ($action == '') { } fwrite($fp, "?".">"); fclose($fp); - ShowMsg(Lang("makehtml_all_step_4"), "makehtml_list_action.php?gotype=mkall"); + ShowMsg("完成栏目缓存处理，现转向更新栏目", "makehtml_list_action.php?gotype=mkall"); exit(); } else { fclose($fp); - ShowMsg(Lang("makehtml_all_no_to_opt"), "makehtml_all.php?action=make&step=10"); + ShowMsg("没有可更新的栏目，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } //成功状态 - else if ($step == 10) { - $adminID = $cUserLogin->getUserID(); + /*------------------- + function _10_MakeAllOK() + --------------------*/ +else if ($step == 10) { + $adminID = $cuserLogin->getUserID(); $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; @unlink($mkcachefile); OptimizeData($dsql); - ShowMsg(Lang("makehtml_all_step_10"), "javascript:;"); + ShowMsg("完成所有文件的更新", "javascript:;"); exit(); - } -} + }//make step + +}//action=='make' /** * 优化数据 * @@ -122,7 +139,7 @@ function OptimizeData($dsql) { global $cfg_dbprefix; $tptables = array("{$cfg_dbprefix}archives", "{$cfg_dbprefix}arctiny"); - $dsql->SetQuery("SELECT maintable,addtable FROM `#@__channeltype`"); + $dsql->SetQuery("SELECT maintable,addtable FROM `#@__channeltype` "); $dsql->Execute(); while ($row = $dsql->GetObject()) { $addtable = str_replace('#@__', $cfg_dbprefix, $row->addtable); @@ -130,6 +147,6 @@ function OptimizeData($dsql) } $tptable = ''; foreach ($tptables as $t) $tptable .= ($tptable == '' ? "`{$t}`" : ",`{$t}`"); - $dsql->ExecuteNoneQuery("OPTIMIZE TABLE $tptable;"); + $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE $tptable; "); } ?> \ No newline at end of file diff --git a/src/admin/makehtml_archives.php b/src/admin/makehtml_archives.php index 9374c922..578630e3 100644 --- a/src/admin/makehtml_archives.php +++ b/src/admin/makehtml_archives.php @@ -9,5 +9,6 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/typelink/typelink.class.php"); include DedeInclude('templets/makehtml_archives.htm'); ?> \ No newline at end of file diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index c13d4948..a3fc4b15 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\Archives; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_MakeHtml'); +CheckPurview('sys_MakeHtml'); +require_once(DEDEINC."/archive/archives.class.php"); $est1 = ExecTime(); $startid = (empty($startid) ? -1 : $startid); $endid = (empty($endid) ? 0 : $endid); @@ -52,7 +51,7 @@ if ($totalnum == 0) { $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` $idsql"); $totalnum = $row['dd']; //清空缓存 - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` "); } //获取记录，并生成网页 if ($totalnum > $startdd + $pagesize) { @@ -72,7 +71,7 @@ while ($row = $dsql->GetObject('out')) { $tjnum++; $id = $row->id; $ac = new Archives($id); - $rurl = $ac->MakeHtml(); + $rurl = $ac->MakeHtml(0); } $t2 = ExecTime(); $t2 = ($t2 - $est1); @@ -80,8 +79,8 @@ $ttime = time() - $sstime; $ttime = number_format(($ttime / 60), 2); //返回提示信息 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100; -$tjsta = "
    "; -$tjsta .= Lang('makehtml_archives_status',array('postion'=>$startdd + $pagesize,'ttime'=>$ttime,'tjlen'=>$tjlen)); +$tjsta = "
    "; +$tjsta .= "
    到达位置：".($startdd + $pagesize)."，用时：$ttime 分钟
    完成更新文档总数 $tjlen %"; //速度测试 if ($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; @@ -91,12 +90,12 @@ if ($tjnum < $totalnum) { exit(); } else { if ($typeid != '') { - ShowMsg(Lang('makehtml_archives_success',array('totalnum'=>$totalnum,'ttime'=>$ttime)), "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); + ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { - ShowMsg(Lang('makehtml_archives_success1',array('totalnum'=>$totalnum,'ttime'=>$ttime)), "javascript:;"); + ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，完成所有所有任务", "javascript:;"); } else { - ShowMsg(Lang("makehtml_archives_success3"), "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成更新文档任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } } } diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index 3a942a23..510d0f91 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\FreeList; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_MakeHtml'); +CheckPurview('sys_MakeHtml'); +require_once(DEDEINC."/archive/freelist.class.php"); if (empty($startid)) $startid = 0; $ci = " aid >= $startid "; if (!empty($endid) && $endid >= $startid) { $ci .= " And aid <= $endid "; } -header("Content-Type: text/html; charset=utf-8"); +header("Content-Type: text/html; charset={$cfg_soft_lang}"); $dsql->SetQuery("SELECT aid FROM `#@__freelist` WHERE $ci"); $dsql->Execute(); while ($row = $dsql->GetArray()) { @@ -29,7 +28,7 @@ $totalpage = count($idArray); if (isset($idArray[$pageno])) { $lid = $idArray[$pageno]; } else { - ShowMsg(Lang("makehtml_all_step_10"), 'javascript:;'); + ShowMsg("完成所有文件创建", 'javascript:;'); exit(); } $lv = new FreeList($lid); @@ -51,15 +50,15 @@ if ($ntotalpage <= $maxpagesize) { $lv->Close(); $nextpage = $pageno + 1; if ($nextpage == $totalpage) { - ShowMsg(Lang("makehtml_all_step_10"), 'javascript:;'); + ShowMsg("完成所有文件创建", 'javascript:;'); } else { if ($finishType) { $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage"; - ShowMsg(Lang("makehtml_freelist_success",array('tid'=>$tid)), $gourl, 0, 100); + ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); } else { $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno"; - ShowMsg(Lang("makehtml_freelist_success",array('tid'=>$tid)), $gourl, 0, 100); + ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); } } -$dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' WHERE aid='$startid';"); +$dsql->ExecuteNoneQuery("Update `#@__freelist` set nodefault='1' where aid='$startid';"); ?> \ No newline at end of file diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 5c01a501..234e2402 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -8,11 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\PartView; -use DedeBIZ\libraries\DedeBIZ; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_MakeHtml'); +CheckPurview('sys_MakeHtml'); +require_once(DEDEINC."/archive/partview.class.php"); if (empty($dopost)) $dopost = ''; if ($dopost == "view") { $pv = new PartView(); @@ -22,7 +20,7 @@ if ($dopost == "view") { exit(); } else if ($dopost == "make") { if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { - $client = new DedeBIZ($cfg_bizcore_hostname, $cfg_bizcore_port); + $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client->appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $data = $client->AdminPWDExists(); @@ -32,25 +30,29 @@ if ($dopost == "view") { if ($rs["admin_pwd_exists"] == "false") { //设定dedebiz admin密码 if ($dedebiz_admin == "" || $dedebiz_admin !== $re_dedebiz_admin) { - echo DedeAlert(Lang("admin_auth_pwd_not_same"),ALERT_DANGER); + echo ""; + echo "
    DedeBIZ操作密码为空或两次指定的密码不符

    "; $client->Close(); exit; } $data = $client->AdminPWDCreate($dedebiz_admin); if ($data->data != "ok") { - echo DedeAlert(Lang("admin_auth_err_pwd",array('data'=>$data)),ALERT_DANGER); + echo ""; + echo "
    DedeBIZ设定操作密码失败：${$data}

    "; $client->Close(); exit; } } else { if ($dedebiz_admin == "") { - echo DedeAlert(Lang("admin_auth_err_pwd_isempty"),ALERT_DANGER); + echo ""; + echo "
    DedeBIZ操作密码为空

    "; $client->Close(); exit; } $data = $client->AdminSetIndexLockState($dedebiz_admin, $lockindex); if ($data->data != "ok") { - echo DedeAlert(Lang("admin_auth_err_pwd_failed"),ALERT_DANGER); + echo ""; + echo "
    DedeBIZ操作密码失败，填写正确的操作密码

    "; $client->Close(); exit; } @@ -61,16 +63,16 @@ if ($dopost == "view") { $remotepos = empty($remotepos) ? '/index.html' : $remotepos; $serviterm = empty($serviterm) ? "" : $serviterm; if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($position))) { - ShowMsg(Lang("media_ext_forbidden"), "javascript:;"); + ShowMsg("您指定的文件名被系统禁止", "javascript:;"); exit(); } $homeFile = DEDEADMIN."/".$position; $homeFile = str_replace("\\", "/", $homeFile); $homeFile = str_replace("//", "/", $homeFile); - $fp = fopen($homeFile, "w") or die(DedeAlert(Lang('makehtml_homepage_err_filename'),ALERT_DANGER)); + $fp = fopen($homeFile, "w") or die("您指定的文件名有问题，无法创建文件"); fclose($fp); if ($saveset == 1) { - $iquery = "UPDATE `#@__homepageset` SET templet='$templet',position='$position'"; + $iquery = "UPDATE `#@__homepageset` SET templet='$templet',position='$position' "; $dsql->ExecuteNoneQuery($iquery); } //判断首页生成模式 @@ -82,12 +84,12 @@ if ($dopost == "view") { $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($homeFile); echo ""; - echo "
    ".Lang('makehtml_homepage_success_make')."：".$position." ".Lang('browser')."
    "; + echo "
    成功更新首页：".$position." 浏览
    "; } else { //动态浏览 if (file_exists($homeFile)) @unlink($homeFile); echo ""; - echo "
    ".Lang('makehtml_homepage_success_nomake')."：".Lang('browser')."
    "; + echo "
    采用动态浏览：浏览
    "; } $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'"; $dsql->ExecuteNoneQuery($iquery); diff --git a/src/admin/makehtml_list.php b/src/admin/makehtml_list.php index 96ca6057..e52651fa 100644 --- a/src/admin/makehtml_list.php +++ b/src/admin/makehtml_list.php @@ -9,5 +9,6 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/typelink/typelink.class.php"); include DedeInclude('templets/makehtml_list.htm'); ?> \ No newline at end of file diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 1283d206..70dd002c 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -8,13 +8,10 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\ListView; -use DedeBIZ\Archive\SgListView; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_MakeHtml'); +CheckPurview('sys_MakeHtml'); require_once(DEDEDATA."/cache/inc_catalog_base.inc"); -require_once(DEDEINC."/channel/channelunit.func.php"); +require_once(DEDEINC."/channelunit.func.php"); if (!isset($upnext)) $upnext = 1; if (empty($gotype)) $gotype = ''; if (empty($pageno)) $pageno = 0; @@ -22,7 +19,7 @@ if (empty($mkpage)) $mkpage = 1; if (empty($typeid)) $typeid = 0; if (!isset($uppage)) $uppage = 0; if (empty($maxpagesize)) $maxpagesize = 30; -$adminID = $cUserLogin->getUserID(); +$adminID = $cuserLogin->getUserID(); //检测获取所有栏目id //普通生成或一键更新时更新所有栏目 if ($gotype == '' || $gotype == 'mkallct') { @@ -51,28 +48,30 @@ if (isset($idArray[$pageno])) { $tid = $idArray[$pageno]; } else { if ($gotype == '') { - ShowMsg(Lang("makehtml_list_success"), "javascript:;"); + ShowMsg("完成所有列表更新", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg(Lang("makehtml_list_success_2"), "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目列表更新，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } if ($pageno == 0 && $mkpage == 1) //清空缓存 { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` "); } $reurl = ''; //更新数组所记录的栏目 if (!empty($tid)) { if (!isset($cfg_Cs[$tid])) { - ShowMsg(Lang('makehtml_list_err_cache'), 'javascript:;'); + ShowMsg('没有该栏目数据, 可能缓存文件(/data/cache/inc_catalog_base.inc)没有更新, 请检查是否有写入权限', 'javascript:;'); exit(); } if ($cfg_Cs[$tid][1] > 0) { + require_once(DEDEINC."/archive/listview.class.php"); $lv = new ListView($tid); $position = MfTypedir($lv->Fields['typedir']); } else { + require_once(DEDEINC."/archive/sglistview.class.php"); $lv = new SgListView($tid); } //这里统一统计 @@ -81,10 +80,10 @@ if (!empty($tid)) { else $ntotalpage = 1; //如果栏目的文档太多，分多批次更新 if ($ntotalpage <= $maxpagesize || $lv->TypeLink->TypeInfos['ispart'] != 0 || $lv->TypeLink->TypeInfos['isdefault'] == -1) { - $reurl = $lv->MakeHtml('', ''); + $reurl = $lv->MakeHtml('', '', 0); $finishType = TRUE; } else { - $reurl = $lv->MakeHtml($mkpage, $maxpagesize); + $reurl = $lv->MakeHtml($mkpage, $maxpagesize, 0); $finishType = FALSE; $mkpage = $mkpage + $maxpagesize; if ($mkpage >= ($ntotalpage + 1)) $finishType = TRUE; @@ -96,20 +95,20 @@ if ($nextpage >= $totalpage && $finishType) { if (empty($reurl)) { $reurl = '../apps/list.php?tid='.$tid; } - ShowMsg(Lang('makehtml_list_success_view', array('reurl'=>$reurl)), "javascript:;"); + ShowMsg("完成所有栏目列表更新，浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg(Lang("makehtml_list_success_mkall"), "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目列表更新，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } else { if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg(Lang("makehtml_list_success_tid",array('tid'=>$tid)), $gourl, 0, 100); + ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg(Lang("makehtml_list_success_tid",array('tid'=>$tid)), $gourl, 0, 100); + ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); exit(); } } diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php index aaa73716..7f53486b 100644 --- a/src/admin/makehtml_spec.php +++ b/src/admin/makehtml_spec.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\SpecView; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_MakeHtml'); +CheckPurview('sys_MakeHtml'); if (empty($dopost)) $dopost = ""; if ($dopost == "ok") { + require_once(DEDEINC."/archive/specview.class.php"); $sp = new SpecView(); - $rurl = $sp->MakeHtml(); + $rurl = $sp->MakeHtml(0); echo ""; - echo "
    ".Lang('makehtml_spec_make_success')." ".Lang('view')."
    "; + echo "
    成功生成所有专题列表 预览
    "; exit(); } include DedeInclude('templets/makehtml_spec.htm'); diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index 321df549..45eafa24 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -1,6 +1,6 @@ SetTagsDir($tagsdir); $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; - ShowMsg(Lang('makehtml_taglist_make_success')."，".Lang('makehtml_taglist_view')."", "javascript:;"); + ShowMsg("更新完成TAG，浏览标签", "javascript:;"); exit; } $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;"); -//创建标签目录 +//创建TAGS目录 $tagsDir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir); MkdirAll($cfg_basedir.$tagsDir, $cfg_dir_purview); if (is_array($tag) && count($tag) > 0) { @@ -76,30 +75,30 @@ if (is_array($tag) && count($tag) > 0) { $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; if ($upall == 1) { - ShowMsg(Lang('makehtml_taglist_make_success')."".Lang('makehtml_taglist_view')."", "javascript:;"); + ShowMsg("完成TAG更新浏览标签", "javascript:;"); } else { - $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid'"; + $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); $reurl .= '/'.$ctagid; - ShowMsg(Lang('makehtml_taglist_make_success')."：".$tag['tag']."，".Lang('makehtml_taglist_view')."", "javascript:;"); + ShowMsg("更新完成TAG：".$tag['tag']."，浏览标签", "javascript:;"); } exit(); } else { if ($finishType) { //完成了一个跳到下一个 if ($upall == 1) { - $query = "UPDATE `#@__tagindex` SET mktime={$mktime} WHERE id='$ctagid'"; + $query = "UPDATE `#@__tagindex` SET mktime={$mktime} WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); $ctagid = 0; $nextpage = 0; } $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg(Lang('makehtml_taglist_success_makeone',array('tag'=>$tag['tag'])), $gourl, 0, 100); + ShowMsg("成功生成TAG：".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } else { //继续当前这个 $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg(Lang('makehtml_taglist_success_makeone',array('tag'=>$tag['tag'])), $gourl, 0, 100); + ShowMsg("成功生成TAG：".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } } diff --git a/src/admin/media_add.php b/src/admin/media_add.php index 23e917d7..7b425854 100644 --- a/src/admin/media_add.php +++ b/src/admin/media_add.php @@ -8,20 +8,18 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); //增加权限检查 if (empty($dopost)) $dopost = ""; //上传 if ($dopost == "upload") { - UserLogin::CheckPurview('sys_Upload'); CheckCSRF(); - helper('image'); + require_once(DEDEINC."/image.func.php"); $sparr_image = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/x-png", "image/wbmp"); $sparr_flash = array("application/xshockwaveflash"); $okdd = 0; $uptime = time(); - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); $width = $height = ''; for ($i = 0; $i <= 40; $i++) { if (isset(${"upfile".$i}) && is_uploaded_file(${"upfile".$i})) { @@ -56,17 +54,17 @@ if ($dopost == "upload") { } //后台文件任意上传漏洞：早期版本后台存在大量的富文本编辑器，该控件提供了一些文件上传接口，同时对上传文件的后缀类型未进行严格的限制，这导致了黑客可以上传WEBSHELL，获取网站后台权限 if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) { - ShowMsg(Lang("media_ext_forbidden"), "javascript:;"); + ShowMsg("您指定的文件名被系统禁止", "javascript:;"); exit(); } $fullfilename = $cfg_basedir.$filename; $mime = get_mime_type(${"upfile".$i}); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } if ($mediatype == 1) { @@ -84,12 +82,12 @@ if ($dopost == "upload") { } else { $ntitle = $title; } - $inquery = "INSERT INTO `#@__uploads`(title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$ntitle','$filename','$mediatype','$width','$height','$playtime','$filesize','$uptime','$adminid');"; + $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$ntitle','$filename','$mediatype','$width','$height','$playtime','$filesize','$uptime','$adminid'); "; $okdd++; $dsql->ExecuteNoneQuery($inquery); } } - ShowMsg(Lang("media_success_upload",array('okdd'=>$okdd)), "media_main.php"); + ShowMsg("成功上传 {$okdd} 个文件", "media_main.php"); exit(); } include DedeInclude('templets/media_add.htm'); diff --git a/src/admin/media_edit.php b/src/admin/media_edit.php index adf3c942..5ecea2de 100644 --- a/src/admin/media_edit.php +++ b/src/admin/media_edit.php @@ -8,15 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); //权限检查 -UserLogin::CheckPurview('sys_Upload,sys_MyUpload'); +CheckPurview('sys_Upload,sys_MyUpload'); if (empty($dopost)) $dopost = ""; $backurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "javascript:history.go(-1);"; -//删除附件 +/*--------------------------- +function __del_file() //删除附件 +-----------------------------*/ if ($dopost == 'del') { - UserLogin::CheckPurview('sys_DelUpload'); + CheckPurview('sys_DelUpload'); if (empty($ids)) { $ids = ""; } @@ -30,7 +31,7 @@ if ($dopost == 'del') { $rs = @unlink($truefile); } if ($rs == 1) { - $msg = Lang("media_success_delete"); + $msg = "成功删除一个附件"; $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE aid='".$aid."'"); } ShowMsg($msg, $backurl); @@ -59,18 +60,20 @@ if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE aid='".$myrow['aid']."'"); } } - ShowMsg(Lang('media_success_select_delete'), $backurl); + ShowMsg('成功删除选定的文件', $backurl); exit(); } } -//保存修改 +/*-------------------------------- +function __save_edit() //保存修改 +-----------------------------------*/ else if ($dopost == 'save') { if ($aid == "") exit(); CheckCSRF(); //检查是否有修改权限 $myrow = $dsql->GetOne("SELECT * FROM `#@__uploads` WHERE aid='".$aid."'"); - if ($myrow['mid'] != $cUserLogin->getUserID()) { - UserLogin::CheckPurview('sys_Upload'); + if ($myrow['mid'] != $cuserLogin->getUserID()) { + CheckPurview('sys_Upload'); } //检测文件类型 $addquery = ""; @@ -78,27 +81,27 @@ else if ($dopost == 'save') { if ($mediatype == 1) { $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); if (!in_array($upfile_type, $sparr)) { - ShowMsg(Lang("media_not_image"), "javascript:history.go(-1);"); + ShowMsg("您上传的不是图片类型的文件", "javascript:history.go(-1);"); exit(); } } else if ($mediatype == 2) { $sparr = array("application/x-shockwave-flash"); if (!in_array($upfile_type, $sparr)) { - ShowMsg(Lang("media_not_flash"), "javascript:history.go(-1);"); + ShowMsg("您上传的不是Flash类型的文件", "javascript:history.go(-1);"); exit(); } } else if ($mediatype == 3) { if (!preg_match('#audio|media|video#i', $upfile_type)) { - ShowMsg(Lang("media_not_video_audio"), "javascript:history.go(-1);"); + ShowMsg("您上传的为不正确类型的影音文件", "javascript:history.go(-1);"); exit(); } if (!preg_match("#\.".$cfg_mediatype."#", $upfile_name)) { - ShowMsg(Lang("media_not_allow_ext"), "javascript:history.go(-1);"); + ShowMsg("您上传的影音文件扩展名无法被识别，请修改系统配置的参数", "javascript:history.go(-1);"); exit(); } } else { if (!preg_match("#\.".$cfg_softtype."#", $upfile_name)) { - ShowMsg(Lang("media_not_allow_ext_soft"), "javascript:history.go(-1);"); + ShowMsg("您上传的附件扩展名无法被识别，请修改系统配置的参数", "javascript:history.go(-1);"); exit(); } } @@ -114,16 +117,16 @@ else if ($dopost == 'save') { } $mime = get_mime_type($upfile); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } @move_uploaded_file($upfile, $fullfilename); if ($mediatype == 1) { - helper('image'); + require_once(DEDEINC."/image.func.php"); if (in_array($upfile_type, $cfg_photo_typenames)) { WaterImg($fullfilename, 'up'); } @@ -140,24 +143,24 @@ else if ($dopost == 'save') { $imgh = $sizes[1]; } if ($imgw > 0) { - $addquery = " ,width='$imgw',height='$imgh',filesize='$filesize' "; + $addquery = ",width='$imgw',height='$imgh',filesize='$filesize' "; } else { - $addquery = " ,filesize='$filesize' "; + $addquery = ",filesize='$filesize' "; } } else { $fileurl = $filename; } //写入数据库 - $query = " UPDATE `#@__uploads` SET title='$title',mediatype='$mediatype',playtime='$playtime'"; - $query .= "$addquery WHERE aid='$aid'"; + $query = "UPDATE `#@__uploads` SET title='$title',mediatype='$mediatype',playtime='$playtime'"; + $query .= "$addquery WHERE aid='$aid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang('media_success_edit'), 'media_edit.php?aid='.$aid); + ShowMsg('成功修改一则附件数据', 'media_edit.php?aid='.$aid); exit(); } //读取档案信息 $myrow = $dsql->GetOne("SELECT * FROM `#@__uploads` WHERE aid='".$aid."'"); if (!is_array($myrow)) { - ShowMsg(Lang('media_err_nofile'), 'javascript:;'); + ShowMsg('错误，找不到此编号的档案', 'javascript:;'); exit(); } include DedeInclude('templets/media_edit.htm'); diff --git a/src/admin/media_main.php b/src/admin/media_main.php index f5debbc8..8e996137 100644 --- a/src/admin/media_main.php +++ b/src/admin/media_main.php @@ -8,8 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEINC."/common.func.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); if (empty($dopost)) $dopost = ''; @@ -18,7 +18,7 @@ if ($dopost == 'filemanager') { if (file_exists('./file_manage_main.php')) { header("location:file_manage_main.php?activepath=$cfg_medias_dir"); } else { - ShowMsg(Lang("media_err_nobrowser"), "-1"); + ShowMsg("找不到文件管理器，可能已经卸载", "-1"); } exit(); } @@ -52,13 +52,13 @@ $dlist->Display(); function MediaType($tid, $nurl) { if ($tid == 1) { - return Lang('image').""; + return "图片"; } else if ($tid == 2) { return "FLASH"; } else if ($tid == 3) { - return Lang("media"); + return "视频音频"; } else { - return Lang("other"); + return "附件其它"; } } function GetFileSize($fs) diff --git a/src/admin/member_do.php b/src/admin/member_do.php index cee6161c..f8880e78 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -8,20 +8,22 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? 'member_main.php' : ''; -//删除会员 +/*---------------- +function __DelMember() +删除会员 +----------------*/ if ($dopost == "delmember") { - UserLogin::CheckPurview('member_Del'); + CheckPurview('member_Del'); if ($fmdo == 'yes') { $id = preg_replace("#[^0-9]#", '', $id); $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg(Lang("sys_admin_err_safecodeok_check"), "member_do.php?id={$id}&dopost=delmember"); + ShowMsg("请填写正确的验证安全码", "member_do.php?id={$id}&dopost=delmember"); exit(); } if (!empty($id)) { @@ -41,41 +43,42 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid='$id' LIMIT 1"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid='$id' LIMIT 1"); //删除用户相关数据 - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid='$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid='$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_operation` WHERE mid='$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE toid='$id' Or fromid='$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_friends` WHERE mid='$id' Or fid='$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid='$id'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid='$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid='$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_operation` WHERE mid='$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE toid='$id' Or fromid='$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_friends` WHERE mid='$id' Or fid='$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid='$id'"); } else { - ShowMsg(Lang("member_err_del_admin"), $ENV_GOBACK_URL, 0, 5000); + ShowMsg("无法删除此会员，如果这个会员是[管理员]，
    必须先删除这个[管理员]才能删除此帐号", $ENV_GOBACK_URL, 0, 5000); exit(); } } - ShowMsg(Lang("member_success_del"), $ENV_GOBACK_URL); + ShowMsg("成功删除一个会员", $ENV_GOBACK_URL); exit(); } $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); - $wintitle = Lang("member_del_title"); - $wecome_info = "".Lang('member_main2')."::".Lang('member_del'); - DedeWin::Instance()->Init("member_do.php", "js/blank.js", "POST") - ->AddHidden("fmdo", "yes") - ->AddHidden("dopost", $dopost) - ->AddHidden("id", $id) - ->AddHidden("randcode", $randcode) - ->AddHidden("safecode", $safecode) - ->AddTitle(Lang("member_del_title2",array('id'=>$id))) - ->AddMsgItem(Lang('member_toadmin_safecode')."：（".Lang('safecode')."：$safecode）", "30") - ->GetWindow("ok") - ->Display(); + $wintitle = "会员管理-删除会员"; + $wecome_info = "会员管理::删除会员"; + $win = new OxWindow(); + $win->Init("member_do.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("id", $id); + $win->AddHidden("randcode", $randcode); + $win->AddHidden("safecode", $safecode); + $win->AddTitle("您确定要删除会员ID:".$id." 吗"); + $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); + $winform = $win->GetWindow("ok"); + $win->Display(); } else if ($dopost == "delmembers") { - UserLogin::CheckPurview('member_Del'); + CheckPurview('member_Del'); if ($fmdo == 'yes') { $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg(Lang("sys_admin_err_safecodeok_check"), "member_do.php?id={$id}&dopost=delmembers"); + ShowMsg("请填写正确的验证安全码", "member_do.php?id={$id}&dopost=delmembers"); exit(); } if (!empty($id)) { @@ -95,45 +98,52 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid IN (".str_replace("`", ",", $id).")"); } else { - ShowMsg(Lang("member_err_del_admin"), $ENV_GOBACK_URL, 0, 3000); + ShowMsg("无法删除此会员，如果这个会员是管理员关连的ID，
    必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000); exit(); } } - ShowMsg(Lang("member_success_delall"), $ENV_GOBACK_URL); + ShowMsg("成功删除这些会员", $ENV_GOBACK_URL); exit(); } $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); - $wintitle = Lang("member_del_title"); - $wecome_info = "".Lang('member_main2')."::".Lang('member_del'); - DedeWin::Instance()->Init("member_do.php", "js/blank.js", "POST") - ->AddHidden("fmdo", "yes") - ->AddHidden("dopost", $dopost) - ->AddHidden("id", $id) - ->AddHidden("randcode", $randcode) - ->AddHidden("safecode", $safecode) - ->AddTitle(Lang("member_del_title2",array('id'=>$id))) - ->AddMsgItem(Lang('member_toadmin_safecode')."： (".Lang('safecode')."：$safecode)", "30") - ->GetWindow("ok") - ->Display(); + $wintitle = "会员管理-删除会员"; + $wecome_info = "会员管理::删除会员"; + $win = new OxWindow(); + $win->Init("member_do.php", "js/blank.js", "POST"); + $win->AddHidden("fmdo", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("id", $id); + $win->AddHidden("randcode", $randcode); + $win->AddHidden("safecode", $safecode); + $win->AddTitle("您确定要删除(ID:".$id.")这个会员?"); + $win->AddMsgItem(" 验证安全码： (安全码：$safecode)", "30"); + $winform = $win->GetWindow("ok"); + $win->Display(); } -//推荐会员 +/*---------------- +function __Recommend() +推荐会员 +----------------*/ else if ($dopost == "recommend") { - UserLogin::CheckPurview('member_Edit'); + CheckPurview('member_Edit'); $id = preg_replace("#[^0-9]#", "", $id); if ($matt == 0) { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=1 WHERE mid='$id' AND matt<>10 LIMIT 1"); - ShowMsg(Lang("member_recommend_0"), $ENV_GOBACK_URL); + ShowMsg("成功设置一个会员推荐", $ENV_GOBACK_URL); exit(); } else { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=0 WHERE mid='$id' AND matt<>10 LIMIT 1"); - ShowMsg(Lang("member_recommend_1"), $ENV_GOBACK_URL); + ShowMsg("成功取消一个会员推荐", $ENV_GOBACK_URL); exit(); } } -//修改会员 +/*---------------- +function __EditUser() +修改会员 +----------------*/ else if ($dopost == 'edituser') { - UserLogin::CheckPurview('member_Edit'); + CheckPurview('member_Edit'); if (!isset($_POST['id'])) exit('dedebiz'); $pwdsql = empty($pwd) ? '' : ",pwd='".md5($pwd)."'"; if (function_exists('password_hash')) { @@ -142,21 +152,47 @@ else if ($dopost == 'edituser') { if (empty($sex)) $sex = '男'; $uptime = GetMkTime($uptime); if ($matt == 10 && $oldmatt != 10) { - ShowMsg(Lang("member_edituser_err_to"), "-1"); + ShowMsg("对不起，为安全起见，不支持直接把前台会员转为管理的操作", "-1"); exit(); } - $query = "UPDATE `#@__member` SET email='$email',uname='$uname',sex='$sex',matt='$matt',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime' $pwdsql WHERE mid='$id' AND matt<>10"; + $query = "UPDATE `#@__member` SET + email = '$email', + uname = '$uname', + sex = '$sex', + matt = '$matt', + money = '$money', + scores = '$scores', + `rank` = '$rank', + spacesta='$spacesta', + uptime='$uptime', + exptime='$exptime' + $pwdsql + WHERE mid='$id' AND matt<>10 "; $rs = $dsql->ExecuteNoneQuery2($query); if ($rs == 0) { - $query = "UPDATE `#@__member` SET email='$email',uname='$uname',sex='$sex',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime' $pwdsql WHERE mid='$id'"; + $query = "UPDATE `#@__member` SET + email = '$email', + uname = '$uname', + sex = '$sex', + money = '$money', + scores = '$scores', + `rank` = '$rank', + spacesta='$spacesta', + uptime='$uptime', + exptime='$exptime' + $pwdsql + WHERE mid='$id' "; $rs = $dsql->ExecuteNoneQuery2($query); } - ShowMsg(Lang('member_success_edituser'), 'member_view.php?id='.$id); + ShowMsg('成功修改会员资料', 'member_view.php?id='.$id); exit(); } -//登录会员的控制面板 +/*-------------- +function __LoginCP() +登录会员的控制面板 +----------*/ else if ($dopost == "memberlogin") { - UserLogin::CheckPurview('member_Edit'); + CheckPurview('member_Edit'); PutCookie('DedeUserID', $id, 1800); PutCookie('DedeLoginTime', time(), 1800); if (empty($jumpurl)) header("location:../user/index.php"); @@ -169,7 +205,7 @@ else if ($dopost == "memberlogin") { $query = "DELETE FROM `#@__member_operation` WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); } - ShowMsg(Lang("member_success_edituser_del"), "member_operations.php"); + ShowMsg("删除成功", "member_operations.php"); exit(); } } else if ($dopost == "upoperations") { @@ -179,7 +215,7 @@ else if ($dopost == "memberlogin") { foreach ($nid as $var) { $query = "UPDATE `#@__member_operation` SET sta = '1' WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("member_success_edituser_set"), "member_operations.php"); + ShowMsg("设置成功", "member_operations.php"); exit(); } } @@ -190,7 +226,7 @@ else if ($dopost == "memberlogin") { foreach ($nid as $var) { $query = "UPDATE `#@__member_operation` SET sta = '2' WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("member_success_edituser_set"), "member_operations.php"); + ShowMsg("设置成功", "member_operations.php"); exit(); } } diff --git a/src/admin/member_main.php b/src/admin/member_main.php index 9038c5d0..9a63d3dd 100644 --- a/src/admin/member_main.php +++ b/src/admin/member_main.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_List'); +CheckPurview('member_List'); +require_once(DEDEINC."/datalistcp.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); if (!isset($sex)) $sex = ''; if (!isset($mtype)) $mtype = ''; @@ -22,24 +21,24 @@ else $keyword = trim(FilterSearch($keyword)); $mtypeform = empty($mtype) ? "\r\n" : "\r\n"; $sexform = empty($sex) ? "\r\n" : "\r\n"; $sortkey = empty($sortkey) ? 'mid' : preg_replace("#[^a-z]#i", '', $sortkey); -$staArr = array(-2 => Lang('member_sta_-2'), -1 => Lang('member_sta_-1'), 0 => Lang('member_sta_0'), 1 => Lang('member_sta_1'), 2 => Lang('member_sta_2')); -$staArrmatt = array(1 => Lang('member_matt_1'), 0 => Lang('member_matt_0')); +$staArr = array(-2 => '限制用户(禁言)', -1 => '未通过审核', 0 => '审核通过，提示填写完整信息', 1 => '没填写详细资料', 2 => '正常使用状态'); +$staArrmatt = array(1 => '被推荐', 0 => '非普通 '); $MemberTypes = array(); -$dsql->SetQuery("SELECT `rank`,membername FROM `#@__arcrank` WHERE `rank`>0"); +$dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 "); $dsql->Execute(); while ($row = $dsql->GetObject()) { $MemberTypes[$row->rank] = $row->membername; } if ($sortkey == 'mid') { - $sortform = "\r\n"; + $sortform = "\r\n"; } else if ($sortkey == 'rank') { - $sortform = "\r\n"; + $sortform = "\r\n"; } else if ($sortkey == 'money') { - $sortform = "\r\n"; + $sortform = "\r\n"; } else if ($sortkey == 'scores') { - $sortform = "\r\n"; + $sortform = "\r\n"; } else { - $sortform = "\r\n"; + $sortform = "\r\n"; } $wheres[] = " (userid LIKE '%$keyword%' OR uname LIKE '%$keyword%' OR email LIKE '%$keyword%') "; if ($sex != '') { @@ -58,7 +57,7 @@ $whereSql = join(' AND ', $wheres); if ($whereSql != '') { $whereSql = ' WHERE '.$whereSql; } -$sql = "SELECT * FROM `#@__member` $whereSql ORDER BY $sortkey DESC"; +$sql = "SELECT * FROM `#@__member` $whereSql ORDER BY $sortkey DESC "; $dlist = new DataListCP(); $dlist->SetParameter('sex', $sex); $dlist->SetParameter('spacesta', $spacesta); @@ -73,7 +72,7 @@ function GetMemberName($rank, $mt) { global $MemberTypes; if (isset($MemberTypes[$rank])) { - if ($mt == 'ut') return " ".Lang('member_wupdate')."：".$MemberTypes[$rank].""; + if ($mt == 'ut') return " 待升级：".$MemberTypes[$rank].""; else return $MemberTypes[$rank]; } else { if ($mt == 'ut') return ''; @@ -83,7 +82,7 @@ function GetMemberName($rank, $mt) function GetMAtt($m) { if ($m < 1) return ''; - else if ($m == 10) return " [".Lang('member_mattr')."]"; - else return " [".Lang('recommend2')."]"; + else if ($m == 10) return " [管理员]"; + else return " [荐]"; } ?> \ No newline at end of file diff --git a/src/admin/member_operations.php b/src/admin/member_operations.php index feb9d492..dd9031ad 100644 --- a/src/admin/member_operations.php +++ b/src/admin/member_operations.php @@ -8,11 +8,10 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Operations'); +CheckPurview('member_Operations'); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); +require_once(DEDEINC.'/datalistcp.class.php'); if (empty($buyid)) $buyid = ''; $addsql = " WHERE buyid LIKE '%$buyid%' "; if (isset($sta)) $addsql .= " AND sta='$sta' "; @@ -22,7 +21,7 @@ $dlist = new DataListCP(); $dlist->pagesize = 30; $dlist->SetParameter("buyid", $buyid); if (isset($sta)) $dlist->SetParameter("sta", $sta); -$dlist->dsql->SetQuery("SELECT * FROM `#@__moneycard_type`"); +$dlist->dsql->SetQuery("SELECT * FROM #@__moneycard_type "); $dlist->dsql->Execute('ts'); while ($rw = $dlist->dsql->GetArray('ts')) { $TypeNames[$rw['tid']] = $rw['pname']; @@ -38,7 +37,7 @@ function GetMemberID($mid) if ($mid == 0) { return '0'; } - $row = $dsql->GetOne("SELECT userid FROM `#@__member` WHERE mid='$mid'"); + $row = $dsql->GetOne("SELECT userid FROM #@__member WHERE mid='$mid' "); if (is_array($row)) { return "".$row['userid'].""; } else { @@ -47,19 +46,19 @@ function GetMemberID($mid) } function GetPType($tname) { - if ($tname == 'card') return Lang('member_ptype_card'); - else if ($tname == 'archive') return Lang('member_ptype_archive'); - else if ($tname == 'stc') return Lang('member_ptype_stc'); - else return Lang('member_ptype_other'); + if ($tname == 'card') return '点数卡'; + else if ($tname == 'archive') return '购买文档'; + else if ($tname == 'stc') return '兑换金币'; + else return '会员升级'; } function GetSta($sta) { if ($sta == 0) { - return Lang('member_operations_sta_0'); + return '未付款'; } else if ($sta == 1) { - return Lang('member_operations_sta_1'); + return '已付款'; } else { - return Lang('member_operations_sta_2'); + return '已完成'; } } ?> \ No newline at end of file diff --git a/src/admin/member_pm.php b/src/admin/member_pm.php index 301a53b5..6aa0f89f 100644 --- a/src/admin/member_pm.php +++ b/src/admin/member_pm.php @@ -8,31 +8,30 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Pm'); +CheckPurview('member_Pm'); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); +require_once(DEDEINC.'/datalistcp.class.php'); if (!isset($folder)) $folder = ''; if (!isset($username)) $username = ''; if (!isset($keyword)) $keyword = ''; if (isset($dopost)) { $ID = preg_replace("#[^0-9]#", "", $ID); if ($dopost == "del" && !empty($ID)) { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE id='$ID'"); + $dsql->ExecuteNoneQuery("DELETE FROM #@__member_pms WHERE id='$ID'"); } } $whereSql = ''; if (!empty($folder)) $whereSql = "WHERE folder='$folder'"; -$postuser = Lang("member_postuser_1"); -if ($folder == "inbox" || $folder == '') $postuser = Lang("member_postuser_2"); +$postuser = "收件人"; +if ($folder == "inbox" || $folder == '') $postuser = "发件人"; if (!empty($keyword)) { $whereSql .= " AND (subject like '%".$keyword."%' OR message like '%".$keyword."%')"; } if (!empty($username)) { $whereSql .= " AND floginid like '%".$username."%'"; } -$sql = "SELECT * FROM `#@__member_pms` $whereSql ORDER BY sendtime DESC"; +$sql = "SELECT * FROM #@__member_pms $whereSql ORDER BY sendtime desc"; $dlist = new DataListCP(); $dlist->pagesize = 30; $dlist->SetParameter("folder", $folder); @@ -44,8 +43,8 @@ $dlist->Display(); $dlist->Close(); function GetFolders($me) { - if ($me == "outbox") return Lang('member_outbox'); - else if ($me == "inbox") return Lang('member_inbox'); + if ($me == "outbox") return '发件箱'; + else if ($me == "inbox") return '收件箱'; } function IsReader($me) { diff --git a/src/admin/member_pmall.php b/src/admin/member_pmall.php index ce9d1a5d..a79ecbd1 100644 --- a/src/admin/member_pmall.php +++ b/src/admin/member_pmall.php @@ -1,6 +1,6 @@ ExecuteNoneQuery("INSERT INTO `#@__member_pms`(floginid,fromid,toid,tologinid,folder,hasview,subject,sendtime,writetime,message,isadmin) VALUES ('$floginid','$fromid','$toid','$tologinid','outbox','0','$subject','$sendtime','$writetime','$message','1');"); - ShowMsg(Lang('member_post_success'), '-1'); + $rs = $dsql->ExecuteNoneQuery("INSERT INTO `#@__member_pms` (floginid,fromid,toid,tologinid,folder,hasview,subject,sendtime,writetime,message,isadmin) VALUES ('$floginid','$fromid','$toid','$tologinid','outbox','0','$subject','$sendtime','$writetime','$message','1');"); + ShowMsg('短信已成功发送', '-1'); exit(); } require_once(DEDEADMIN."/templets/member_pmall.htm"); diff --git a/src/admin/member_pmone.php b/src/admin/member_pmone.php index 69e09bdb..dddd68e6 100644 --- a/src/admin/member_pmone.php +++ b/src/admin/member_pmone.php @@ -1,6 +1,6 @@ $msgtitle)); + return $msgtitle.'为系统禁止的标识'; } } if ($cfg_md_idurl == 'Y' && preg_match("#[^a-z0-9]#i", $uid)) { - return Lang('member_userid_needword',array('msgtitle'=>$msgtitle)); + return $msgtitle.'必须由英文字母或数字组成'; } - $ck_uid = utf82gb($uid); + if ($cfg_soft_lang == 'utf-8') $ck_uid = utf82gb($uid); + else $ck_uid = $uid; for ($i = 0; isset($ck_uid[$i]); $i++) { if (ord($ck_uid[$i]) > 0x80) { if (isset($ck_uid[$i + 1]) && ord($ck_uid[$i + 1]) > 0x40) { $i++; } else { - return Lang('member_userid_ncharset',array('msgtitle'=>$msgtitle)); + return $msgtitle.'可能含有乱码，建议您改用英文字母和数字组合'; } } else { if (preg_match("#[^0-9a-z@\.-]i#", $ck_uid[$i])) { - return Lang('member_userid_charset_notallow',array('msgtitle'=>$msgtitle)); + return $msgtitle.'不能含有 [@]、[.]、[-]以外的特殊符号'; } } } if ($ckhas) { - $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE userid LIKE '$uid'"); - if (is_array($row)) return Lang('member_userid_exists',array('msgtitle'=>$msgtitle)); + $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE userid LIKE '$uid' "); + if (is_array($row)) return $msgtitle."已经存在"; } return 'ok'; } if (!isset($action)) $action = ''; if ($action == "post") { - $floginid = $cUserLogin->getUserName(); - $fromid = $cUserLogin->getUserID(); + $floginid = $cuserLogin->getUserName(); + $fromid = $cuserLogin->getUserID(); if ($subject == '') { - ShowMsg(Lang("member_post_title_isempty"), "-1"); + ShowMsg("请填写信息标题!", "-1"); exit(); } - $msg = CheckUserID($msgtoid, Lang("username"), false); + $msg = CheckUserID($msgtoid, "用户名", false); if ($msg != 'ok') { ShowMsg($msg, "-1"); exit(); } - $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE userid like '$msgtoid'"); + $row = $dsql->GetOne("Select * From `#@__member` where userid like '$msgtoid' "); if (!is_array($row)) { - ShowMsg(Lang("member_post_user_noexists"), "-1"); + ShowMsg("您指定的用户不存在,不能发送信息!", "-1"); exit(); } $subject = cn_substrR(HtmlReplace($subject, 1), 60); $message = cn_substrR(HtmlReplace($message, 0), 1024); $sendtime = $writetime = time(); - //发给收件人 - $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) VALUES ('$floginid','$fromid','{$row['mid']}','{$row['userid']}','inbox','$subject','$sendtime','$writetime','0','0','$message');"; + //发给收件人(收件人可管理) + $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) VALUES ('$floginid','$fromid','{$row['mid']}','{$row['userid']}','inbox','$subject','$sendtime','$writetime','0','0','$message'); "; $dsql->ExecuteNoneQuery($inquery); - ShowMsg(Lang('member_post_success'), 'member_pmone.php'); + ShowMsg('短信已成功发送', 'member_pmone.php'); exit(); } require_once(DEDEADMIN."/templets/member_pmone.htm"); diff --git a/src/admin/member_rank.php b/src/admin/member_rank.php index e10b7653..50db720b 100644 --- a/src/admin/member_rank.php +++ b/src/admin/member_rank.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Type'); +CheckPurview('member_Type'); if (empty($dopost)) $dopost = ''; //保存修改 if ($dopost == 'save') { @@ -25,7 +24,7 @@ if ($dopost == 'save') { $scores = ${"scores_".$startID}; if (isset(${"check_".$startID})) { if ($rank > 0) { - $query = "UPDATE `#@__arcrank` SET membername='$name',money='$money',`rank`='$rank',scores='$scores' WHERE id='$id'"; + $query = "UPDATE `#@__arcrank` SET membername='$name',money='$money',`rank`='$rank',scores='$scores' WHERE id='$id' "; } } else { $query = "DELETE FROM `#@__arcrank` WHERE id='$id' AND `rank`<>10"; @@ -34,15 +33,15 @@ if ($dopost == 'save') { } if (isset($check_new)) { if ($rank_new > 0 && $name_new != '' && $rank_new > 10) { - $inquery = "INSERT INTO `#@__arcrank` (`rank`,`membername`,`adminrank`,`money`,`scores`,`purviews`) VALUES ('$rank_new','$name_new','5','$money_new','$scores','');"; + $inquery = "INSERT INTO `#@__arcrank` (`rank`,`membername`,`adminrank`,`money`,`scores`,`purviews`) VALUES ('$rank_new','$name_new','5','$money_new','$scores',''); "; $dsql->ExecuteNoneQuery($inquery); } } - echo ""; + echo ""; } if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__arcrank` WHERE id='$id' AND `rank`<>10"); - ShowMsg(Lang('member_success_edituser_del'), "member_rank.php"); + ShowMsg("删除成功", "member_rank.php"); exit(); } $dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank`>0 ORDER BY `rank`"); diff --git a/src/admin/member_scores.php b/src/admin/member_scores.php index c98f2c8c..9dbc7ed5 100644 --- a/src/admin/member_scores.php +++ b/src/admin/member_scores.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Scores'); +CheckPurview('member_Scores'); if (!isset($action)) $action = ''; if ($action == 'save') { if (!empty($add_integral) && !empty($add_icon) && !empty($add_titles)) { $integral = preg_replace("#[^0-9]#", "", $add_integral); $add_icon = preg_replace("#[^0-9]#", "", $add_icon); $add_titles = cn_substr($add_titles, 15); - $dsql->ExecuteNoneQuery("INSERT INTO `#@__scores`(integral,icon,titles,isdefault) VALUES ('$integral','$add_icon','$add_titles','$add_isdefault')"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__scores` (integral,icon,titles,isdefault) VALUES ('$integral','$add_icon','$add_titles','$add_isdefault')"); } foreach ($_POST as $rk => $rv) { if (preg_match("#-#", $rk)) { diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index 8ea687d9..061a75a8 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -8,23 +8,25 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Edit'); +CheckPurview('member_Edit'); if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? 'member_main.php' : ''; $row = array(); -//升级为管理员 +/*---------------- +function __Toadmin() +升级为管理员 +----------------*/ if ($dopost == "toadmin") { $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg(Lang('member_toadmin_err_password'), '-1', 0, 3000); + ShowMsg('密码不合法，请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg(Lang("member_toadmin_err_safecode"), "member_toadmin.php?id={$id}"); + ShowMsg("请填写正确的验证安全码", "member_toadmin.php?id={$id}"); exit(); } $pwdm = ''; @@ -55,32 +57,32 @@ if ($dopost == "toadmin") { } $typeids = (empty($typeids)) ? array() : $typeids; if ($typeids == '') { - ShowMsg(Lang("member_toadmin_err_emptytypeids"), "member_toadmin.php?id={$id}"); + ShowMsg("请为该管理员指定管理栏目", "member_toadmin.php?id={$id}"); exit(); } $typeid = join(',', $typeids); if ($typeid == '0') $typeid = ''; if ($id != 1) { - $query = "INSERT INTO `#@__admin`(id,usertype,userid$inputpwd,uname,typeid,tname,email) VALUES ('$id','$usertype','$userid'$inputpwdv,'$uname','$typeid','$tname','$email')"; + $query = "INSERT INTO `#@__admin` (id,usertype,userid$inputpwd,uname,typeid,tname,email) VALUES ('$id','$usertype','$userid'$inputpwdv,'$uname','$typeid','$tname','$email')"; } else { - $query = "INSERT INTO `#@__admin`(id,userid$inputpwd,uname,typeid,tname,email) VALUES ('$id','$userid'$inputpwdv,'$uname','$typeid','$tname','$email')"; + $query = "INSERT INTO `#@__admin` (id,userid$inputpwd,uname,typeid,tname,email) VALUES ('$id','$userid'$inputpwdv,'$uname','$typeid','$tname','$email')"; } $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET `rank`='100',uname='$uname',matt='10',email='$email'$pwdm WHERE mid='$id'"; $dsql->ExecuteNoneQuery($query); $row = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE `rank`='$usertype'"); - $floginid = $cUserLogin->getUserName(); - $fromid = $cUserLogin->getUserID(); - $subject = Lang("member_toadmin_subject"); - $message = Lang('member_toadmin_message',array('userid'=>$userid,'typename'=>$row['typename'])); + $floginid = $cuserLogin->getUserName(); + $fromid = $cuserLogin->getUserID(); + $subject = "恭喜您已经成功提升为管理员"; + $message = "亲爱的会员{$userid}，您已经成功提升为{$row['typename']}，具体操作权限请同网站超级管理员联系"; $sendtime = $writetime = time(); - $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) - VALUES ('$floginid','$fromid','$id','$userid','inbox','$subject','$sendtime','$writetime','0','0','$message'); "; + $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) VALUES ('$floginid','$fromid','$id','$userid','inbox','$subject','$sendtime','$writetime','0','0','$message'); "; $dsql->ExecuteNoneQuery($inquery); - ShowMsg(Lang("member_toadmin_success"), "member_main.php"); + ShowMsg("成功升级一个帐户", "member_main.php"); exit(); } $id = preg_replace("#[^0-9]#", "", $id); + //显示用户信息 $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); diff --git a/src/admin/member_type.php b/src/admin/member_type.php index 125fa4dc..25b508ff 100644 --- a/src/admin/member_type.php +++ b/src/admin/member_type.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Type'); +CheckPurview('member_Type'); if (empty($dopost)) $dopost = ""; //保存修改 if ($dopost == "save") { @@ -28,7 +27,7 @@ if ($dopost == "save") { $query = "UPDATE `#@__member_type` SET pname='$pname',money='$money',`rank`='$rank',exptime='$exptime' WHERE aid='$aid'"; } } else { - $query = "DELETE FROM `#@__member_type` WHERE aid='$aid'"; + $query = "DELETE FROM `#@__member_type` WHERE aid='$aid' "; } if ($query != '') { $dsql->ExecuteNoneQuery($query); @@ -39,21 +38,21 @@ if ($dopost == "save") { $query = "INSERT INTO `#@__member_type` (`rank`,pname,money,exptime) VALUES ('{$rank_new}','{$pname_new}','{$money_new}','{$exptime_new}');"; $dsql->ExecuteNoneQuery($query); } - header("Content-Type: text/html; charset=utf-8"); - echo ""; + header("Content-Type: text/html; charset={$cfg_soft_lang}"); + echo ""; } $arcranks = array(); -$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank`>10"); +$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank`>10 "); $dsql->Execute(); while ($row = $dsql->GetArray()) { $arcranks[$row['rank']] = $row['membername']; } $times = array(); -$times[7] = Lang('day_7'); -$times[30] = Lang('day_30'); -$times[90] = Lang('day_90'); -$times[183] = Lang('day_183'); -$times[366] = Lang('day_366'); -$times[32767] = Lang('day_32767'); +$times[7] = '一周'; +$times[30] = '一个月'; +$times[90] = '三个月'; +$times[183] = '半年'; +$times[366] = '一年'; +$times[32767] = '终身'; require_once(DEDEADMIN."/templets/member_type.htm"); ?> \ No newline at end of file diff --git a/src/admin/member_view.php b/src/admin/member_view.php index 17f5a628..fcbb1bc3 100644 --- a/src/admin/member_view.php +++ b/src/admin/member_view.php @@ -8,22 +8,21 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('member_Edit'); +CheckPurview('member_Edit'); $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? "member_main.php" : ''; $id = preg_replace("#[^0-9]#", "", $id); -$row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id'"); +$row = $dsql->GetOne("SELECT * from #@__member where mid='$id'"); $staArr = array( - -10 => Lang('member_sta_-10'), - -2 => Lang('member_sta_-2'), - -1 => Lang('member_sta_-1'), - 0 => Lang('member_sta_0'), - 1 => Lang('member_sta_1'), - 2 => Lang('member_sta_2') + -10 => '等待验证邮件', + -2 => '限制用户(禁言)', + -1 => '未通过审核', + 0 => '审核通过，提示填写完整信息', + 1 => '没填写详细资料', + 2 => '正常使用状态' ); //如果这个用户是管理员帐号，必须有足够权限的用户才能操作 -if ($row['matt'] == 10) UserLogin::CheckPurview('sys_User'); +if ($row['matt'] == 10) CheckPurview('sys_User'); if ($row['uptime'] > 0 && $row['exptime'] > 0) { $mhasDay = $row['exptime'] - ceil((time() - $row['uptime']) / 3600 / 24) + 1; } else { diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 898f3bf5..ea26c8ba 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -8,15 +8,13 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeHttpDown; -use DedeBIZ\libraries\DedeModule; -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('sys_module'); +CheckPurview('sys_module'); +require_once(DEDEINC."/dedemodule.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($action)) $action = ''; $mdir = DEDEDATA.'/module'; $mdurl = ""; @@ -38,24 +36,27 @@ function ReWriteConfigAuto() global $dsql; $configfile = DEDEDATA.'/config.cache.inc.php'; if (!is_writeable($configfile)) { - echo Lang('config_file_nowriteable',array('file'=>$configfile)); + echo "配置文件 {$configfile} 不支持写入，无法修改系统配置参数"; exit(); } $fp = fopen($configfile, 'w'); flock($fp, 3); fwrite($fp, "<"."?php\r\n"); - $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC"); + $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC "); $dsql->Execute(); while ($row = $dsql->GetArray()) { - if (empty($row['value']) && $row['type'] == 'number') $row['value'] = 0; + if(empty($row['value']) && $row['type'] == 'number') $row['value'] = 0; if ($row['type'] == 'number') fwrite($fp, "\${$row['varname']} = ".$row['value'].";\r\n"); else fwrite($fp, "\${$row['varname']} = '".str_replace("'", '', $row['value'])."';\r\n"); } fwrite($fp, "?".">"); fclose($fp); } +/*-------------- +function ShowAll(); +--------------*/ if ($action == '') { - $types = array('soft' => Lang('module_soft'), 'templets' => Lang('template'), 'plus' => Lang('module_plus'), 'patch' => Lang('module_patch')); + $types = array('soft' => '模块', 'templets' => '模板', 'plus' => '小插件', 'patch' => '补丁'); $dm = new DedeModule($mdir); if (empty($moduletype)) $moduletype = ''; $modules_remote = $dm->GetModuleUrlList($moduletype, $mdurl); @@ -69,12 +70,15 @@ if ($action == '') { $dm->Clear(); exit(); } +/*-------------- +function ViewDevelopoer(); +--------------*/ else if ($action == 'view_developoer') { //检验开发者信息 $dm = new DedeModule($mdir); $info = $dm->GetModuleInfo($hash); if ($info == null) { - ShowMsg(Lang("module_err_viewdev"), -1); + ShowMsg("获取模块信息错误，模块文件可能被篡改", -1); exit; } $dev_id = $info['dev_id']; @@ -85,24 +89,27 @@ else if ($action == 'view_developoer') { $devInfo = (array)json_decode($devContent); $offUrl = ""; if ($devInfo['dev_type'] == 1) { - $offUrl = "

    ".Lang('module_offical')."：{$devInfo['offurl']}".Lang('module_offical_copy')."

    "; + $offUrl = "

    官方网址：{$devInfo['offurl']}（复制在浏览器中打开）

    "; } $authAt = date("Y-m-d", $devInfo['auth_at']); if (!isset($info['dev_id'])) { - $devInfo['dev_name'] = $info['team']."".Lang('module_unauthed').""; - $authAt = Lang('unknow'); + $devInfo['dev_name'] = $info['team']."未认证"; + $authAt = "未知"; } - ShowMsg("

    ".Lang('module_dev_name')."：{$devInfo['dev_name']}

    ".Lang('module_dev_id')."：{$devInfo['dev_id']}

    ".Lang('module_auth_at')."：{$authAt}", "-1"); + ShowMsg("

    开发者名称：{$devInfo['dev_name']}

    开发者ID：{$devInfo['dev_id']}

    认证于：{$authAt}", "-1"); exit; } +/*-------------- +function Setup(); +--------------*/ else if ($action == 'setup') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos == null) { - ShowMsg(Lang("module_err_viewdev"), -1); + ShowMsg("获取模块信息错误，模块文件可能被篡改", -1); exit; } - $alertMsg = ($infos['lang'] == 'utf-8' ? '' : '
    '.Lang('module_setup_tip')); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
    （这个模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性）'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; $prvdirs = array(); @@ -110,10 +117,10 @@ else if ($action == 'setup') { foreach ($filelists as $v) { if (empty($v['name'])) continue; if ($v['type'] == 'dir') { - $v['type'] = Lang('dir'); + $v['type'] = '目录'; $incdir[] = $v['name']; } else { - $v['type'] = Lang('file'); + $v['type'] = '文件'; } $filelist .= "{$v['type']}|{$v['name']}\r\n"; } @@ -134,7 +141,7 @@ else if ($action == 'setup') { } } $prvdir = "\r\n"; - $prvdir .= "\r\n"; + $prvdir .= "\r\n"; foreach ($prvdirs as $k => $v) { if ($v) $cw = '√'; else $cw = "×"; @@ -142,80 +149,84 @@ else if ($action == 'setup') { $prvdir .= "\r\n"; } $prvdir .= "
    ".Lang('dir')."".Lang('writeable')."
    目录可写
    $cw
    "; - $wecome_info = Lang("module_main"); + $win = new OxWindow(); + $win->Init("module_main.php", "js/blank.js", "post"); + $wecome_info = "模块管理"; $devURL = DEDECDNURL."/developers/{$infos['dev_id']}.json"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); - $s = Lang('module_unauthed'); + $s = "未认证"; if (($devInfo['dev_id'] == $infos['dev_id']) && !empty($devInfo['dev_id'])) { - $s = Lang('module_authed'); + $s = "已认证"; } + $win->AddTitle("模块管理 > 安装模块：{$infos['name']}"); + $win->AddHidden("hash", $hash); + $win->AddHidden("action", 'setupstart'); $msg = " - + - + - + - + - + - - + + - + - + - +
    ".Lang('module_name')."：模块名称： {$infos['name']}
    ".Lang('module_lang')."：语言： {$infos['lang']} {$alertMsg}
    ".Lang('module_filesize')."：文件大小： {$infos['filesize']}
    ".Lang('module_dev_id')."：开发者ID： {$infos['dev_id']} {$s}
    ".Lang('module_time')."：发布时间： {$infos['time']}
    ".Lang('module_licence')."：".Lang('view')."使用协议：浏览
    -
    ".Lang('module_setup_tip2')."
    +
    注意事项：安装时请确保文件列表中涉及的目录前可写入权限，此外“后台管理目录”、“后台管理目录/templets”目录也必须暂时设置可写入权限
    ".Lang('module_prvdir')."目录权限检测：
    ../ 为根目录
    ./ 表示当前目录    		 $prvdir
    ".Lang('module_filelist')."：模块包含的所有文件列表：
    ".Lang('module_isreplace')."：对于已存在文件处理方法： - - - + + +
    "; - DedeWin::Instance()->Init("module_main.php", "js/blank.js", "post") - ->AddTitle("".Lang("module_main")." > ".Lang('module_setup')."：{$infos['name']}") - ->AddHidden("hash", $hash) - ->AddHidden("action", 'setupstart') - ->AddMsgItem("
    $msg
    ") - ->GetWindow("ok", "") - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("ok", ""); + $win->Display(); $dm->Clear(); exit(); } +/*--------------- +function SetupRun() +--------------*/ else if ($action == 'setupstart') { if (!is_writeable($mdir)) { - ShowMsg(Lang("module_err_setupstart",array('mdir'=>$mdir)), "-1"); + ShowMsg("目录 {$mdir} 不支持写入，这将导致程序安装没法正常创建", "-1"); exit(); } $dm = new DedeModule($mdir); @@ -223,11 +234,11 @@ else if ($action == 'setupstart') { extract($minfos, EXTR_SKIP); $menustring = addslashes($dm->GetSystemFile($hash, 'menustring')); $indexurl = str_replace('**', '=', $indexurl); - $query = "INSERT INTO `#@__sys_module` (`hashcode`,`modname`,`indexname`,`indexurl`,`ismember`,`menustring` ) VALUES ('$hash','$name','$indexname','$indexurl','$ismember','$menustring')"; - $rs = $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash'"); + $query = "INSERT INTO `#@__sys_module` (`hashcode`,`modname`,`indexname`,`indexurl`,`ismember`,`menustring` ) VALUES ('$hash','$name','$indexname','$indexurl','$ismember','$menustring' ) "; + $rs = $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash' "); $rs = $dsql->ExecuteNoneQuery($query); if (!$rs) { - ShowMsg(Lang('module_err_database',array('err'=>$dsql->GetError())), 'javascript:;'); + ShowMsg('保存数据库信息失败，无法完成安装'.$dsql->GetError(), 'javascript:;'); exit(); } $dm->WriteFiles($hash, $isreplace); @@ -262,110 +273,122 @@ else if ($action == 'setupstart') { } ReWriteConfigAuto(); $rflwft = ""; echo $rflwft; UpDateCatCache(); - ShowMsg(Lang('module_success_setup'), 'module_main.php'); + ShowMsg('模块安装完成', 'module_main.php'); exit(); } } +/*-------------- +function DelModule(); +--------------*/ else if ($action == 'del') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); - $alertMsg = ($infos['lang'] == 'utf-8' ? '' : '
    '.Lang('module_lang_tip')); - $dev_id = empty($infos['dev_id'])? "".Lang('module_unauthed')."" : "{$infos['dev_id']} ".Lang('module_authed').""; - $wecome_info = Lang("module_main"); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
    （这个模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性）'); + $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; + $win = new OxWindow(); + $win->Init("module_main.php", "js/blank.js", "post"); + $wecome_info = "模块管理"; + $win->AddTitle("模块管理 > 删除模块：{$infos['name']}"); + $win->AddHidden('hash', $hash); + $win->AddHidden('action', 'delok'); $msg = " - + - + - + - + - + - - + + - +
    ".Lang('module_name')."：模块名称： {$infos['name']}
    ".Lang('module_lang')."：语言： {$infos['lang']} {$alertMsg}
    ".Lang('module_filesize')."：文件大小： {$infos['filesize']}
    ".Lang('module_dev_id')."：开发者ID： {$dev_id}
    ".Lang('module_time')."：发布时间： {$infos['time']}
    ".Lang('module_licence')."：".Lang('view')."使用协议：浏览
    ".Lang('module_delete_confirm',array('hash'=>$hash))."删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除
    "; - DedeWin::Instance()->Init("module_main.php", "js/blank.js", "post") - ->AddTitle("".Lang("module_main")." > ".Lang('module_delete')."：{$infos['name']}") - ->AddHidden('hash', $hash) - ->AddHidden('action', 'delok') - ->AddMsgItem("
    $msg
    ") - ->GetWindow("ok", "") - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("ok", ""); + $win->Display(); $dm->Clear(); exit(); } else if ($action == 'delok') { $dm = new DedeModule($mdir); $modfile = $mdir."/".$dm->GetHashFile($hash); - unlink($modfile) or die(Lang('module_delete_failed',array('modfile'=>$modfile))); - ShowMsg(Lang("module_delete_success"), "module_main.php"); + unlink($modfile) or die("删除文件 {$modfile} 失败"); + ShowMsg("成功删除一个模块文件", "module_main.php"); exit(); } +/*-------------- +function UnInstall(); +--------------*/ else if ($action == 'uninstall') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == 'utf-8' ? '' : Lang('module_lang_tip')); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
    （这个模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性）'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; foreach ($filelists as $v) { if (empty($v['name'])) continue; - if ($v['type'] == 'dir') $v['type'] = Lang('dir'); - else $v['type'] = Lang('file'); + if ($v['type'] == 'dir') $v['type'] = '目录'; + else $v['type'] = '文件'; $filelist .= "{$v['type']}|{$v['name']}\r\n"; } - $dev_id = empty($infos['dev_id'])? "".Lang('module_unauthed')."" : "{$infos['dev_id']} ".Lang('module_authed').""; - $wecome_info = Lang("module_main"); + $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; + $win = new OxWindow(); + $win->Init("module_main.php", "js/blank.js", "post"); + $wecome_info = "模块管理"; + $win->AddTitle("模块管理 > 卸载模块：{$infos['name']}"); + $win->AddHidden("hash", $hash); + $win->AddHidden("action", 'uninstallok'); $msg = " - + - + - + - + - + - - + + - + @@ -374,25 +397,24 @@ else if ($action == 'uninstall') { - +
    ".Lang('module_name')."：模块名称： {$infos['name']}
    ".Lang('module_lang')."：语言： {$infos['lang']} {$alertMsg}
    ".Lang('module_filesize')."：文件大小： {$infos['filesize']}
    ".Lang('module_dev_id')."：开发者ID： {$dev_id}
    ".Lang('module_time')."：发布时间： {$infos['time']}
    ".Lang('module_licence')."：".Lang('view')."使用协议：浏览
    ".Lang('module_filelist2')."模块包含的文件（文件路径相对于当前目录）
    ".Lang('module_uninstall_isreplace')."对于模块的文件处理方法： - - + +
    "; - DedeWin::Instance()->Init("module_main.php", "js/blank.js", "post") - ->AddTitle("".Lang("module_main")." > ".Lang('module_uninstall')."：{$infos['name']}") - ->AddHidden("hash", $hash); - $win->AddHidden("action", 'uninstallok') - ->AddMsgItem("
    $msg
    ") - ->GetWindow("ok", "") - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("ok", ""); + $win->Display(); $dm->Clear(); exit(); } +/*-------------- +function UnInstallRun(); +--------------*/ else if ($action == 'uninstallok') { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash' "); $dm = new DedeModule($mdir); $minfos = (array)$dm->GetModuleInfo($hash); extract($minfos, EXTR_SKIP); @@ -417,33 +439,40 @@ else if ($action == 'uninstallok') { } ReWriteConfigAuto(); $rflwft = ""; echo $rflwft; - ShowMsg(Lang('module_uninstallok'), 'module_main.php'); + ShowMsg('模块卸载完成', 'module_main.php'); exit(); } } +/*-------------- +function ShowReadme(); +--------------*/ else if ($action == 'showreadme') { $dm = new DedeModule($mdir); $msg = $dm->GetSystemFile($hash, 'readme'); $msg = preg_replace("/(.*)(.*)/isU", "", $msg); $dm->Clear(); - $wecome_info = Lang("module_main"); - DedeWin::Instance()->Init("module_main.php", "js/blank.js", "post") - ->AddTitle("".Lang("module_main")." > ".Lang('module_showreadme')."：") - ->AddMsgItem("
    $msg
    ") - ->GetWindow("hand") - ->Display(); + $win = new OxWindow(); + $win->Init("module_main.php", "js/blank.js", "post"); + $wecome_info = "模块管理"; + $win->AddTitle("模块管理 > 使用说明："); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("hand"); + $win->Display(); exit(); } +/*-------------- +function ViewOne(); +--------------*/ else if ($action == 'view') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == 'utf-8' ? '' : Lang('module_lang_tip')); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
    （这个模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性）'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; $setupinfo = ''; @@ -452,52 +481,55 @@ else if ($action == 'view') { $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); - $s = Lang("module_unauthed"); + $s = "未认证"; if (($devInfo['dev_id'] == $infos['dev_id']) && !empty($devInfo['dev_id'])) { - $s = Lang("module_authed"); + $s = "已认证"; } foreach ($filelists as $v) { if (empty($v['name'])) continue; - if ($v['type'] == 'dir') $v['type'] = Lang('dir'); - else $v['type'] = Lang('file'); + if ($v['type'] == 'dir') $v['type'] = '目录'; + else $v['type'] = '文件'; $filelist .= "{$v['type']}|{$v['name']}\r\n"; } if (file_exists(DEDEDATA."/module/{$hash}-readme.php")) { - $setupinfo = Lang('module_installed')." ".Lang('module_uninstall').""; + $setupinfo = "已安装 卸载"; } else { - $setupinfo = Lang('module_uninstalled')." ".Lang('module_setup').""; + $setupinfo = "未安装 安装"; } - $dev_id = empty($infos['dev_id'])? "".Lang('install')."{$s}" : "{$infos['dev_id']} ".Lang('install')."{$s}"; - $wecome_info = Lang("module_main"); + $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} 安装{$s}"; + $win = new OxWindow(); + $win->Init("", "js/blank.js", ""); + $wecome_info = "模块管理"; + $win->AddTitle("模块管理 > 模块详情：{$infos['name']}"); $msg = " - + - + - + - + - + - + - + @@ -506,14 +538,15 @@ else if ($action == 'view') {
    ".Lang('module_name')."：模块名称： {$infos['name']}
    ".Lang('module_lang')."：语言： {$infos['lang']} {$alertMsg}
    ".Lang('module_filesize')."：文件大小： {$infos['filesize']}
    ".Lang('module_dev_id')."：开发者ID： {$dev_id}
    ".Lang('module_time')."：发布时间： {$infos['time']}
    ".Lang('module_licence')."：使用协议： 浏览
    ".Lang('module_filelist2')."模块包含的文件（文件路径相对于当前目录）
    "; - DedeWin::Instance()->Init("", "js/blank.js", "") - ->AddTitle("".Lang("module_main")." > ".Lang('module_detail')."：{$infos['name']}") - ->AddMsgItem("
    $msg
    ") - ->GetWindow('hand', '') - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('hand', ''); + $win->Display(); $dm->Clear(); exit(); } +/*-------------- +function Edit(); +--------------*/ else if ($action == 'edit') { $dm = new DedeModule($mdir); $minfos = (array)$dm->GetModuleInfo($hash); @@ -530,7 +563,10 @@ else if ($action == 'edit') { require_once(dirname(__FILE__).'/templets/module_edit.htm'); exit(); } +/*-------------- +function Download(); +--------------*/ else if ($action == 'download') { - ShowMsg(Lang("module_download_unsupport"), "javascript:;"); + ShowMsg("暂不支持模块下载功能", "javascript:;"); } ?> \ No newline at end of file diff --git a/src/admin/module_make.php b/src/admin/module_make.php index ffb5078b..7efc7b46 100644 --- a/src/admin/module_make.php +++ b/src/admin/module_make.php @@ -8,23 +8,25 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeHttpDown; -use DedeBIZ\libraries\DedeModule; -use DedeBIZ\Login\UserLogin; @set_time_limit(0); require_once(dirname(__FILE__)."/config.php"); +require_once(DEDEINC."/dedemodule.class.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('sys_module'); +CheckPurview('sys_module'); if (empty($action)) $action = ''; if ($action == '') { $modules = array(); require_once(dirname(__FILE__)."/templets/module_make.htm"); exit(); } +/*------------- //生成项目 +function Makemodule() +--------------*/ else if ($action == 'make') { + require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); //校验私钥,确定开发者身份 $devURL = DEDECDNURL."/developers/$dev_id.json"; $dhd = new DedeHttpDown(); @@ -32,25 +34,25 @@ else if ($action == 'make') { $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) { - ShowMsg(Lang("module_auth_outtime"), "-1"); + ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请!", "-1"); exit(); } $filelist = str_replace("\r", "\n", trim($filelist)); $filelist = trim(preg_replace("#[\n]{1,}#", "\n", $filelist)); if ($filelist == '') { - ShowMsg(Lang("module_auth_err_fileempty"), "-1"); + ShowMsg("对不起，您没有指定模块的文件列表，因此不能创建项目", "-1"); exit(); } if (empty($dev_id)) { - ShowMsg(Lang("module_auth_err_devid_empty"), "-1"); + ShowMsg("开发者ID不能为空", "-1"); exit(); } if (empty($priv)) { - ShowMsg(Lang("module_auth_err_priv_empty"), "-1"); + ShowMsg("请填写开发者私钥信息", "-1"); exit(); } if (strlen($modulname) > 150) { - ShowMsg(Lang("module_auth_err_modulname_toolong"), "-1"); + ShowMsg("模块名称过长", "-1"); exit(); } //校验私钥合法性 @@ -60,11 +62,11 @@ else if ($action == 'make') { )); //私钥加密模块信息 openssl_private_encrypt($enstr, $encotent, $priv); - $moduleInfo = DedeModule::base64url_encode($encotent); + $moduleInfo = base64url_encode($encotent); openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']); $minfo = (array)json_decode($decontent); if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) { - ShowMsg(Lang("module_auth_err_priv_check"), "-1"); + ShowMsg("开发者私钥校验失败，请确保填写正确的开发者私钥", "-1"); exit(); } //去除转义 @@ -79,12 +81,12 @@ else if ($action == 'make') { $dm = new DedeModule($mdir); if ($dm->HasModule($hashcode)) { $dm->Clear(); - ShowMsg(Lang("module_auth_err_modulname_exists",array('hashcode'=>$hashcode)), "-1"); + ShowMsg("对不起，您指定同名模块已经存在，因此不能创建项目
    如果您要更新这个模块，请先删除：module/{$hashcode}.xml", "-1"); exit(); } $readmef = $setupf = $uninstallf = ''; if (empty($readmetxt)) { - move_uploaded_file($readme, $mdir."/{$hashcode}-r.html") or die(Lang("module_auth_err_readme_empty")); + move_uploaded_file($readme, $mdir."/{$hashcode}-r.html") or die("您没填写说明或上传说明文件"); $readmef = $dm->GetEncodeFile($mdir."/{$hashcode}-r.html", TRUE); } else { $readmetxt = "

    ".$readmetxt; @@ -93,20 +95,20 @@ else if ($action == 'make') { $readmef = base64_encode(trim($readmetxt)); } if ($autosetup == 0) { - move_uploaded_file($setup, $mdir."/{$hashcode}-s.php") or die(Lang("module_auth_err_autosetup")); + move_uploaded_file($setup, $mdir."/{$hashcode}-s.php") or die("您没上传，或系统无法把setup文件移动到 module 目录"); $setupf = $dm->GetEncodeFile($mdir."/{$hashcode}-s.php", TRUE); } if ($autodel == 0) { - move_uploaded_file($uninstall, $mdir."/{$hashcode}-u.php") or die(Lang("module_auth_err_autodel")); + move_uploaded_file($uninstall, $mdir."/{$hashcode}-u.php") or die("您没上传，或系统无法把uninstall文件移动到 module 目录"); $uninstallf = $dm->GetEncodeFile($mdir."/{$hashcode}-u.php", TRUE); } if (trim($setupsql40) == '') $setupsql40 = ''; else $setupsql40 = base64_encode(trim($setupsql40)); - //if (trim($setupsql41)=='') $setupsql41 = ''; + //if(trim($setupsql41)=='') $setupsql41 = ''; //else $setupsql41 = base64_encode(trim($setupsql41)); if (trim($delsql) == '') $delsql = ''; else $delsql = base64_encode(trim($delsql)); - $pub_key = DedeModule::base64url_encode($devInfo['pub_key']); + $pub_key = base64url_encode($devInfo['pub_key']); $modulinfo = " name={$modulname} @@ -163,37 +165,40 @@ $filelist fwrite($fp, "\r\n"); fwrite($fp, "\r\n"); fclose($fp); - ShowMsg(Lang("module_success_make"), "module_main.php"); + ShowMsg("成功对一个新模块进行编译", "module_main.php"); exit(); } +/*------------- //修改项目 +function editModule() +--------------*/ else if ($action == 'edit') { $filelist = str_replace("\r", "\n", trim($filelist)); $filelist = trim(preg_replace("#[\n]{1,}#", "\n", $filelist)); if ($filelist == "") { - ShowMsg(Lang("module_auth_err_fileempty"), "-1"); + ShowMsg("对不起，您没有指定模块的文件列表，因此不能创建项目", "-1"); exit(); } if (empty($dev_id)) { - ShowMsg(Lang("module_auth_err_devid_empty"), "-1"); + ShowMsg("开发者ID不能为空", "-1"); exit(); } if (empty($priv)) { - ShowMsg(Lang("module_auth_err_priv_empty"), "-1"); + ShowMsg("请填写开发者私钥信息", "-1"); exit(); } - //校验私钥，确定开发者身份 + //校验私钥,确定开发者身份 $devURL = DEDECDNURL."/developers/$dev_id.json"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) { - ShowMsg(Lang("module_auth_outtime"), "-1"); + ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请!", "-1"); exit(); } if (strlen($modulname) > 150) { - ShowMsg(Lang("module_auth_err_modulname_toolong"), "-1"); + ShowMsg("模块名称过长", "-1"); exit(); } //校验私钥合法性 @@ -203,11 +208,11 @@ else if ($action == 'edit') { )); //私钥加密模块信息 openssl_private_encrypt($enstr, $encotent, $priv); - $moduleInfo = DedeModule::base64url_encode($encotent); + $moduleInfo = base64url_encode($encotent); openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']); $minfo = (array)json_decode($decontent); if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) { - ShowMsg(Lang("module_auth_err_priv_check"), "-1"); + ShowMsg("开发者私钥校验失败，请确保填写正确的开发者私钥", "-1"); exit(); } //已经去除转义 @@ -225,21 +230,21 @@ else if ($action == 'edit') { $setupf = $uninstallf = ''; //编译setup文件 if (is_uploaded_file($setup)) { - move_uploaded_file($setup, $mdir."/{$hashcode}-s.php") or die(Lang("module_auth_err_autosetup")); + move_uploaded_file($setup, $mdir."/{$hashcode}-s.php") or die("您没上传，或系统无法把setup文件移动到 module 目录"); $setupf = $dm->GetEncodeFile($mdir."/{$hashcode}-s.php", TRUE); } else { if ($autosetup == 0) $setupf = base64_encode($dm->GetSystemFile($hashcode, 'setup')); } //编译uninstall文件 if (is_uploaded_file($uninstall)) { - move_uploaded_file($uninstall, $mdir."/{$hashcode}-u.php") or die(Lang("module_auth_err_autodel")); + move_uploaded_file($uninstall, $mdir."/{$hashcode}-u.php") or die("您没上传，或系统无法把uninstall文件移动到 module 目录"); $uninstallf = $dm->GetEncodeFile($mdir."/{$hashcode}-u.php", true); } else { if ($autodel == 0) $uninstallf = base64_encode($dm->GetSystemFile($hashcode, 'uninstall')); } if (trim($setupsql40) == '') $setupsql40 = ''; else $setupsql40 = base64_encode(htmlspecialchars_decode(trim($setupsql40))); - //if (trim($setupsql41)=='') $setupsql41 = ''; + //if(trim($setupsql41)=='') $setupsql41 = ''; //else $setupsql41 = base64_encode(trim($setupsql41)); if (trim($delsql) == '') $delsql = ''; else $delsql = base64_encode(strip_tags(trim($delsql))); @@ -307,7 +312,7 @@ $filelist fwrite($fp, $fxml); fclose($fp); } - ShowMsg(Lang("module_success_make"), "module_main.php"); + ShowMsg("成功对模块重新编译", "module_main.php"); exit(); }//ClearAllLink(); ?> \ No newline at end of file diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index ae65e988..5af12fc5 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -8,24 +8,23 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeModule; -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\libraries\zip; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('sys_module'); +CheckPurview('sys_module'); +require_once(DEDEINC."/dedemodule.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($action)) $action = ''; $mdir = DEDEDATA.'/module'; if ($action == 'upload') { if (!is_uploaded_file($upfile)) { - ShowMsg(Lang("tpl_upload_empty"), "javascript:;"); + ShowMsg("您什么都没有上传", "javascript:;"); exit(); } else { + include_once(DEDEINC."/libraries/zip.class.php"); $tmpfilename = $mdir.'/'.ExecTime().mt_rand(10000, 50000).'.tmp'; - move_uploaded_file($upfile, $tmpfilename) or die(Lang('module_upload_err_file',array('tmpfilename'=>$tmpfilename,'mdir'=>$mdir))); + move_uploaded_file($upfile, $tmpfilename) or die("把上传的文件移动到 {$tmpfilename} 时失败，请检查 {$mdir} 目录是否有写入权限"); //ZIP格式的文件 if ($filetype == 1) { $z = new zip(); @@ -43,7 +42,7 @@ if ($action == 'upload') { } if ($dedefileindex == -1) { unlink($tmpfilename); - ShowMsg(Lang("module_upload_err_index"), "javascript:;"); + ShowMsg("对不起，您上传的压缩包中不存在dede模块文件
    重新上传", "javascript:;"); exit(); } $ziptmp = $mdir.'/ziptmp'; @@ -56,7 +55,7 @@ if ($action == 'upload') { if (empty($infos['hash'])) { unlink($tmpfilename); $dm->Clear(); - ShowMsg(Lang("module_upload_err_mfile"), "javascript:;"); + ShowMsg("对不起，您上传的文件可能不是织梦模块的标准格式文件
    重新上传", "javascript:;"); exit(); } if (preg_match("#[^0-9a-zA-Z]#", $infos['hash'])) { @@ -66,41 +65,43 @@ if ($action == 'upload') { if ($dm->HasModule($infos['hash']) && empty($delhas)) { unlink($tmpfilename); $dm->Clear(); - ShowMsg(Lang("module_upload_err_exists"), "javascript:;"); + ShowMsg("对不起，您上传的模块已经存在
    如果要覆盖请先删除原来版本或选择强制删除的选项
    重新上传", "javascript:;"); exit(); } @unlink($okfile); copy($tmpfilename, $okfile); @unlink($tmpfilename); $dm->Clear(); - ShowMsg(Lang("module_upload_success"), "module_main.php?action=view&hash={$infos['hash']}"); + ShowMsg("成功上传一个新的模块", "module_main.php?action=view&hash={$infos['hash']}"); exit(); } } else { - $wecome_info = "".Lang("module_main")." > ".Lang('module_upload'); + $win = new OxWindow(); + $win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data"); + $win->mainTitle = "模块管理"; + $wecome_info = "模块管理 > 上传模块"; + $win->AddTitle('请选择要上传的文件：'); + $win->AddHidden("action", 'upload'); $msg = " - + - - + + - +
    ".Lang('module_upload_filetype')."文件格式： - - + +
    ".Lang('module_upload_delhas')."已有模块：
    ".Lang('module_upload_upfile')."请选择文件：
    "; - DedeWin::Instance()->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data") - ->AddTitle(Lang('module_upload_title')) - ->AddHidden("action", 'upload') - ->AddMsgItem("

    $msg
    ") - ->GetWindow('ok', '') - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('ok', ''); + $win->Display(); exit(); }//ClearAllLink(); ?> \ No newline at end of file diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 15a0fee5..307b0b43 100644 --- a/src/admin/mychannel_add.php +++ b/src/admin/mychannel_add.php @@ -8,24 +8,24 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_New'); +CheckPurview('c_New'); +require_once(DEDEINC."/dedetag.class.php"); if (empty($ismake)) $ismake = 0; if (empty($isdel)) $isdel = 0; if (empty($action)) $action = ''; if ($action == 'add') { //检查输入 if (empty($id) || preg_match("#[^0-9-]#", $id)) { - ShowMsg(Lang("mychannel_id_tip"), "-1"); + ShowMsg("'频道id'必须为数字", "-1"); exit(); } if (preg_match("#[^a-z0-9]#i", $nid) || $nid == "") { - ShowMsg(Lang("mychannel_addtable_namerule_tip"), "-1"); + ShowMsg("'频道名字标识'必须为英文字母或与数字混合字符串", "-1"); exit(); } if ($addtable == "") { - ShowMsg(Lang("mychannel_addtable_err_isempty"), "-1"); + ShowMsg("附加表不能为空", "-1"); exit(); } $trueTable2 = str_replace("#@__", $cfg_dbprefix, $addtable); @@ -33,7 +33,7 @@ if ($action == 'add') { //检查id是否重复 $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' OR nid LIKE '$nid' OR addtable LIKE '$addtable'"); if (is_array($row)) { - ShowMsg(Lang("mychannel_add_err_issame"), "-1"); + ShowMsg("可能‘频道id’、‘频道名称标识’、‘附加表名称’在数据库已存在，不能重复使用", "-1"); exit(); } $mysql_version = $dsql->GetVersion(); @@ -77,7 +77,7 @@ if ($action == 'add') { } $rs = $dsql->ExecuteNoneQuery($tabsql); if (!$rs) { - ShowMsg(Lang('mychannel_add_err_create',array('err'=>$dsql->GetError())), "javascript:;"); + ShowMsg("创建附加表失败!".$dsql->GetError(), "javascript:;"); exit(); } } @@ -97,14 +97,14 @@ if ($action == 'add') { \r\n"; - $listfields = 'channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost'; + $listfields = 'channel,arcrank,mid,click,title,senddate,flag,listpic,lastpost,scores,goodpost,badpost'; } - $inQuery = "INSERT INTO `#@__channeltype`(id,nid,typename,addtable,addcon,mancon,editcon,useraddcon,usermancon,usereditcon,fieldset,listfields,issystem,issend,arcsta,usertype,sendrank,needdes,needpic,titlename,onlyone,dfcid) VALUES ('$id','$nid','$typename','$addtable','$addcon','$mancon','$editcon','$useraddcon','$usermancon','$usereditcon','$fieldset','$listfields','$issystem','$issend','$arcsta','$usertype','$sendrank','$needdes','$needpic','$titlename','$onlyone','$dfcid');"; + $inQuery = "INSERT INTO `#@__channeltype` (id,nid,typename,addtable,addcon,mancon,editcon,useraddcon,usermancon,usereditcon,fieldset,listfields,issystem,issend,arcsta,usertype,sendrank,needdes,needpic,titlename,onlyone,dfcid) VALUES ('$id','$nid','$typename','$addtable','$addcon','$mancon','$editcon','$useraddcon','$usermancon','$usereditcon','$fieldset','$listfields','$issystem','$issend','$arcsta','$usertype','$sendrank','$needdes','$needpic','$titlename','$onlyone','$dfcid');"; $dsql->ExecuteNoneQuery($inQuery); - ShowMsg(Lang("mychannel_add_create_success"), "mychannel_edit.php?id=".$id); + ShowMsg("成功增加一个频道模型", "mychannel_edit.php?id=".$id); exit(); } -$row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id DESC LIMIT 0,1"); +$row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id DESC LIMIT 0,1 "); $newid = $row['id'] + 1; if ($newid < 10) $newid = $newid + 10; require_once(DEDEADMIN."/templets/mychannel_add.htm"); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 8eaa5fe8..0a929a05 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -8,38 +8,42 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; -use DedeBIZ\TypeLink\TypeLink; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_Edit'); +CheckPurview('c_Edit'); +require_once(DEDEINC."/dedetag.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ""; $id = isset($id) && is_numeric($id) ? $id : 0; +/*---------------- +function __ShowHide() +-----------------*/ if ($dopost == "show") { - $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=1 WHERE id='$id'"); - ShowMsg(Lang("operation_successful"), "mychannel_main.php"); + $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=1 WHERE id='$id' "); + ShowMsg("操作成功", "mychannel_main.php"); exit(); } else if ($dopost == "hide") { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=0 WHERE id='$id'"); - ShowMsg(Lang("operation_successful"), "mychannel_main.php"); + ShowMsg("操作成功", "mychannel_main.php"); exit(); } +/*---------------- +function __CopyStart() +-----------------*/ else if ($dopost == "copystart") { if ($id == -1) { - ShowMsg(Lang("mychannel_error_spec_copy"), "-1"); + ShowMsg("专题模型不支持复制", "-1"); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); if ($row['id'] > -1) { - $nrow = $dsql->GetOne("SELECT MAX(id) AS id FROM `#@__channeltype` LIMIT 0,1"); + $nrow = $dsql->GetOne("SELECT MAX(id) AS id FROM `#@__channeltype` LIMIT 0,1 "); $newid = $nrow['id'] + 1; if ($newid < 10) { $newid = $newid + 10; } $idname = $newid; } else { - $nrow = $dsql->GetOne("SELECT MIN(id) AS id FROM `#@__channeltype` LIMIT 0,1"); + $nrow = $dsql->GetOne("SELECT MIN(id) AS id FROM `#@__channeltype` LIMIT 0,1 "); $newid = $nrow['id'] - 1; if ($newid < -10) { $newid = $newid - 10; @@ -47,51 +51,55 @@ else if ($dopost == "copystart") { $idname = 'w'.($newid * -1); } $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); - $wintitle = Lang("mychannel_main")."-".Lang("mychannel_copy"); - $wecome_info = "".Lang("mychannel_main")."::".Lang("mychannel_copy"); + $wintitle = "频道管理-模型复制"; + $wecome_info = "频道管理::模型复制"; + $win = new OxWindow(); + $win->Init("mychannel_edit.php", "js/blank.js", "post"); + $win->AddTitle("被复制频道：[".$row['typename']."]"); + $win->AddHidden("cid", $id); + $win->AddHidden("id", $id); + $win->AddHidden("dopost", 'copysave'); $msg = " - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
    ".Lang('mychannel_cid')."：
    ".Lang("mychannel_typename")."：
    ".Lang("mychannel_nid")."：
    ".Lang("additional_table")."：
    ".Lang("copy_templet")."： - - -
    新频道id：
    新频道名称：
    新频道标识：
    新附加表：
    复制模板： + + +
    "; - DedeWin::Instance()->Init("mychannel_edit.php", "js/blank.js", "post") - ->AddTitle(Lang('mychannel_copied')."：[".$row['typename']."]") - ->AddHidden("cid", $id) - ->AddHidden("id", $id) - ->AddHidden("dopost", 'copysave') - ->AddMsgItem("
    $msg
    ") - ->GetWindow("ok", "") - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("ok", ""); + $win->Display(); exit(); } +/*---------------- +function __Export() +-----------------*/ else if ($dopost == "export") { if ($id == -1) { - ShowMsg(Lang("mychannel_error_spec_export"), "-1"); + ShowMsg("专题模型不支持导出", "-1"); exit(); } - $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); + $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' "); $channelconfig = ''; $row['maintable'] = preg_replace('#dede_#', '#@__', $row['maintable']); $row['addtable'] = preg_replace('#dede_#', '#@__', $row['addtable']); @@ -99,59 +107,68 @@ else if ($dopost == "export") { if ($k == 'fieldset') $v = "\r\n$v\r\n"; $channelconfig .= "$v\r\n"; } - $wintitle = Lang("mychannel_export"); - $wecome_info = "".Lang("mychannel_main")."::".Lang("mychannel_export"); - DedeWin::Instance()->Init() - ->AddTitle(Lang("mychannel_export_title",array('typename'=>$row['typename']))) - ->GetWindow("hand", "") - ->Display(); + $wintitle = "导出内容模型规则"; + $wecome_info = "内容模型管理::导出内容模型规则"; + $win = new OxWindow(); + $win->Init(); + $win->AddTitle("以下为规则 [{$row['typename']}] 的模型规则，您可以共享给您的朋友："); + $winform = $win->GetWindow("hand", ""); + $win->Display(); exit(); } +/*---------------- +function __ExportIn() +-----------------*/ else if ($dopost == "exportin") { - $wintitle = Lang("mychannel_exportin"); - $wecome_info = "".Lang('mychannel_main')."::".Lang("mychannel_exportin"); - DedeWin::Instance()->Init("mychannel_edit.php", "js/blank.js", "post") - ->AddHidden("dopost", "exportinok") - ->AddTitle(Lang("mychannel_exportin_title")) - ->AddMsgItem("") - ->GetWindow("ok") - ->Display(); + $wintitle = "导入内容模型规则"; + $wecome_info = "内容模型管理::导入内容模型规则"; + $win = new OxWindow(); + $win->Init("mychannel_edit.php", "js/blank.js", "post"); + $win->AddHidden("dopost", "exportinok"); + $win->AddTitle("输入规则内容：导入模型会和原有模型冲突，不过可以在导入后修改"); + $win->AddMsgItem(""); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } +/*---------------- +function __ExportInOk() +-----------------*/ else if ($dopost == "exportinok") { require_once(DEDEADMIN."/inc/inc_admin_channel.php"); function GotoStaMsg($msg) { global $wintitle, $wecome_info, $winform; - $wintitle = Lang("mychannel_exportin"); - $wecome_info = "".Lang('mychannel_main')."::".Lang("mychannel_exportin"); - DedeWin::Instance()->Init() - ->AddTitle(Lang("mychannel_exportinok_title")) - ->AddMsgItem($msg) - ->GetWindow("hand") - ->Display(); + $wintitle = "导入内容模型规则"; + $wecome_info = "内容模型管理::导入内容模型规则"; + $win = new OxWindow(); + $win->Init(); + $win->AddTitle("操作状态提示："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand"); + $win->Display(); exit(); } - $msg = Lang("no_message"); + $msg = "无信息"; $exconfig = stripslashes($exconfig); $dtp = new DedeTagParse(); $dtp->SetNameSpace('channel', '<', '>'); $dtp->LoadSource($exconfig); - if (!is_array($dtp->CTags)) GotoStaMsg(Lang("mychannel_err_exportinok_faild")); + if (!is_array($dtp->CTags)) GotoStaMsg("模型规则不是合法的模型规则"); $fields = array(); foreach ($dtp->CTags as $ctag) { $fname = $ctag->GetName('name'); $fields[$fname] = trim($ctag->GetInnerText()); } if (!isset($fields['nid']) || !isset($fields['fieldset'])) { - GotoStaMsg(Lang("mychannel_err_exportinok_faild")); + GotoStaMsg("模型规则不是合法的模型规则"); } //正常的导入过程 $mysql_version = $dsql->GetVersion(true); - $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE nid='{$fields['nid']}'"); + $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE nid='{$fields['nid']}' "); if (is_array($row)) { - GotoStaMsg(Lang("mychannel_err_nid_exists",array("nid"=>$fields['nid']))); + GotoStaMsg("系统中已经存在相同标识 {$fields['nid']} 的规则"); } //创建表 if ($fields['issystem'] != -1) { @@ -180,22 +197,22 @@ else if ($dopost == "exportinok") { } $rs = $dsql->ExecuteNoneQuery($tabsql); if (!$rs) { - GotoStaMsg(Lang("mychannel_err_create_table").$dsql->GetError()); + GotoStaMsg("创建表失败!".$dsql->GetError()); exit(); } if ($fields['issystem'] == 1) $fields['issystem'] = 0; if ($fields['issystem'] == 0) { - $row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id DESC"); + $row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id DESC "); $fields['newid'] = $row['id'] + 1; } else { - $row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id ASC"); + $row = $dsql->GetOne("SELECT id FROM `#@__channeltype` ORDER BY id ASC "); $fields['newid'] = $row['id'] - 1; } $fieldset = $fields['fieldset']; $fields['fieldset'] = addslashes($fields['fieldset']); - $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}' ,'{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}');"; + $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}','{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}' ); "; $rs = $dsql->ExecuteNoneQuery($inquery); - if (!$rs) GotoStaMsg(Lang("mychannel_exportinok_failed",array("error"=>$dsql->GetError()))); + if (!$rs) GotoStaMsg("导入模型时发生错误".$dsql->GetError()); $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource($fieldset); @@ -218,21 +235,24 @@ else if ($dopost == "exportinok") { } } if ($allfields != '') { - $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET listfields='$allfields' WHERE id='{$fields['newid']}'"); + $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET listfields='$allfields' WHERE id='{$fields['newid']}' "); } - GotoStaMsg(Lang("mychannel_exportinok_success")); + GotoStaMsg("成功导入一个模型"); } +/*---------------- +function __SaveCopy() +-----------------*/ else if ($dopost == "copysave") { $cid = intval($cid); - $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$cid' ", PDO::FETCH_ASSOC); + $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$cid' ", MYSQL_ASSOC); foreach ($row as $k => $v) { ${strtolower($k)} = addslashes($v); } - $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('$newid','$newnid','$newtypename','$newaddtable','$addcon','$mancon','$editcon','$useraddcon','$usermancon','$usereditcon','$fieldset','$listfields','$issystem','$isshow','$issend','$arcsta','$usertype','$sendrank');"; + $inquery = " INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank` ) VALUES ('$newid','$newnid','$newtypename','$newaddtable','$addcon','$mancon','$editcon','$useraddcon','$usermancon','$usereditcon','$fieldset','$listfields','$issystem','$isshow','$issend','$arcsta','$usertype','$sendrank'); "; $mysql_version = $dsql->GetVersion(TRUE); if (!$dsql->IsTable($newaddtable)) { $dsql->Execute('me', "SHOW CREATE TABLE {$dsql->dbName}.{$addtable}"); - $row = $dsql->GetArray('me', PDO::FETCH_BOTH); + $row = $dsql->GetArray('me', MYSQL_BOTH); $tableStruct = $row[1]; $tb = str_replace('#@__', $cfg_dbprefix, $addtable); $tableStruct = preg_replace("/CREATE TABLE `$addtable`/iU", "CREATE TABLE `$newaddtable`", $tableStruct); @@ -246,88 +266,121 @@ else if ($dopost == "copysave") { } $rs = $dsql->ExecuteNoneQuery($inquery); if ($rs) { - ShowMsg(Lang("mychannel_copy_success"), "mychannel_edit.php?id={$newid}&dopost=edit"); + ShowMsg("成功复制模型，现转到详细参数页 ", "mychannel_edit.php?id={$newid}&dopost=edit"); exit(); } else { $errv = $dsql->GetError(); - ShowMsg(Lang("mychannel_copy_failed",array("error"=>$errv)), "javascript:;"); + ShowMsg("系统出错，请把错误代码发送到官方论坛，以检查原因
    错误代码：mychannel_edit.php?dopost=savecopy $errv", "javascript:;"); exit(); } } +/*------------ +function __SaveEdit() +------------*/ else if ($dopost == "save") { $fieldset = preg_replace("#[\r\n]{1,}#", "\r\n", $fieldset); $usertype = empty($usertype) ? '' : $usertype; - $query = "UPDATE `#@__channeltype` SET typename='$typename',addtable='$addtable',addcon='$addcon',mancon='$mancon',editcon='$editcon',useraddcon='$useraddcon',usermancon='$usermancon',usereditcon='$usereditcon',fieldset='$fieldset',listfields='$listfields',issend='$issend',arcsta='$arcsta',usertype='$usertype',sendrank='$sendrank',needdes='$needdes',needpic='$needpic',titlename='$titlename',onlyone='$onlyone',dfcid='$dfcid' WHERE id='$id'"; + $query = "Update `#@__channeltype` set + typename = '$typename', + addtable = '$addtable', + addcon = '$addcon', + mancon = '$mancon', + editcon = '$editcon', + useraddcon = '$useraddcon', + usermancon = '$usermancon', + usereditcon = '$usereditcon', + fieldset = '$fieldset', + listfields = '$listfields', + issend = '$issend', + arcsta = '$arcsta', + usertype = '$usertype', + sendrank = '$sendrank', + needdes = '$needdes', + needpic = '$needpic', + titlename = '$titlename', + onlyone = '$onlyone', + dfcid = '$dfcid' + WHERE id='$id' "; if (trim($fieldset) != '') { $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource(stripslashes($fieldset)); if (!is_array($dtp->CTags)) { - ShowMsg(Lang("mychannel_err_save_cant_parse"), "-1"); + ShowMsg("文本配置参数无效，无法进行解析", "-1"); exit(); } } $trueTable = str_replace("#@__", $cfg_dbprefix, $addtable); if (!$dsql->IsTable($trueTable)) { - ShowMsg(Lang("mychannel_err_no_table",array("table"=>$trueTable)), "-1"); + ShowMsg("系统找不到您所指定的表 $trueTable ，请手工创建这个表", "-1"); exit(); } $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("mychannel_save_success"), "mychannel_main.php"); + ShowMsg("成功修改一个模型", "mychannel_main.php"); exit(); } +/*-------------------- +function __GetTemplate() +--------------------*/ else if ($dopost == "gettemplets") { + require_once(DEDEINC."/libraries/oxwindow.class.php"); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); - $wintitle = Lang("mychannel_main")."-".Lang("mychannel_gettemplets"); - $wecome_info = "".Lang("mychannel_main")."::".Lang("mychannel_gettemplets"); + $wintitle = "频道管理-查看模板"; + $wecome_info = "频道管理::查看模板"; + $win = new OxWindow(); + $win->Init("", "js/blank.js", ""); + $win->AddTitle("频道[".$row['typename']."]默认模板文件说明："); $defaulttemplate = $cfg_templets_dir.'/'.$cfg_df_style; $msg = " - ".Lang("temparticle")."：{$defaulttemplate}/article_{$row['nid']}.htm - [".Lang("edit")."]
    - ".Lang("templist")."：{$defaulttemplate}/list_{$row['nid']}.htm - [".Lang("edit")."] + 文档模板：{$defaulttemplate}/article_{$row['nid']}.htm + [修改]
    + 列表模板：{$defaulttemplate}/list_{$row['nid']}.htm + [修改]
    - ".Lang("tempindex")."：{$defaulttemplate}/index_{$row['nid']}.htm - [".Lang("edit")."] + 频道封面模板：{$defaulttemplate}/index_{$row['nid']}.htm + [修改] "; - DedeWin::Instance()->Init("", "js/blank.js", "") - ->AddTitle(Lang("mychannel_gettemplets_title",array("typename"=>$row['typename']))) - ->AddMsgItem("
    $msg
    ") - ->GetWindow("hand", "") - ->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow("hand", ""); + $win->Display(); exit(); } +/*-------------------- +function __Delete() +--------------------*/ else if ($dopost == "delete") { - UserLogin::CheckPurview('c_Del'); + CheckPurview('c_Del'); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); if ($row['issystem'] == 1) { - ShowMsg(Lang("mychannel_err_delete_system"), "mychannel_main.php"); + ShowMsg("系统模型不允许删除", "mychannel_main.php"); exit(); } if (empty($job)) $job = ""; if ($job == "") //确认提示 { - $wintitle = Lang("mychannel_main")."-".Lang("mychannel_delete"); - $wecome_info = "".Lang("mychannel_main")."::".Lang("mychannel_delete"); - DedeWin::Instance()->Init("mychannel_edit.php", "js/blank.js", "POST") - ->AddHidden("job", "yes") - ->AddHidden("dopost", $dopost) - ->AddHidden("id", $id) - ->AddTitle(Lang("mychannel_delete_title",array("typename"=>$row['typename']))) - ->GetWindow("ok") - ->Display(); + require_once(DEDEINC."/libraries/oxwindow.class.php"); + $wintitle = "频道管理-删除模型"; + $wecome_info = "频道管理::删除模型"; + $win = new OxWindow(); + $win->Init("mychannel_edit.php", "js/blank.js", "POST"); + $win->AddHidden("job", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("id", $id); + $win->AddTitle("您确定要删除 (".$row['typename'].") 这个频道"); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } else if ($job == "yes") //操作 { require_once(DEDEINC."/typelink/typeunit.class.admin.php"); - $myrow = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$id'", PDO::FETCH_ASSOC); + $myrow = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$id'", MYSQL_ASSOC); if (!is_array($myrow)) { - ShowMsg(Lang('mychannel_err_noinfo'), '-1'); + ShowMsg('您所指定的频道信息不存在!', '-1'); exit(); } //检查频道的表是否独占数据表 $addtable = str_replace($cfg_dbprefix, '', str_replace('#@__', $cfg_dbprefix, $myrow['addtable'])); - $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ;"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ; "); $isExclusive2 = ($row['dd'] > 1 ? 0 : 1); //获取与频道关连的所有栏目id $tids = ''; @@ -337,28 +390,31 @@ else if ($dopost == "delete") { } //删除相关信息 if ($tids != '') { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE typeid IN($tids);"); - $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['maintable']}` WHERE typeid IN($tids);"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__spec` WHERE typeid IN ($tids);"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE typeid IN ($tids);"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id IN ($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE typeid IN($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['maintable']}` WHERE typeid IN($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__spec` WHERE typeid IN ($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE typeid IN ($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id IN ($tids); "); } //删除附加表或附加表内的信息 if ($isExclusive2 == 1) { $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$cfg_dbprefix}{$addtable}`;"); } else { if ($tids != '' && $myrow['addtable'] != '') { - $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['addtable']}` WHERE typeid IN ($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['addtable']}` WHERE typeid IN ($tids); "); } } //删除频道配置信息 - $dsql->ExecuteNoneQuery("DELETE FROM `#@__channeltype` WHERE id='$id'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__channeltype` WHERE id='$id' "); //更新栏目缓存 UpDateCatCache($dsql); - ShowMsg(Lang("mychannel_delete_success"), "mychannel_main.php"); + ShowMsg("成功删除一个模型", "mychannel_main.php"); exit(); } } //del +/*---------------- +function __modifysearch() +-----------------*/ else if ($dopost == 'modifysearch') { if (!isset($step)) $step = 0; if (empty($step)) { @@ -383,11 +439,18 @@ else if ($dopost == 'modifysearch') { $c3 = in_array('writer', $searchinfo['mainfields']) ? 'checked' : ''; $c4 = in_array('source', $searchinfo['mainfields']) ? 'checked' : ''; $c5 = in_array('senddate', $searchinfo['mainfields']) ? 'checked' : ''; - $mainfields = ' '; - $mainfields .= ' '; - $mainfields .= ' '; - $mainfields .= ' '; - $mainfields .= ' '; + $mainfields = ' '; + $mainfields .= ' '; + $mainfields .= ' '; + $mainfields .= ' '; + $mainfields .= ' '; + /* + $mainfields .= ''; + $mainfields .= ''; + $mainfields .= ''; + $mainfields .= ''; + $mainfields .= ''; + */ $query = "SELECT * FROM `#@__channeltype` WHERE id='$mid'"; $channel = $dsql->GetOne($query); $searchtype = array('int', 'datetime', 'float', 'textdata', 'textchar', 'text', 'htmltext', 'multitext', 'select', 'radio', 'checkbox'); @@ -427,28 +490,29 @@ else if ($dopost == 'modifysearch') { $forms = '
    '; $forms .= ""; $forms .= ""; - $forms .= Lang("keywords")."：
    "; + $forms .= "关键词：
    "; $mainstring = ''; if (!empty($mainfields) && is_array($mainfields)) { $mainstring = implode(',', $mainfields); foreach ($mainfields as $mainfield) { if ($mainfield == 'typeid') { + require_once(DEDEINC."/typelink/typelink.class.php"); $tl = new TypeLink(0); $typeOptions = $tl->GetOptionArray(0, 0, $mid); - $forms .= "
    ".Lang('catalog')."：\r\n"; + $forms .= "\r\n"; $forms .= $typeOptions; $forms .= ""; - $forms .= "
    "; + $forms .= "
    "; } else if ($mainfield == 'iscommend') { - $forms .= "
    "; + $forms .= "
    "; } else if ($mainfield == 'writer') { - $forms .= Lang('writer')."：
    "; + $forms .= "作者：
    "; } else if ($mainfield == 'source') { - $forms .= Lang('source')."：
    "; + $forms .= "来源：
    "; } else if ($mainfield == 'senddate') { - $forms .= Lang('startdate')."：
    "; - $forms .= Lang('enddate')."
    "; + $forms .= "开始时间：
    "; + $forms .= "结束时间：
    "; } } } @@ -458,23 +522,24 @@ else if ($dopost == 'modifysearch') { if ($channel['issystem'] < 0) { foreach ((array)$addonfields as $addonfield) { if ($addonfield == 'typeid') { + require_once(DEDEINC."/typelink/typelink.class.php"); $tl = new TypeLink(0); $typeOptions = $tl->GetOptionArray(0, 0, $mid); - $forms .= "
    ".Lang('catalog')."：\r\n"; + $forms .= "\r\n"; $forms .= $typeOptions; $forms .= ""; - $forms .= "
    "; + $forms .= "
    "; $addonstring .= 'typeid:int,'; } elseif ($addonfield == 'senddate') { - $forms .= Lang('startdate')."：
    "; - $forms .= Lang('enddate')."：
    "; + $forms .= "开始时间：
    "; + $forms .= "结束时间：
    "; $addonstring .= 'senddate:datetime,'; } } } if (is_array($addonfields) && !empty($addonfields)) { - $query = "SELECT * FROM `#@__channeltype` WHERE id='$mid'"; + $query = "SELECT * FROM #@__channeltype WHERE id='$mid'"; $channel = $dsql->GetOne($query); $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); @@ -499,13 +564,13 @@ else if ($dopost == 'modifysearch') { $type = $typearr[$k]; $tmp = $name.':'.$type; if (in_array($type, $intarr)) { - $forms .= "
    $itemname : ".Lang("to")."
    "; + $forms .= "
    $itemname : 到
    "; } else if (in_array($type, $textarr)) { $forms .= "$itemname :
    "; } else if ($type == 'select') { $values = explode(',', $valuearr[$k]); if (is_array($values) && !empty($values)) { - $forms .= "
    $itemname : "; foreach ($values as $value) { $forms .= ""; } @@ -514,7 +579,7 @@ else if ($dopost == 'modifysearch') { } else if ($type == 'radio') { $values = explode(',', $valuearr[$k]); if (is_array($values) && !empty($values)) { - $forms .= "
    $itemname : "; + $forms .= "
    $itemname : "; foreach ($values as $value) { $forms .= ""; } @@ -528,33 +593,33 @@ else if ($dopost == 'modifysearch') { } } } elseif ($type == 'datetime') { - $forms .= "
    ".Lang('startdate')."：
    "; - $forms .= Lang('enddate')."：
    "; + $forms .= "
    开始时间：
    "; + $forms .= "结束时间：
    "; } else { $tmp = ''; } $addonstring .= $tmp.','; } } - $forms .= '
    '; + $forms .= ''; $formssql = addslashes($forms); - $query = "REPLACE INTO `#@__advancedsearch`(mid,maintable,mainfields,addontable,addonfields,forms,template) VALUES ('$mid','$maintable','$mainstring','$addontable','$addonstring','$formssql','$template')"; + $query = "REPLACE INTO #@__advancedsearch(mid, maintable, mainfields, addontable, addonfields, forms, template) VALUES ('$mid','$maintable','$mainstring','$addontable','$addonstring','$formssql', '$template')"; $dsql->ExecuteNoneQuery($query); $formshtml = dede_htmlspecialchars($forms); - echo ''; - echo Lang('mychannel_modifysearch_tip')."

    "; - echo '
    '.Lang('view').'：
    '; + echo ''; + echo "下面为生成的html表单，请自行复制，根据自己需求修改样式后粘贴到对应的模板中

    "; + echo '
    预览：
    '; echo $forms; } exit; } -//删除自定义搜索 +//删除自定义搜索； else if ($dopost == 'del') { $mid = intval($mid); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__advancedsearch` WHERE mid = '$mid';"); - ShowMsg(Lang("mychannel_modifysearch_delete_success"), "mychannel_main.php"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__advancedsearch` WHERE mid = '$mid'; "); + ShowMsg("成功删除一个自定义搜索", "mychannel_main.php"); exit(); } -$row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); +$row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' "); require_once(DEDEADMIN."/templets/mychannel_edit.htm"); ?> \ No newline at end of file diff --git a/src/admin/mychannel_field_add.php b/src/admin/mychannel_field_add.php index eb99c48f..32e1d075 100644 --- a/src/admin/mychannel_field_add.php +++ b/src/admin/mychannel_field_add.php @@ -8,13 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_New'); +CheckPurview('c_New'); require_once(DEDEADMIN."/inc/inc_admin_channel.php"); +require_once(DEDEINC."/dedetag.class.php"); if (empty($action)) $action = ''; $mysql_version = $dsql->GetVersion(); +/*---------------------- +function Save() +---------------------*/ if ($action == 'save') { //修改字段配置信息 $dfvalue = trim($vdefault); @@ -22,14 +24,14 @@ if ($action == 'save') { $mxlen = $maxlength; if (preg_match("#^(select|radio|checkbox)$#i", $dtype)) { if (!preg_match("#,#", $dfvalue)) { - ShowMsg(Lang('mychannel_field_select_check',array('dtype'=>$dtype)), "-1"); + ShowMsg("您设定了字段为 {$dtype} 类型，必须在默认值中指定元素列表，如：'a,b,c' ", "-1"); exit(); } } if ($dtype == 'stepselect') { - $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE egroup='$fieldname'"); + $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE egroup='$fieldname' "); if (!is_array($arr)) { - ShowMsg(Lang("mychannel_field_stepselect_check"), "-1"); + ShowMsg("您设定了字段为联动类型，但系统中没找到与您定义的字段名相同的联动组名", "-1"); exit(); } } @@ -47,7 +49,7 @@ if ($action == 'save') { $rs = $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` ADD $ntabsql "); if (!$rs) { $gerr = $dsql->GetError(); - ShowMsg(Lang('mychannel_field_err_add',array('err'=>$gerr)), "javascript:;"); + ShowMsg("增加字段失败，错误提示为：".$gerr, "javascript:;"); exit(); } //检测旧配置信息，并替换为新配置 @@ -67,15 +69,18 @@ if ($action == 'save') { } $addlist = GetAddFieldList($dtp, $oksetting); $oksetting = addslashes($oksetting); - $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting',listfields='$addlist' WHERE id='$id'"); + $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting',listfields='$addlist' WHERE id='$id' "); if (!$rs) { $grr = $dsql->GetError(); - ShowMsg(Lang('mychannel_field_err_savenode',array('err'=>$grr)), "javascript:;"); + ShowMsg("保存节点配置出错".$grr, "javascript:;"); exit(); } - ShowMsg(Lang("mychannel_field_add_success"), "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); + ShowMsg("成功增加一个字段", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); exit(); } +/*---------------------- +function ShowPage() +---------------------*/ //检测模型相关信息，并初始化相关数据 $row = $dsql->GetOne("SELECT '#@__archives' AS maintable,addtable FROM `#@__channeltype` WHERE id='$id'"); $trueTable = $row['addtable']; @@ -92,14 +97,14 @@ $fields = array(); if (empty($row['maintable'])) $row['maintable'] = '#@__archives'; $rs = $dsql->SetQuery("SHOW fields FROM `{$row['maintable']}`"); $dsql->Execute('a'); -while ($nrow = $dsql->GetArray('a', PDO::FETCH_ASSOC)) { +while ($nrow = $dsql->GetArray('a', MYSQL_ASSOC)) { if ($cfg_dbtype == 'sqlite') { $nrow['Field'] = $nrow['name']; } $fields[strtolower($nrow['Field'])] = 1; } $dsql->Execute("a", "SHOW fields FROM `{$row['addtable']}`"); -while ($nrow = $dsql->GetArray('a', PDO::FETCH_ASSOC)) { +while ($nrow = $dsql->GetArray('a', MYSQL_ASSOC)) { if ($cfg_dbtype == 'sqlite') { $nrow['Field'] = $nrow['name']; } diff --git a/src/admin/mychannel_field_edit.php b/src/admin/mychannel_field_edit.php index ec04d782..8723e70f 100644 --- a/src/admin/mychannel_field_edit.php +++ b/src/admin/mychannel_field_edit.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_New'); +CheckPurview('c_New'); +require_once(DEDEINC."/dedetag.class.php"); require_once(dirname(__FILE__)."/inc/inc_admin_channel.php"); if (empty($action)) $action = ''; $id = isset($id) && is_numeric($id) ? $id : 0; @@ -40,22 +39,25 @@ while ($crow = $dsql->GetObject()) { $channelArray[$crow->id]['nid'] = $crow->nid; } //保存修改 +/*-------------------- +function _SAVE() +----------------------*/ if ($action == 'save') { if (!isset($fieldtypes[$dtype])) { - ShowMsg(Lang("mychannel_field_err_edit"), "-1"); + ShowMsg("您修改的是系统专用类型的数据，禁止操作", "-1"); exit(); } $dfvalue = $vdefault; if (preg_match("#^(select|radio|checkbox)#", $dtype)) { if (!preg_match("#,#", $dfvalue)) { - ShowMsg(Lang('mychannel_field_select_check',array('dtype'=>$dtype)), "-1"); + ShowMsg("您设定了字段为 {$dtype} 类型，必须在默认值中指定元素列表，如：'a,b,c' ", "-1"); exit(); } } if ($dtype == 'stepselect') { - $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE egroup='$fname'"); + $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE egroup='$fname' "); if (!is_array($arr)) { - ShowMsg(Lang("mychannel_field_stepselect_check"), "-1"); + ShowMsg("您设定了字段为联动类型，但系统中没找到与您定义的字段名相同的联动组名!", "-1"); exit(); } } @@ -71,7 +73,7 @@ if ($action == 'save') { $fields = array(); $rs = $dsql->SetQuery("SHOW fields FROM `{$row['addtable']}`"); $dsql->Execute('a'); - while ($nrow = $dsql->GetArray('a', PDO::FETCH_ASSOC)) { + while ($nrow = $dsql->GetArray('a', MYSQL_ASSOC)) { $fields[strtolower($nrow['Field'])] = $nrow['Type']; } //修改字段配置信息 @@ -102,14 +104,17 @@ if ($action == 'save') { $oksetting = $dtp->GetResultNP(); $addlist = GetAddFieldList($dtp, $oksetting); $oksetting = addslashes($oksetting); - $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting',listfields='$addlist' WHERE id='$id'"); - ShowMsg(Lang("mychannel_field_success_edit"), "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); + $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting',listfields='$addlist' WHERE id='$id' "); + ShowMsg("成功修改一个字段的配置", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); exit(); } -//删除字段 +/*------------------ +删除字段 +function _DELETE() +-------------------*/ else if ($action == "delete") { if ($row['issystem'] == 1) { - ShowMsg(Lang("mychannel_field_err_delete"), "-1"); + ShowMsg("对不起，系统模型的字段不允许删除", "-1"); exit(); } //检测旧数据类型，并替换为新配置 @@ -119,9 +124,9 @@ else if ($action == "delete") { } } $oksetting = addslashes($dtp->GetResultNP()); - $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting' WHERE id='$id'"); - $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname`"); - ShowMsg(Lang("mychannel_field_delete_success"), "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); + $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting' WHERE id='$id' "); + $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` "); + ShowMsg("成功删除一个字段", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); exit(); } require_once(DEDEADMIN."/templets/mychannel_field_edit.htm"); diff --git a/src/admin/mychannel_main.php b/src/admin/mychannel_main.php index ed8aceba..af1e04cf 100644 --- a/src/admin/mychannel_main.php +++ b/src/admin/mychannel_main.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_List'); +CheckPurview('c_List'); +require_once(DEDEINC.'/datalistcp.class.php'); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $sql = "SELECT id,nid,typename,addtable,isshow,issystem FROM `#@__channeltype` ORDER BY id DESC"; $dlist = new DataListCP(); @@ -21,13 +20,13 @@ $dlist->display(); function GetSta($sta, $id) { if ($sta == 1) { - return ($id != -1 ? "".Lang('enable')." > ".Lang('disable')."" : Lang("fixed_items")); + return ($id != -1 ? "已启用 禁用" : "固定项目"); } else { - return "".Lang("disable")." > ".Lang("enable").""; + return "已禁用 启用"; } } function IsSystem($s) { - return $s == 1 ? Lang("system") : Lang("auto"); + return $s == 1 ? "系统" : "自动"; } ?> \ No newline at end of file diff --git a/src/admin/mytag_add.php b/src/admin/mytag_add.php index 42b6c235..4c136d3e 100644 --- a/src/admin/mytag_add.php +++ b/src/admin/mytag_add.php @@ -8,26 +8,26 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Other'); +CheckPurview('temp_Other'); +require_once(DEDEINC."/typelink/typelink.class.php"); if (empty($dopost)) $dopost = ""; if ($dopost == "save") { CheckCSRF(); $tagname = trim($tagname); $row = $dsql->GetOne("SELECT typeid FROM `#@__mytag` WHERE typeid='$typeid' AND tagname LIKE '$tagname'"); if (is_array($row)) { - ShowMsg(Lang("mytag_add_err_same"), "-1"); + ShowMsg("在相同栏目下已经存在同名的标记", "-1"); exit(); } $starttime = GetMkTime($starttime); $endtime = GetMkTime($endtime); - $inQuery = "INSERT INTO `#@__mytag`(typeid,tagname,timeset,starttime,endtime,normbody,expbody) VALUES ('$typeid','$tagname','$timeset','$starttime','$endtime','$normbody','$expbody');"; + $inQuery = "INSERT INTO `#@__mytag` (typeid,tagname,timeset,starttime,endtime,normbody,expbody) VALUES ('$typeid','$tagname','$timeset','$starttime','$endtime','$normbody','$expbody'); "; $dsql->ExecuteNoneQuery($inQuery); - ShowMsg(Lang("mytag_add_success"), "mytag_main.php"); + ShowMsg("成功增加一个自定义标记", "mytag_main.php"); exit(); } $startDay = time(); diff --git a/src/admin/mytag_edit.php b/src/admin/mytag_edit.php index fb541bf7..21cd0a0a 100644 --- a/src/admin/mytag_edit.php +++ b/src/admin/mytag_edit.php @@ -8,43 +8,39 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Other'); +CheckPurview('temp_Other'); +require_once(DEDEINC."/typelink/typelink.class.php"); if (empty($dopost)) $dopost = ''; $aid = intval($aid); $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? 'mytag_main.php' : $_COOKIE['ENV_GOBACK_URL']; if ($dopost == 'delete') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__mytag` WHERE aid='$aid'"); - ShowMsg(Lang("mytag_delete_success"), $ENV_GOBACK_URL); + ShowMsg("成功删除一个自定义标记", $ENV_GOBACK_URL); exit(); } else if ($dopost == "saveedit") { CheckCSRF(); $starttime = GetMkTime($starttime); $endtime = GetMkTime($endtime); - $query = "UPDATE `#@__mytag` - SET - typeid='$typeid', - timeset='$timeset', - starttime='$starttime', - endtime='$endtime', - normbody='$normbody', - expbody='$expbody' - WHERE aid='$aid' "; + $query = "UPDATE `#@__mytag` SET typeid='$typeid',timeset='$timeset',starttime='$starttime',endtime='$endtime',normbody='$normbody',expbody='$expbody' WHERE aid='$aid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("mytag_edit_success"), $ENV_GOBACK_URL); + ShowMsg("成功修改一个自定义标记", $ENV_GOBACK_URL); exit(); } else if ($dopost == "getjs") { + require_once(DEDEINC."/libraries/oxwindow.class.php"); $jscode = ""; $showhtml = "\r\n\r\n$jscode\r\n\r\n"; - $showhtml .= Lang('view')."："; - $wintitle = Lang('mytag_main')."-".Lang('mytag_jscode'); - $wecome_info = "".Lang('mytag_main')."::".Lang('mytag_jscode'); - DedeWin::Instance()->Init()->AddTitle(Lang('mytag_jscode_title'))->GetWindow('hand', $showhtml)->Display(); + $showhtml .= "预览："; + $wintitle = "宏标记定义-获取JS"; + $wecome_info = "宏标记定义::获取JS"; + $win = new OxWindow(); + $win->Init(); + $win->AddTitle('以下为选定宏标记的js调用代码：'); + $winform = $win->GetWindow('hand', $showhtml); + $win->Display(); exit(); } else if ($dopost == "testjs") { echo ""; diff --git a/src/admin/mytag_main.php b/src/admin/mytag_main.php index d6722f1b..b23cd7c0 100644 --- a/src/admin/mytag_main.php +++ b/src/admin/mytag_main.php @@ -8,26 +8,25 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Other'); +CheckPurview('temp_Other'); +require_once(DEDEINC.'/datalistcp.class.php'); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, '/'); make_hash(); -$sql = "SELECT myt.aid,myt.tagname,tp.typename,myt.timeset,myt.endtime FROM `#@__mytag` myt LEFT JOIN `#@__arctype` tp ON tp.id=myt.typeid ORDER BY myt.aid DESC"; +$sql = "SELECT myt.aid,myt.tagname,tp.typename,myt.timeset,myt.endtime FROM `#@__mytag` myt LEFT JOIN `#@__arctype` tp ON tp.id=myt.typeid ORDER BY myt.aid DESC "; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN.'/templets/mytag_main.htm'); $dlist->SetSource($sql); $dlist->display(); function TestType($tname) { - return $tname == '' ? Lang('catalog_all') : $tname; + return $tname == '' ? '所有栏目' : $tname; } function TimeSetValue($ts) { - return $ts == 0 ? Lang('mytag_ts_0') : Lang('mytag_ts_1'); + return $ts == 0 ? '不限时间' : '限时标记'; } ?> \ No newline at end of file diff --git a/src/admin/mytag_tag_guide.php b/src/admin/mytag_tag_guide.php index 6a0008ae..c69398b0 100644 --- a/src/admin/mytag_tag_guide.php +++ b/src/admin/mytag_tag_guide.php @@ -10,7 +10,8 @@ */ require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } +require_once(DEDEINC."/typelink/typelink.class.php"); include DedeInclude('templets/mytag_tag_guide.htm'); ?> \ No newline at end of file diff --git a/src/admin/mytag_tag_guide_ok.php b/src/admin/mytag_tag_guide_ok.php index bbb83cc6..a7b219de 100644 --- a/src/admin/mytag_tag_guide_ok.php +++ b/src/admin/mytag_tag_guide_ok.php @@ -8,12 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Other'); +CheckPurview('temp_Other'); //根据条件生成标记 $attlist = ""; $attlist .= " row='".$row."'"; @@ -43,7 +42,7 @@ $innertext if ($dopost == 'savetag') { $fulltag = addslashes($fulltag); $tagname = "auto"; - $inQuery = "INSERT INTO `#@__mytag`(typeid,tagname,timeset,starttime,endtime,normbody,expbody) VALUES ('0','$tagname','0','0','0','$fulltag','');"; + $inQuery = "INSERT INTO `#@__mytag` (typeid,tagname,timeset,starttime,endtime,normbody,expbody) VALUES ('0','$tagname','0','0','0','$fulltag','');"; $dsql->ExecuteNoneQuery($inQuery); $id = $dsql->GetLastID(); $dsql->ExecuteNoneQuery("UPDATE `#@__mytag` SET tagname='{$tagname}_{$id}' WHERE aid='$id'"); diff --git a/src/admin/plus_edit.php b/src/admin/plus_edit.php index 6182bb0f..dc88e8f8 100644 --- a/src/admin/plus_edit.php +++ b/src/admin/plus_edit.php @@ -8,40 +8,45 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_plus'); +CheckPurview('sys_plus'); $aid = preg_replace("#[^0-9]#", "", $aid); if ($dopost == "show") { $dsql->ExecuteNoneQuery("UPDATE `#@__plus` SET isshow=1 WHERE aid='$aid';"); - ShowMsg(Lang("plus_success_show"), "plus_main.php"); + ShowMsg("成功启用一个插件，请刷新导航菜单", "plus_main.php"); exit(); } else if ($dopost == "hide") { $dsql->ExecuteNoneQuery("UPDATE `#@__plus` SET isshow=0 WHERE aid='$aid';"); - ShowMsg(Lang("plus_success_hide"), "plus_main.php"); + ShowMsg("成功禁用一个插件，请刷新导航菜单", "plus_main.php"); exit(); } else if ($dopost == "delete") { if (empty($job)) $job = ""; if ($job == "") //确认提示 { - $wintitle = Lang("plus_delete"); - $wecome_info = "".Lang('plus_main')."::".Lang('plus_delete'); - DedeWin::Instance()->Init("plus_edit.php", "js/blank.js", "POST")->AddHidden("job", "yes") - ->AddHidden("dopost", $dopost)->AddHidden("aid", $aid)->AddTitle(Lang('plus_delete_title',array('title'=>$title))) - ->AddMsgItem(Lang("plus_delete_msg"))->GetWindow("ok")->Display(); + require_once(DEDEINC."/libraries/oxwindow.class.php"); + $wintitle = "删除插件"; + $wecome_info = "插件管理::删除插件"; + $win = new OxWindow(); + $win->Init("plus_edit.php", "js/blank.js", "POST"); + $win->AddHidden("job", "yes"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("aid", $aid); + $win->AddTitle("您确定要删除'".$title."'这个插件"); + $win->AddMsgItem("警告：在这里删除仅仅删除菜单项，要干净删除请在模块管理处删除

    模块管理>"); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } else if ($job == "yes") //操作 { $dsql->ExecuteNoneQuery("DELETE FROM `#@__plus` WHERE aid='$aid';"); - ShowMsg(Lang("plus_delete_success"), "plus_main.php"); + ShowMsg("成功删除一个插件,请刷新导航菜单!", "plus_main.php"); exit(); } } else if ($dopost == "saveedit") //保存修改 { $inquery = "UPDATE `#@__plus` SET plusname='$plusname',menustring='$menustring',filelist='$filelist' WHERE aid='$aid';"; $dsql->ExecuteNoneQuery($inquery); - ShowMsg(Lang("plus_saveedit_success"), "plus_main.php"); + ShowMsg("成功修改插件的配置", "plus_main.php"); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__plus` WHERE aid='$aid'"); diff --git a/src/admin/plus_main.php b/src/admin/plus_main.php index b76ea6af..2b69e170 100644 --- a/src/admin/plus_main.php +++ b/src/admin/plus_main.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_plus'); +CheckPurview('sys_plus'); +require_once(DEDEINC."/datalistcp.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $sql = "SELECT aid,plusname,writer,isshow FROM `#@__plus` ORDER BY aid ASC"; $dlist = new DataListCP(); @@ -21,9 +20,9 @@ $dlist->display(); function GetSta($sta, $id, $title) { if ($sta == 1) { - return Lang('enable')." > ".Lang('disable')." ".Lang('edit')." ".Lang('delete').""; + return "已启用 禁用修改删除"; } else { - return Lang('disable')." > ".Lang('enable')." ".Lang('edit')." ".Lang('delete').""; + return "已禁用 启用修改册除"; } } ?> \ No newline at end of file diff --git a/src/admin/recycling.php b/src/admin/recycling.php index 51a040ef..42fb74d6 100644 --- a/src/admin/recycling.php +++ b/src/admin/recycling.php @@ -8,19 +8,18 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('a_List,a_AccList,a_MyList'); +CheckPurview('a_List,a_AccList,a_MyList'); +require_once(DEDEINC.'/datalistcp.class.php'); if (empty($cid)) { $cid = '0'; $whereSql = ''; } if ($cid != 0) { - require_once(DEDEINC.'/channel/channelunit.func.php'); + require_once(DEDEINC.'/channelunit.func.php'); $whereSql = " AND arc.typeid IN (".GetSonIds($cid).")"; } -$query = "SELECT arc.*,tp.typename FROM `#@__archives` AS arc LEFT JOIN `#@__arctype` AS tp ON arc.typeid = tp.id WHERE arc.arcrank = '-2' $whereSql ORDER BY arc.id DESC"; +$query = "SELECT arc.*,tp.typename FROM `#@__archives` AS arc LEFT JOIN `#@__arctype` AS tp ON arc.typeid = tp.id WHERE arc.arcrank = '-2' $whereSql order by arc.id desc"; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN."/templets/recycling.htm"); $dlist->SetSource($query); diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index fe53ccdd..d90b9b31 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -44,12 +44,12 @@ else if ($dopost == 'delall') { foreach ($aids as $aid) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__search_keywords` WHERE aid='$aid';"); } - ShowMsg(Lang("member_success_edituser_del"), $ENV_GOBACK_URL); + ShowMsg("删除成功", $ENV_GOBACK_URL); exit(); } //第一次进入这个页面 if ($dopost == '') { - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__search_keywords`"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__search_keywords` "); $totalRow = $row['dd']; include(DEDEADMIN."/templets/search_keywords_main.htm"); } @@ -60,26 +60,25 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $start = ($pageno - 1) * $pagesize; $printhead = "
    - - - + + - - - - - - + + + + + + \r\n "; echo $printhead; if ($orderby == 'result') $orderby = $orderby." ASC"; else $orderby = $orderby." DESC"; - $dsql->SetQuery("SELECT * FROM `#@__search_keywords` ORDER BY $orderby LIMIT $start,$pagesize"); + $dsql->SetQuery("SELECT * FROM `#@__search_keywords` ORDER BY $orderby LIMIT $start,$pagesize "); $dsql->Execute(); while ($row = $dsql->GetArray()) { $line = " - + @@ -88,8 +87,8 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') "; @@ -97,11 +96,11 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') } echo "\r\n"; - echo "
    ".Lang('select')."
    选择 id".Lang('keywords')."".Lang('result')."".Lang("frequency")."".Lang("result")."".Lang("search_keywords_last_searchtime")."".Lang('operation')."关键词分词结果频率结果最后搜索时间管理
    {$row['aid']} {$row['result']} ".MyDate("Y-m-d H:i:s", $row['lasttime'])." - ".Lang('update')." - ".Lang('delete')." + 更新 + 删除
    - ".Lang("reverse_selection")." - ".Lang('cancel')." - ".Lang('delete')." + 反选 + 取消 + 删除
    \r\n"; + echo "\r\n"; } ?> \ No newline at end of file diff --git a/src/admin/shops_operations.php b/src/admin/shops_operations.php index 03310f35..821b66c9 100644 --- a/src/admin/shops_operations.php +++ b/src/admin/shops_operations.php @@ -8,12 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('shops_Operations'); +CheckPurview('shops_Operations'); +require_once(DEDEINC.'/datalistcp.class.php'); if (isset($dopost)) { - UserLogin::CheckPurview('shops_Operations_cpanel'); + CheckPurview('shops_Operations_cpanel'); if ($dopost == 'up') { $nids = explode('`', $nid); $wh = ''; @@ -21,7 +20,7 @@ if (isset($dopost)) { if ($wh == '') $wh = " WHERE oid='$n' "; else $wh .= " OR oid='$n' "; } - $sql = "UPDATE `#@__shops_orders` SET `state`='1' $wh"; + $sql = "UPDATE `#@__shops_orders` SET `state`='1' $wh "; $dsql->ExecuteNoneQuery($sql); } else if ($dopost == 'push') { $nids = explode('`', $nid); @@ -30,7 +29,7 @@ if (isset($dopost)) { if ($wh == '') $wh = " WHERE oid='$n' "; else $wh .= " OR oid='$n' "; } - $sql = "UPDATE `#@__shops_orders` SET `state`='2' $wh"; + $sql = "UPDATE `#@__shops_orders` SET `state`='2' $wh "; $dsql->ExecuteNoneQuery($sql); } else if ($dopost == 'ok') { $nids = explode('`', $nid); @@ -39,7 +38,7 @@ if (isset($dopost)) { if ($wh == '') $wh = " WHERE oid='$n' "; else $wh .= " OR oid='$n' "; } - $sql = "UPDATE `#@__shops_orders` SET `state`='4' $wh"; + $sql = "UPDATE `#@__shops_orders` SET `state`='4' $wh "; $dsql->ExecuteNoneQuery($sql); } else if ($dopost == 'delete') { $nids = explode('`', $nid); @@ -51,7 +50,7 @@ if (isset($dopost)) { $dsql->ExecuteNoneQuery($query2); $dsql->ExecuteNoneQuery($query3); } - ShowMsg(Lang("content_delete_success"), $ENV_GOBACK_URL); + ShowMsg("成功删除指定的订单记录", $ENV_GOBACK_URL); exit(); } else { ShowMsg("不充许的操作范围", $ENV_GOBACK_URL); @@ -108,7 +107,7 @@ function GetMemberID($mid) { global $dsql; if ($mid == 0) return '0'; - $row = $dsql->GetOne("SELECT userid FROM `#@__member` WHERE mid='$mid'"); + $row = $dsql->GetOne("SELECT userid FROM `#@__member` WHERE mid='$mid' "); if (is_array($row)) { return "".$row['userid'].""; } else { diff --git a/src/admin/shops_operations_cart.php b/src/admin/shops_operations_cart.php index 3b583961..fd526d90 100644 --- a/src/admin/shops_operations_cart.php +++ b/src/admin/shops_operations_cart.php @@ -8,15 +8,14 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('shops_Operations'); +require_once(DEDEINC."/datalistcp.class.php"); +CheckPurview('shops_Operations'); if (!isset($oid)) exit("无效操作"); $oid = preg_replace("#[^-0-9A-Z]#", "", $oid); if (empty($oid)) exit("无效订单号"); $row = $dsql->GetOne("SELECT * FROM `#@__shops_userinfo` WHERE oid='$oid'"); -$sql = "SELECT o.*,p.title,p.price as uprice,d.dname FROM `#@__shops_orders` as o left join `#@__shops_products` as p on o.oid=p.oid left join `#@__shops_delivery` as d on d.pid=o.pid WHERE o.oid='$oid'"; +$sql = "SELECT o.*,p.title,p.price as uprice,d.dname FROM `#@__shops_orders` as o LEFT JOIN `#@__shops_products` as p on o.oid=p.oid LEFT JOIN `#@__shops_delivery` as d on d.pid=o.pid WHERE o.oid='$oid'"; $dlist = new DataListCP(); $dlist->pagesize = 30; $dlist->SetParameter("oid", $oid); diff --git a/src/admin/shops_operations_userinfo.php b/src/admin/shops_operations_userinfo.php index 635aef15..b8091141 100644 --- a/src/admin/shops_operations_userinfo.php +++ b/src/admin/shops_operations_userinfo.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('shops_Operations'); +CheckPurview('shops_Operations'); if (!isset($oid)) exit("无效操作"); $oid = preg_replace("#[^-0-9A-Z]#", "", $oid); if (empty($oid)) exit("无效订单号"); diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 318443a4..7c576933 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -8,36 +8,40 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_New,a_AccNew'); +CheckPurview('a_New,a_AccNew'); +require_once(DEDEINC.'/customfields.func.php'); require_once(DEDEADMIN.'/inc/inc_archives_functions.php'); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { + require_once(DEDEINC.'/dedetag.class.php'); require_once(DEDEADMIN.'/inc/inc_catalog_options.php'); - UserLogin::ClearMyAddon(); + ClearMyAddon(); $channelid = empty($channelid) ? 0 : intval($channelid); $cid = empty($cid) ? 0 : intval($cid); - //获得频道模型id + //获得频道模型ID if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); $channelid = $row['channeltype']; } else { if ($channelid == 0) $channelid = 1; } - $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig`"); + $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig` "); //获得频道模型信息 - $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'"); + $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); $channelid = $cInfos['id']; //获取文档最大id+1以确定当前权重 $maxWright = $dsql->GetOne("SELECT id+1 AS cc FROM `#@__archives` ORDER BY id DESC LIMIT 1"); - $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; + $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude("templets/soft_add.htm"); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); @@ -47,23 +51,23 @@ else if ($dopost == 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if ($typeid == 0) { - ShowMsg(Lang('content_error_typeid_isempty'), "-1"); + ShowMsg("请指定文档的栏目", "-1"); exit(); } if (empty($channelid)) { - ShowMsg(Lang('content_error_channelid_isempty'), "-1"); + ShowMsg("文档为非指定的类型，请检查您发布内容的表单是否合法", "-1"); exit(); } if (!CheckChannel($typeid, $channelid)) { - ShowMsg(Lang('content_error_channelid_check_failed'), "-1"); + ShowMsg("您所选择的栏目与当前模型不相符，请选择白色的选项", "-1"); exit(); } - if (!UserLogin::TestPurview('a_New')) { - UserLogin::CheckCatalog($typeid, Lang('content_error_channelid_check_failed',array('typeid'=>$typeid))); + if (!TestPurview('a_New')) { + CheckCatalog($typeid, "对不起，您没有操作栏目 {$typeid} 的权限"); } //对保存的内容进行处理 - if (empty($writer)) $writer = $cUserLogin->getUserName(); - if (empty($source)) $source = Lang('unknow'); + if (empty($writer)) $writer = $cuserLogin->getUserName(); + if (empty($source)) $source = '未知'; $pubdate = GetMkTime($pubdate); $senddate = time(); $sortrank = AddDay($pubdate, $sortup); @@ -80,11 +84,12 @@ else if ($dopost == 'save') { $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); $userip = GetIP(); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -93,7 +98,7 @@ else if ($dopost == 'save') { //生成文档id $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid); if (empty($arcID)) { - ShowMsg(Lang("content_error_id_is_empty"), "-1"); + ShowMsg("无法获得主键，因此无法进行后续操作", "-1"); exit(); } //处理body字段自动摘要、自动提取缩略图等 @@ -113,7 +118,7 @@ else if ($dopost == 'save') { $vs = explode(',', $v); if (!isset(${$vs[0]})) { ${$vs[0]} = ''; - } else if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + } else if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -137,11 +142,11 @@ else if ($dopost == 'save') { //跳转网址的文档强制为动态 if (preg_match('#j#', $flag)) $ismake = -1; //保存到主表 - $inQuery = "INSERT INTO `#@__archives`(id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight');"; + $inQuery = "INSERT INTO `#@__archives` (id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight');"; if (!$dsql->ExecuteNoneQuery($inQuery)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_archives_save',array('error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //软件链接列表 @@ -154,7 +159,7 @@ else if ($dopost == 'save') { $autosize = empty($autosize) ? FALSE : TRUE; if ($autosize && empty($softsize)) { $nsoftsize = @filesize($cfg_basedir.$softurl1); - if (empty($nsoftsize)) $nsoftsize = Lang('unknow'); + if (empty($nsoftsize)) $nsoftsize = '未知'; else { $nsoftsize = trim(sprintf("%0.2f", $nsoftsize / 1024 / 1024)); $nsoftsize = $nsoftsize." MB"; @@ -163,7 +168,7 @@ else if ($dopost == 'save') { } //软件大小 if (!empty($nsoftsize)) $softsize = $nsoftsize; - else if (empty($softsize)) $softsize = Lang('unknow'); + else if (empty($softsize)) $softsize = '未知'; else $softsize = $softsize.' '.$unit; //其它链接处理 for ($i = 2; $i <= 30; $i++) { @@ -180,7 +185,7 @@ else if ($dopost == 'save') { $softurl = stripslashes(${'softurl'.$i}); } $servermsg = str_replace("'", "", stripslashes(${'servermsg'.$i})); - if ($servermsg == '') $servermsg = Lang('download_url').$i; + if ($servermsg == '') $servermsg = '下载地址'.$i; if ($softurl != 'http://') { $urls .= "{dede:link text='$servermsg'} $softurl {/dede:link}\r\n"; } @@ -188,22 +193,22 @@ else if ($dopost == 'save') { } $urls = addslashes($urls); //保存到附加表 - $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); if (empty($addtable)) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_no_maintable',array('channelid'=>$channelid)), "javascript:;"); + ShowMsg("没找到当前模型[{$channelid}]的主表信息，无法完成操作", "javascript:;"); exit(); } $daccess = isset($daccess) && is_numeric($daccess) ? $daccess : 0; $useip = GetIP(); - $inQuery = "INSERT INTO `$addtable`(aid,typeid,redirecturl,userip,filetype,language,softtype,accredit,os,softrank,officialUrl,officialDemo,softsize,softlinks,introduce,daccess,needmoney{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip','$filetype','$language','$softtype','$accredit','$os','$softrank','$officialUrl','$officialDemo','$softsize','$urls','$body','$daccess','$needmoney'{$inadd_v});"; + $inQuery = "INSERT INTO `$addtable` (aid,typeid,redirecturl,userip,filetype,language,softtype,accredit,os,softrank,officialUrl,officialDemo,softsize,softlinks,introduce,daccess,needmoney{$inadd_f}) VALUES ('$arcID','$typeid','$redirecturl','$useip','$filetype','$language','$softtype','$accredit','$os','$softrank','$officialUrl','$officialDemo','$softsize','$urls','$body','$daccess','$needmoney'{$inadd_v});"; if (!$dsql->ExecuteNoneQuery($inQuery)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_addtable_save',array('addtable'=>$addtable, 'error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库附加表 `{$addtable}` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //生成网页 @@ -212,23 +217,27 @@ else if ($dopost == 'save') { if ($arcUrl == '') { $arcUrl = $cfg_phpurl."/view.php?aid=$arcID"; } - UserLogin::ClearMyAddon($arcID, $title); + ClearMyAddon($arcID, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_view')."".Lang('content_edit')."".Lang('content_published_main')."".Lang('catalog_main').""; - $msg = "
    {$msg}
    ".GetUpdateTest(); - $wintitle = Lang("content_success_publish"); - $wecome_info = Lang('content_main')."::".Lang('content_add'); - DedeWin::Instance()->AddTitle(Lang("content_success_publish")."：")->AddMsgItem($msg)->GetWindow("hand", " ", FALSE)->Display(); + $msg = "请选择您的后续操作：继续发布软件查看软件修改软件已发布软件管理网站栏目管理"; + $msg = "
    {$msg}
    ".GetUpdateTest(); + $wintitle = "成功发布一个软件"; + $wecome_info = "文档管理::发布软件"; + $win = new OxWindow(); + $win->AddTitle("成功发布软件："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", FALSE); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/soft_config.php b/src/admin/soft_config.php index 98026005..532061af 100644 --- a/src/admin/soft_config.php +++ b/src/admin/soft_config.php @@ -8,23 +8,21 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_SoftConfig'); +CheckPurview('sys_SoftConfig'); if (empty($dopost)) $dopost = ''; //保存 if ($dopost == "save") { if ($dfrank > 0 || $dfywboy > 0) $gotojump = 1; - $query = "UPDATE `#@__softconfig` SET `downtype`='$downtype',`gotojump`='$gotojump',`ismoresite`='$ismoresite',`islocal`='$islocal',`sites`='$sites',`moresitedo`='$moresitedo',`dfrank`='$dfrank',`dfywboy`='$dfywboy',`argrange`='$argrange',downmsg='$downmsg'"; + $query = "UPDATE `#@__softconfig` SET `downtype`='$downtype',`gotojump`='$gotojump',`ismoresite`='$ismoresite',`islocal`='$islocal',`sites`='$sites',`moresitedo`='$moresitedo',`dfrank`='$dfrank',`dfywboy`='$dfywboy',`argrange`='$argrange',downmsg='$downmsg' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang('soft_config_success'), 'soft_config.php'); + ShowMsg('成功保存参数', 'soft_config.php'); exit(); } //读取参数 -$row = $dsql->GetOne("SELECT * FROM `#@__softconfig`"); +$row = $dsql->GetOne("SELECT * FROM `#@__softconfig` "); if (!is_array($row)) { - $dsql->ExecuteNoneQuery("INSERT INTO `#@__softconfig` (`downtype`,`ismoresite`,`islocal`,`gotojump`,`sites`,`downmsg`,`moresitedo`,`dfrank`,`dfywboy`, `argrange`) - VALUES ('1','0','1','0','','$downmsg','1','0','0','0');"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__softconfig` (`downtype`,`ismoresite`,`islocal`,`gotojump`,`sites`,`downmsg`,`moresitedo`,`dfrank`,`dfywboy`,`argrange`) VALUES ('1','0','1','0','','$downmsg','1','0','0','0'); "); $row['downtype'] = 1; $row['ismoresite'] = 0; $row['islocal'] = 1; diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 293e0a21..7b5a4e21 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -8,30 +8,29 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +require_once(DEDEINC."/customfields.func.php"); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { require_once(DEDEADMIN."/inc/inc_catalog_options.php"); - UserLogin::ClearMyAddon(); + require_once(DEDEINC."/dedetag.class.php"); + ClearMyAddon(); $aid = preg_replace("#[^0-9]#", '', $aid); $channelid = "3"; //读取归档信息 - $arcQuery = "SELECT `#@__channeltype`.typename as channelname,`#@__arcrank`.membername as rankname,`#@__archives`.* FROM `#@__archives` LEFT JOIN `#@__channeltype` ON `#@__channeltype`.id=`#@__archives`.channel LEFT JOIN `#@__arcrank` ON `#@__arcrank`.`rank`=`#@__archives`.arcrank WHERE `#@__archives`.id='$aid'"; + $arcQuery = "SELECT `#@__channeltype`.typename as channelname, `#@__arcrank`.membername as rankname, `#@__archives`.* FROM `#@__archives` LEFT JOIN `#@__channeltype` ON `#@__channeltype`.id=`#@__archives`.channel LEFT JOIN `#@__arcrank` ON `#@__arcrank`.`rank`=`#@__archives`.arcrank WHERE `#@__archives`.id='$aid'"; $dsql->SetQuery($arcQuery); $arcRow = $dsql->GetOne($arcQuery); if (!is_array($arcRow)) { - ShowMsg(Lang("content_err_archive"), "-1"); + ShowMsg("读取档案基本信息出错!", "-1"); exit(); } $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg(Lang("content_err_channel"), "javascript:;"); + ShowMsg("读取频道配置信息出错!", "javascript:;"); exit(); } $addtable = $cInfos['addtable']; @@ -48,9 +47,9 @@ if ($dopost != 'save') { foreach ($dtp->CTags as $ctag) { if ($ctag->GetName() == 'link') { $islocal = $ctag->GetAtt('islocal'); - if ($islocal != 1) $needmsg = ""; + if ($islocal != 1) $needmsg = ""; else $needmsg = ''; - $nForm .= "
    软件地址{$newRowStart}： 服务器名称： + $nForm .= "
    软件地址{$newRowStart}： 服务器名称： $needmsg
    \r\n"; @@ -67,8 +66,12 @@ if ($dopost != 'save') { include DedeInclude("templets/soft_edit.htm"); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = 0; @@ -77,22 +80,22 @@ else if ($dopost == 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if ($typeid == 0) { - ShowMsg(Lang('content_error_typeid_isempty'), "-1"); + ShowMsg("请指定文档的栏目", "-1"); exit(); } if (empty($channelid)) { - ShowMsg(Lang('content_error_channelid_isempty'), "-1"); + ShowMsg("文档为非指定的类型，请检查您发布内容的表单是否合法", "-1"); exit(); } if (!CheckChannel($typeid, $channelid)) { - ShowMsg(Lang('content_error_channelid_check_failed'), "-1"); + ShowMsg("您所选择的栏目与当前模型不相符，请选择白色的选项", "-1"); exit(); } - if (!UserLogin::TestPurview('a_Edit')) { - if (UserLogin::TestPurview('a_AccEdit')) { - UserLogin::CheckCatalog($typeid, Lang('content_error_channelid_check_failed',array('typeid'=>$typeid))); + if (!TestPurview('a_Edit')) { + if (TestPurview('a_AccEdit')) { + CheckCatalog($typeid, "对不起，您没有操作栏目 {$typeid} 的文档权限"); } else { - CheckArcAdmin($id, $cUserLogin->getUserID()); + CheckArcAdmin($id, $cuserLogin->getUserID()); } } //对保存的内容进行处理 @@ -112,11 +115,12 @@ else if ($dopost == 'save') { $description = cn_substrR($description, $cfg_auot_description); $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -135,7 +139,7 @@ else if ($dopost == 'save') { continue; } $vs = explode(',', $v); - if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -158,9 +162,9 @@ else if ($dopost == 'save') { //跳转网址的文档强制为动态 if (preg_match('#j#', $flag)) $ismake = -1; //修改主档案表 - $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',`money`='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id';"; + $inQuery = "UPDATE `#@__archives` SETtypeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',`money`='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($inQuery)) { - ShowMsg(Lang('content_err_update_archive'), "-1"); + ShowMsg("更新数据库archives表时出错，请检查", "-1"); exit(); } //软件链接列表 @@ -172,7 +176,7 @@ else if ($dopost == 'save') { $servermsg = str_replace("'", '', stripslashes(${'servermsg'.$i})); $softurl = stripslashes(${'softurl'.$i}); if ($servermsg == '') { - $servermsg = Lang('download_url').$i; + $servermsg = '下载地址'.$i; } if ($softurl != 'http://') { if ($islocal == 1) $urls .= "{dede:link islocal='$islocal' text='{$servermsg}'} $softurl {/dede:link}\r\n"; @@ -183,38 +187,42 @@ else if ($dopost == 'save') { } $urls = addslashes($urls); //更新附加表 - $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid'"); + $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); if ($addtable != '') { $useip = GetIP(); - $inQuery = "UPDATE `$addtable` SET typeid='$typeid',filetype='$filetype',language='$language',softtype='$softtype',accredit='$accredit',os='$os',softrank='$softrank',officialUrl='$officialUrl',officialDemo='$officialDemo',softsize='$softsize',softlinks='$urls',redirecturl='$redirecturl',userip='$useip',daccess='$daccess',needmoney='$needmoney',introduce='$body' {$inadd_f} WHERE aid='$id';"; + $inQuery = "UPDATE `$addtable` SET typeid='$typeid',filetype='$filetype',language='$language',softtype='$softtype',accredit='$accredit',os='$os',softrank='$softrank',officialUrl ='$officialUrl',officialDemo ='$officialDemo',softsize='$softsize',softlinks='$urls',redirecturl='$redirecturl',userip='$useip',daccess='$daccess',needmoney='$needmoney',introduce='$body' {$inadd_f} WHERE aid='$id';"; if (!$dsql->ExecuteNoneQuery($inQuery)) { - ShowMsg(Lang('content_err_update_addon',array('addtable'=>'addonsoft')), "-1"); + ShowMsg("更新数据库附加表 addonsoft 时出错，请检查原因", "-1"); exit(); } } //生成网页 UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - $arcUrl = MakeArt($id, TRUE, TRUE); + $arcUrl = MakeArt($id, TRUE, TRUE, $isremote); if ($arcUrl == "") { $arcUrl = $cfg_phpurl."/view.php?aid=$id"; } - UserLogin::ClearMyAddon($id, $title); + ClearMyAddon($id, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."修改软件".Lang('content_view')."".Lang('content_published_main')."".Lang('catalog_main').""; - $wintitle = Lang("content_success_edit"); - $wecome_info = Lang('content_main')."::".Lang('content_edit'); - DedeWin::Instance()->AddTitle(Lang("content_success_edit")."：")->AddMsgItem($msg)->GetWindow("hand", " ", FALSE)->Display(); + $msg = "请选择您的后续操作：发布新软件修改软件查看软件已发布软件管理网站栏目管理"; + $wintitle = "成功修改一个软件"; + $wecome_info = "文档管理::修改软件"; + $win = new OxWindow(); + $win->AddTitle("成功修改软件："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", FALSE); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index 273ea92c..409599f8 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -8,24 +8,28 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_New,a_AccNew'); +CheckPurview('a_New,a_AccNew'); +require_once(DEDEINC."/customfields.func.php"); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { + require_once(DEDEINC.'/dedetag.class.php'); require_once(DEDEADMIN.'/inc/inc_catalog_options.php'); - UserLogin::ClearMyAddon(); + ClearMyAddon(); $channelid = -1; $cid = isset($cid) && is_numeric($cid) ? $cid : 0; //获得频道模型信息 - $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'"); + $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); include DedeInclude("templets/spec_add.htm"); exit(); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); @@ -38,8 +42,8 @@ else if ($dopost == 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; //对保存的内容进行处理 - if (empty($writer)) $writer = $cUserLogin->getUserName(); - if (empty($source)) $source = Lang('unknow'); + if (empty($writer)) $writer = $cuserLogin->getUserName(); + if (empty($source)) $source = '未知'; $pubdate = GetMkTime($pubdate); $senddate = time(); $sortrank = AddDay($pubdate, $sortup); @@ -54,9 +58,10 @@ else if ($dopost == 'save') { $description = cn_substrR($description, $cfg_auot_description); $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; - $adminid = $cUserLogin->getUserID(); + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -65,16 +70,16 @@ else if ($dopost == 'save') { //生成文档id $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid); if (empty($arcID)) { - ShowMsg(Lang("content_error_id_is_empty"), "-1"); + ShowMsg("无法获得主键，无法进行后续操作", "-1"); exit(); } //保存到主表 - $inQuery = "INSERT INTO `#@__archives`(id,typeid,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename) VALUES ('$arcID','$typeid','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename');"; + $inQuery = "INSERT INTO `#@__archives` (id,typeid,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,voteid,notpost,description,keywords,filename) VALUES ('$arcID','$typeid','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','0','$notpost','$description','$keywords','$filename');"; if (!$dsql->ExecuteNoneQuery($inQuery)) { echo $inQuery; $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_archives_save',array('error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeBIZ官方".str_replace('"', '', $gerr), "javascript:;"); exit(); } //专题节点列表 @@ -113,7 +118,12 @@ else if ($dopost == 'save') { } } } - $notelist .= "{dede:specnote imgheight=\\'$imgheight\\' imgwidth=\\'$imgwidth\\' infolen=\\'$infolen\\' titlelen=\\'$titlelen\\' col=\\'$col\\' idlist=\\'$okids\\' name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' keywords=\\'$keywords\\' typeid=\\'$typeid\\'}$listtmp{/dede:specnote}\r\n"; + $notelist .= "{dede:specnote imgheight=\\'$imgheight\\' imgwidth=\\'$imgwidth\\' + infolen=\\'$infolen\\' titlelen=\\'$titlelen\\' col=\\'$col\\' idlist=\\'$okids\\' + name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' + keywords=\\'$keywords\\' typeid=\\'$typeid\\'} + $listtmp + {/dede:specnote}\r\n"; } } //分析处理附加表数据 @@ -129,7 +139,7 @@ else if ($dopost == 'save') { continue; } $vs = explode(',', $v); - if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -149,36 +159,39 @@ else if ($dopost == 'save') { } $useip = GetIP(); //加入附加表 - $inQuery = "INSERT INTO `#@__addonspec`(aid,typeid,userip,templet,note{$inadd_f}) VALUES ('$arcID','$typeid','$useip','$templet','$notelist'{$inadd_v});"; + $inQuery = "INSERT INTO `#@__addonspec` (aid,typeid,userip,templet,note{$inadd_f}) VALUES ('$arcID','$typeid','$useip','$templet','$notelist'{$inadd_v});"; if (!$dsql->ExecuteNoneQuery($inQuery)) { - $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); - ShowMsg(Lang('content_error_addtable_save',array('addtable'=>'addonspec', 'error'=>str_replace('"', '', $gerr))), "javascript:;"); + ShowMsg("把数据保存到数据库附加表 addonspec 时出错，请检查原因", "-1"); exit(); } //生成网页 InsertTags($tags, $arcID); - $artUrl = MakeArt($arcID, TRUE, TRUE); + $artUrl = MakeArt($arcID, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; } - UserLogin::ClearMyAddon($arcID, $title); + ClearMyAddon($arcID, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_view')."".Lang('content_published_main').""; - $wintitle = Lang("content_success_publish"); - $wecome_info = Lang('content_main')."::".Lang('content_add'); - DedeWin::Instance()->AddTitle(Lang('content_success_publish')."：")->AddMsgItem($msg)->GetWindow("hand", " ", FALSE)->Display(); + $msg = "请选择您的后续操作：创建新专题查看专题已发布专题管理"; + $wintitle = "成功创建专题"; + $wecome_info = "文档管理::发布专题"; + $win = new OxWindow(); + $win->AddTitle("成功创建专题："); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", FALSE); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index 7f390971..1d66bdd5 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -8,37 +8,40 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; -use DedeBIZ\Template\DedeTagParse; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +CheckPurview('a_Edit,a_AccEdit,a_MyEdit'); +require_once(DEDEINC."/customfields.func.php"); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); if (empty($dopost)) $dopost = ''; if ($dopost != 'save') { require_once(DEDEADMIN."/inc/inc_catalog_options.php"); - UserLogin::ClearMyAddon(); + require_once(DEDEINC."/dedetag.class.php"); + ClearMyAddon(); $aid = intval($aid); $channelid = -1; //读取归档信息 - $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid'"; + $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid' "; $arcRow = $dsql->GetOne($arcQuery); if (!is_array($arcRow)) { - ShowMsg(Lang("content_err_archive"), "-1"); + ShowMsg("读取档案基本信息出错!", "-1"); exit(); } $query = "SELECT * FROM `#@__channeltype` WHERE id='-1'"; $cInfos = $dsql->GetOne($query); if (!is_array($cInfos)) { - ShowMsg(Lang("content_err_channel"), "javascript:;"); + ShowMsg("读取频道配置信息出错!", "javascript:;"); exit(); } $addRow = $dsql->GetOne("SELECT * FROM `#@__addonspec` WHERE aid='$aid'"); $tags = GetTags($aid); include DedeInclude("templets/spec_edit.htm"); } +/*-------------------------------- +function __save(){ } +-------------------------------*/ else if ($dopost == 'save') { - helper('image'); + require_once(DEDEINC.'/image.func.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (!isset($tags)) $tags = ''; @@ -61,11 +64,12 @@ else if ($dopost == 'save') { $description = cn_substrR($description, $cfg_auot_description); $keywords = trim(cn_substrR($keywords, 60)); $filename = trim(cn_substrR($filename, 40)); + $isremote = 0; $serviterm = empty($serviterm) ? "" : $serviterm; - if (!UserLogin::TestPurview('a_Check,a_AccCheck,a_MyCheck')) { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } - $adminid = $cUserLogin->getUserID(); + $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 if (empty($ddisremote)) { $ddisremote = 0; @@ -84,7 +88,7 @@ else if ($dopost == 'save') { continue; } $vs = explode(',', $v); - if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理 + if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //HTML文本特殊处理 { ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); } else { @@ -103,7 +107,7 @@ else if ($dopost == 'save') { } $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',sortrank='$sortrank',flag='$flag',ismake='$ismake',arcrank='$arcrank',click='$click',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($inQuery)) { - ShowMsg(Lang('content_err_update_archive'), "-1"); + ShowMsg("更新数据库archives表时出错，请检查", "-1"); exit(); } //专题节点列表 @@ -161,37 +165,46 @@ else if ($dopost == 'save') { } } } - $notelist .= "{dede:specnote imgheight=\\'$imgheight\\' imgwidth=\\'$imgwidth\\' infolen=\\'$infolen\\' titlelen=\\'$titlelen\\' col=\\'$col\\' idlist=\\'$okids\\' name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' keywords=\\'$keywords\\' typeid=\\'$ttypeid\\'}$listtmp{/dede:specnote}\r\n"; + $notelist .= "{dede:specnote imgheight=\\'$imgheight\\' imgwidth=\\'$imgwidth\\' + infolen=\\'$infolen\\' titlelen=\\'$titlelen\\' col=\\'$col\\' idlist=\\'$okids\\' + name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' + keywords=\\'$keywords\\' typeid=\\'$ttypeid\\'} + $listtmp + {/dede:specnote}\r\n"; } } //更新附加表 $inQuery = "UPDATE `#@__addonspec` SET typeid ='$typeid',note='$notelist'{$inadd_f},templet='$templet' WHERE aid='$id';"; if (!$dsql->ExecuteNoneQuery($inQuery)) { - ShowMsg(Lang('content_err_update_addon',array('addtable'=>'addonspec')), "-1"); + ShowMsg("更新数据库附加表 addonspec 时出错，请检查原因", "-1"); exit(); } //生成网页 UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - $artUrl = MakeArt($id, TRUE, TRUE); + $artUrl = MakeArt($id, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl."/view.php?aid=$id"; } - UserLogin::ClearMyAddon($id, $title); + ClearMyAddon($id, $title); //自动更新关联内容 - if (isset($automake) && is_array($automake)) { + if (is_array($automake)) { foreach ($automake as $key => $value) { if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id, true, true); + MakeArt($id, true, true, $isremote); } } } } //返回成功信息 - $msg = Lang('more_actions')."：".Lang('content_continue_publish')."".Lang('content_edit')."".Lang('content_view')."".Lang('content_published_main')." "; - $wintitle = Lang("content_success_edit"); - $wecome_info = Lang('content_main')."::".Lang('content_edit'); - DedeWin::Instance()->AddTitle(Lang("content_success_edit")."：")->AddMsgItem($msg)->GetWindow("hand", " ", FALSE)->Display(); + $msg = "请选择您的后续操作：发布新专题修改专题查看专题已发布专题管理 "; + $wintitle = "成功修改一个专题"; + $wecome_info = "专题管理::修改专题"; + $win = new OxWindow(); + $win->AddTitle("成功修改专题"); + $win->AddMsgItem($msg); + $winform = $win->GetWindow("hand", " ", FALSE); + $win->Display(); } ?> \ No newline at end of file diff --git a/src/admin/stepselect_main.php b/src/admin/stepselect_main.php index 341b9b5f..3e8fe7c7 100644 --- a/src/admin/stepselect_main.php +++ b/src/admin/stepselect_main.php @@ -8,12 +8,14 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('c_Stepselect'); -helper('enums'); -//前台视图 +CheckPurview('c_Stepselect'); +require_once(DEDEINC."/datalistcp.class.php"); +require_once(DEDEINC.'/enums.func.php'); +/*----------------- +前台视图 +function __show() { } +------------------*/ $ENV_GOBACK_URL = (isset($ENV_GOBACK_URL) ? $ENV_GOBACK_URL : 'stepselect_main.php'); if (empty($action)) { setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); @@ -33,7 +35,7 @@ if (empty($action)) { if ($topvalue % 500 == 0) { $egroupsql = " WHERE egroup LIKE '$egroup' AND evalue>=$topvalue AND evalue < ".($topvalue + 500); } else { - $egroupsql = " WHERE (evalue LIKE '$topvalue.%%%' OR evalue=$topvalue) AND egroup LIKE '$egroup' "; + $egroupsql = " WHERE (evalue LIKE '$topvalue.%%%' OR evalue=$topvalue) AND egroup LIKE '$egroup'"; } } else { $egroupsql = " WHERE egroup LIKE '$egroup' "; @@ -56,20 +58,23 @@ if (empty($action)) { include('./templets/stepselect_showajax.htm'); exit(); } -//删除类型或枚举值 +/*----------------- +删除类型或枚举值 +function __del() { } +------------------*/ else if ($action == 'del') { - $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE id='$id'"); + $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE id='$id' "); if (!is_array($arr)) { - ShowMsg(Lang("stepselect_err_delete_no"), "stepselect_main.php?".ExecTime()); + ShowMsg("无法获取分类信息，不允许后续操作", "stepselect_main.php?".ExecTime()); exit(); } if ($arr['issystem'] == 1) { - ShowMsg(Lang("stepselect_err_delete_issystem"), "stepselect_main.php?".ExecTime()); + ShowMsg("系统内置的枚举分类不能删除", "stepselect_main.php?".ExecTime()); exit(); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__stepselect` WHERE id='$id';"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='{$arr['egroup']}';"); - ShowMsg(Lang("stepselect_delete_one_success"), "stepselect_main.php?".ExecTime()); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__stepselect` WHERE id='$id'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='{$arr['egroup']}'; "); + ShowMsg("成功删除一个分类", "stepselect_main.php?".ExecTime()); exit(); } else if ($action == 'delenumAllSel') { if (isset($ids) && is_array($ids)) { @@ -79,76 +84,122 @@ else if ($action == 'del') { while ($row = $dsql->GetArray('me')) { $groups[] = $row['egroup']; } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id IN($id);"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id IN($id); "); //更新缓存 foreach ($groups as $egropu) { WriteEnumsCache($egroup); } - ShowMsg(Lang("stepselect_delete_select_success"), $ENV_GOBACK_URL); + ShowMsg("成功删除选中的枚举分类", $ENV_GOBACK_URL); } else { - ShowMsg(Lang("stepselect_none_select"), "-1"); + ShowMsg("您没选择任何分类", "-1"); } exit(); } else if ($action == 'delenum') { - $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$id'"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id='{$id}';"); + $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$id' "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id='{$id}'; "); WriteEnumsCache($row['egroup']); - ShowMsg(Lang("stepselect_delete_enum_success"), $ENV_GOBACK_URL); + ShowMsg("成功删除一个枚举", $ENV_GOBACK_URL); exit(); } -//保存类型修改 +/*----------------- +保存类型修改 +function __edit_save() { } +------------------*/ else if ($action == 'edit_save') { if (preg_match("#[^0-9a-z_-]#i", $egroup)) { - ShowMsg(Lang("stepselect_err_namecheck"), "-1"); + ShowMsg("组名称不能有全角字符或特殊符号", "-1"); exit(); } - $dsql->ExecuteNoneQuery("UPDATE `#@__stepselect` SET `itemname`='$itemname',`egroup`='$egroup' WHERE id='$id';"); - ShowMsg(Lang("stepselect_edit_save_success"), "stepselect_main.php?".ExecTime()); + $dsql->ExecuteNoneQuery("UPDATE `#@__stepselect` SET `itemname`='$itemname',`egroup`='$egroup' WHERE id='$id'; "); + ShowMsg("成功修改一个分类", "stepselect_main.php?".ExecTime()); exit(); } -//保存新类型 +/*----------------- +保存新类型 +function __addnew_save() { } +------------------*/ else if ($action == 'addnew_save') { if (preg_match("#[^0-9a-z_-]#i", $egroup)) { - ShowMsg(Lang("stepselect_err_namecheck"), "-1"); + ShowMsg("组名称不能有全角字符或特殊符号", "-1"); exit(); } - $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE itemname LIKE '$itemname' OR egroup LIKE '$egroup'"); + $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE itemname LIKE '$itemname' OR egroup LIKE '$egroup' "); if (is_array($arr)) { - ShowMsg(Lang("stepselect_err_edit_item_exists"), "stepselect_main.php"); + ShowMsg("您指定的类别名称或组名称已经存在，不能使用", "stepselect_main.php"); exit(); } - $dsql->ExecuteNoneQuery("INSERT INTO `#@__stepselect` (`itemname`,`egroup`,`issign`,`issystem`) VALUES ('$itemname','$egroup','0','0');"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__stepselect` (`itemname`,`egroup`,`issign`,`issystem`) VALUES ('$itemname','$egroup','0','0'); "); WriteEnumsCache($egroup); - ShowMsg(Lang("stepselect_add_item_success"), "stepselect_main.php?egroup=$egroup"); + ShowMsg("成功添加一个分类", "stepselect_main.php?egroup=$egroup"); exit(); } -/* +/*--------- +把旧版全国省市表替换当前地区数据 +function __exarea() { } +----------*/ +else if ($action == 'exarea') { + $bigtypes = array(); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='nativeplace'; "); + $query = "SELECT * FROM `#@__area` WHERE reid =0 ORDER BY id ASC"; + $dsql->Execute('me', $query); + $n = 1; + while ($row = $dsql->GetArray()) { + $bigtypes[$row['id']] = $evalue = $disorder = $n * 500; + $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) + VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0'); "); + $n++; + } + $stypes = array(); + foreach ($bigtypes as $k => $v) { + $query = "SELECT * FROM `#@__area` WHERE reid=$k ORDER BY id ASC"; + $dsql->Execute('me', $query); + $n = 1; + while ($row = $dsql->GetArray()) { + $stypes[$row['id']] = $evalue = $disorder = $v + $n; + $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) + VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0'); "); + $n++; + } + } + WriteEnumsCache('nativeplace'); + ShowMsg("成功导入所有旧的地区数据", "stepselect_main.php?egroup=nativeplace"); + exit(); +} +/*-------------------- function __addenum_save() { } -关于二级枚举的说明，为了节省查询速度，二级枚举是通过特殊算法生成的，原理为凡是能被500整除的都是一级枚举，(500 * n) + 1 < em < 500 * (n+1) 为下级枚举如：1000的下级枚举对应的值为 1001,1002,10031499对于issign=1的，表示这个类别只有一级枚举，则不受上面的算法限制 -新增二级枚举下添加"-N"自己类别选择,例如：1001二级枚举下面的3级类目,则为1001-1,1001-2这时候需要issign=2 -*/ +关于二级枚举的说明，为了节省查询速度，二级枚举是通过特殊算法生成的，原理为 +凡是能被 500 整除的都是一级枚举，(500 * n) + 1 < em < 500 * (n+1) 为下级枚举 +如：1000 的下级枚举对应的值为 1001,1002,10031499 +对于 issign=1 的，表示这个类别只有一级枚举，则不受上面的算法限制 +------------------------------------------------------------------------ +更新算法: +新增二级枚举下添加"-N"自己类别选择,例如: +1001二级枚举下面的3级类目,则为1001-1,1001-2 +这时候需要issign=2 +---------------------*/ else if ($action == 'addenum_save') { if (empty($ename) || empty($egroup)) { - Showmsg(Lang("stepselect_err_ename_empty"), "-1"); + Showmsg("类别名称或组名称不能为空", "-1"); exit(); } if ($issign == 1 || $topvalue == 0) { $enames = explode(',', $ename); foreach ($enames as $ename) { - $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND (evalue MOD 500)=0 ORDER BY disorder DESC"); + $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND (evalue MOD 500)=0 ORDER BY disorder DESC "); if (!is_array($arr)) $disorder = $evalue = ($issign == 1 ? 1 : 500); else $disorder = $evalue = $arr['disorder'] + ($issign == 1 ? 1 : 500); - $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) VALUES ('$ename','$evalue','$egroup','$disorder','$issign');"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) + VALUES ('$ename','$evalue','$egroup','$disorder','$issign'); "); } WriteEnumsCache($egroup); - ShowMsg(Lang("stepselect_add_item_success").$dsql->GetError(), $ENV_GOBACK_URL); + ShowMsg("成功添加枚举分类".$dsql->GetError(), $ENV_GOBACK_URL); exit(); } else if ($issign == 2 && $topvalue != 0) { $minid = $topvalue; $maxnum = 500; //三级子类最多500个 $enames = explode(',', $ename); foreach ($enames as $ename) { - $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue LIKE '$topvalue.%%%' ORDER BY evalue DESC"); + $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue LIKE '$topvalue.%%%' ORDER BY evalue DESC "); if (!is_array($arr)) { $disorder = $minid; $evalue = $minid.'.001'; @@ -159,47 +210,55 @@ else if ($action == 'addenum_save') { $addvalue = sprintf("%03d", $addvalue); $evalue = $matchs[1].'.'.$addvalue; } - $sql = "INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) VALUES ('$ename','$evalue','$egroup','$disorder','$issign');"; + $sql = "INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) + VALUES ('$ename','$evalue','$egroup','$disorder','$issign'); "; //echo $sql;exit; $dsql->ExecuteNoneQuery($sql); } //echo $minid; WriteEnumsCache($egroup); - ShowMsg(Lang("stepselect_add_item_success"), $ENV_GOBACK_URL); + ShowMsg("成功添加枚举分类", $ENV_GOBACK_URL); exit(); } else { $minid = $topvalue; $maxid = $topvalue + 500; $enames = explode(',', $ename); foreach ($enames as $ename) { - $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue>$minid AND evalue<$maxid ORDER BY evalue DESC"); + $arr = $dsql->GetOne("SELECT * FROM `#@__sys_enum` WHERE egroup='$egroup' AND evalue>$minid AND evalue<$maxid ORDER BY evalue DESC "); if (!is_array($arr)) { $disorder = $evalue = $minid + 1; } else { $disorder = $arr['disorder'] + 1; $evalue = $arr['evalue'] + 1; } - $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) VALUES ('$ename','$evalue','$egroup','$disorder','$issign');"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) + VALUES ('$ename','$evalue','$egroup','$disorder','$issign'); "); } WriteEnumsCache($egroup); - ShowMsg(Lang("stepselect_add_item_success"), $ENV_GOBACK_URL); + ShowMsg("成功添加枚举分类", $ENV_GOBACK_URL); exit(); } } -//修改枚举名称和排序 +/*----------------- +修改枚举名称和排序 +function __upenum() { } +------------------*/ else if ($action == 'upenum') { $ename = trim(preg_replace("# └─(─){1,}#", '', $ename)); - $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$aid'"); + $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$aid' "); WriteEnumsCache($row['egroup']); - $dsql->ExecuteNoneQuery("UPDATE `#@__sys_enum` SET `ename`='$ename',`disorder`='$disorder' WHERE id='$aid';"); - ShowMsg(Lang("stepselect_edit_item_success"), $ENV_GOBACK_URL); + $dsql->ExecuteNoneQuery("UPDATE `#@__sys_enum` SET `ename`='$ename',`disorder`='$disorder' WHERE id='$aid'; "); + ShowMsg("成功修改一个枚举", $ENV_GOBACK_URL); exit(); } -//更新枚举缓存 +/*----------------- +更新枚举缓存 +function __upallcache() { } +------------------*/ else if ($action == 'upallcache') { if (!isset($egroup)) $egroup = ''; WriteEnumsCache($egroup); - ShowMsg(Lang("stepselect_upcache_success"), $ENV_GOBACK_URL); + ShowMsg("成更新枚举缓存", $ENV_GOBACK_URL); exit(); } ?> \ No newline at end of file diff --git a/src/admin/swfupload.php b/src/admin/swfupload.php index d16ef558..a7b9cc5c 100644 --- a/src/admin/swfupload.php +++ b/src/admin/swfupload.php @@ -9,21 +9,168 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); -helper('image'); +require_once(DEDEINC.'/image.func.php'); +/************************ +//上传 +function Upload(){ } + *************************/ +if (empty($dopost)) { + ini_set('html_errors', '0'); + if (empty($Filedata) || !is_uploaded_file($Filedata)) { + echo 'ERROR: Upload Error! '; + exit(0); + } + //把文件移动到临时目录 + $tmpdir = DEDEDATA.'/uploadtmp'; + if (!is_dir($tmpdir)) { + MkdirAll($tmpdir, $cfg_dir_purview); + CloseFtp(); + if (!is_dir($tmpdir)) { + echo "ERROR: Create {$tmpdir} dir Error! "; + exit(0); + } + } + $FiledataNew = str_replace("\\", '/', $Filedata); + $FiledataNew = $tmpdir.'/'.preg_replace("/(.*)[\/]/isU", "", $FiledataNew); + $mime = get_mime_type($Filedata); + if (preg_match("#^unknow#", $mime)) { + echo "ERROR: Create {$tmpdir} dir Error! "; + exit; + } + if (!preg_match("#^(image|video|audio|application)#i", $mime)) { + echo "ERROR: Create {$tmpdir} dir Error! "; + exit; + } + move_uploaded_file($Filedata, $FiledataNew); + $info = $ftype = $sname = ''; + $srcInfo = GetImageSize($FiledataNew, $info); + //检测文件类型 + if (!is_array($srcInfo)) { + @unlink($Filedata); + echo "ERROR: Image info Error! "; + exit(0); + } else { + switch ($srcInfo[2]) { + case 1: + $ftype = 'image/gif'; + $sname = '.gif'; + break; + case 2: + $ftype = 'image/jpeg'; + $sname = '.jpg'; + break; + case 3: + $ftype = 'image/png'; + $sname = '.png'; + break; + case 6: + $ftype = 'image/bmp'; + $sname = '.bmp'; + break; + } + } + if ($ftype == '') { + @unlink($Filedata); + echo "ERROR: Image type Error! "; + exit(0); + } + //保存原图 + $filedir = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, time()); + if (!is_dir(DEDEROOT.$filedir)) { + MkdirAll($cfg_basedir.$filedir, $cfg_dir_purview); + CloseFtp(); + } + $filename = $cuserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', time())); + if (file_exists($cfg_basedir.$filedir.'/'.$filename.$sname)) { + for ($i = 50; $i <= 5000; $i++) { + if (!file_exists($cfg_basedir.$filedir.'/'.$filename.'-'.$i.$sname)) { + $filename = $filename.'-'.$i; + break; + } + } + } + $fileurl = $filedir.'/'.$filename.$sname; + $rs = copy($FiledataNew, $cfg_basedir.$fileurl); + unlink($FiledataNew); + if (!$rs) { + echo "ERROR: Copy Uploadfile Error! "; + exit(0); + } + //WaterImg($cfg_basedir.$fileurl, 'up'); + $title = $filename.$sname; + $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) + VALUES ('$title','$fileurl','$ftype','0','0','0','".filesize($cfg_basedir.$fileurl)."','".time()."','".$cuserLogin->getUserID()."'); "; + if (!empty($arcid)) { + $inquery = "INSERT INTO `#@__uploads` (arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid) + VALUES ('$arcid','$title','$fileurl','$ftype','0','0','0','".filesize($cfg_basedir.$fileurl)."','".time()."','".$cuserLogin->getUserID()."'); "; + } + $dsql->ExecuteNoneQuery($inquery); + $fid = $dsql->GetLastID(); + AddMyAddon($fid, $fileurl); + //生成缩略图 + ob_start(); + ImageResizeNew($cfg_basedir.$fileurl, $cfg_ddimg_width, $cfg_ddimg_height, '', false); + $imagevariable = ob_get_contents(); + ob_end_clean(); + //保存信息到 session + if (!isset($_SESSION['file_info'])) $_SESSION['file_info'] = array(); + if (!isset($_SESSION['bigfile_info'])) $_SESSION['bigfile_info'] = array(); + if (!isset($_SESSION['fileid'])) $_SESSION['fileid'] = 1; + else $_SESSION['fileid']++; + $_SESSION['bigfile_info'][$_SESSION['fileid']] = $fileurl; + $_SESSION['file_info'][$_SESSION['fileid']] = $imagevariable; + echo "FILEID:".$_SESSION['fileid']; + exit(0); +} +/************************ +//生成缩图 +function GetThumbnail(){ } +*************************/ +else if ($dopost == 'thumbnail') { + if (empty($id)) { + header('HTTP/1.1 500 Internal Server Error'); + echo 'No ID'; + exit(0); + } + if (!is_array($_SESSION['file_info']) || !isset($_SESSION['file_info'][$id])) { + header('HTTP/1.1 404 Not found'); + exit(0); + } + header('Content-type: image/jpeg'); + header('Content-Length: '.strlen($_SESSION['file_info'][$id])); + echo $_SESSION['file_info'][$id]; + exit(0); +} +/************************ //删除指定ID的图片 -if ($dopost == 'del') { +*************************/ +else if ($dopost == 'del') { if (!isset($_SESSION['bigfile_info'][$id])) { echo ''; exit(); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$_SESSION['bigfile_info'][$id]}';"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$_SESSION['bigfile_info'][$id]}'; "); @unlink($cfg_basedir.$_SESSION['bigfile_info'][$id]); $_SESSION['file_info'][$id] = ''; $_SESSION['bigfile_info'][$id] = ''; - echo Lang("deleted"); + echo "已删除"; + exit(); +} +/************************ +//获取图片地址 +*************************/ +else if ($dopost == 'addtoedit') { + if (!isset($_SESSION['bigfile_info'][$id])) { + echo ''; + exit(); + } + echo $_SESSION['bigfile_info'][$id]; exit(); } +/************************ //获取本地图片的缩略预览图 +function GetddImg(){ } +*************************/ else if ($dopost == 'ddimg') { //生成缩略图 ob_start(); @@ -36,14 +183,16 @@ else if ($dopost == 'ddimg') { echo $imagevariable; exit(); } +/************************ //删除指定的图片(编辑图集时用) +*************************/ else if ($dopost == 'delold') { $imgfile = $cfg_basedir.$picfile; if (!file_exists($imgfile) && !is_dir($imgfile) && preg_match("#^".$cfg_medias_dir."#", $imgfile)) { @unlink($imgfile); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$picfile}';"); - echo Lang("deleted"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$picfile}'; "); + echo "已删除"; exit(); } ?> \ No newline at end of file diff --git a/src/admin/sys_admin_user.php b/src/admin/sys_admin_user.php index 3a1349f0..be4b6afd 100644 --- a/src/admin/sys_admin_user.php +++ b/src/admin/sys_admin_user.php @@ -8,21 +8,19 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_User'); +CheckPurview('sys_User'); +require_once(DEDEINC."/datalistcp.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); if (empty($rank)) $rank = ''; else $rank = " WHERE CONCAT(#@__admin.usertype)='$rank' "; -$dsql->SetQuery("SELECT `rank`,typename FROM `#@__admintype`"); +$dsql->SetQuery("SELECT `rank`,typename FROM `#@__admintype` "); $dsql->Execute(); while ($row = $dsql->GetObject()) { $adminRanks[$row->rank] = $row->typename; } -$query = "SELECT * FROM `#@__admin` $rank"; +$query = "SELECT `#@__admin`.*,`#@__arctype`.typename FROM `#@__admin` LEFT JOIN `#@__arctype` ON `#@__admin`.typeid = `#@__arctype`.id $rank "; $dlist = new DataListCP(); -$dlist->enableXssClean = false; $dlist->SetTemplet(DEDEADMIN."/templets/sys_admin_user.htm"); $dlist->SetSource($query); $dlist->Display(); @@ -34,14 +32,7 @@ function GetUserType($trank) } function GetChannel($c) { - global $dsql; - $result = array(); - $dsql->SetQuery("SELECT typename FROM `#@__arctype` where id in ($c)"); - $dsql->Execute('c'); - while ($row = $dsql->GetObject('c')) { - $result[] = $row->typename; - } if ($c == "" || $c == 0) return "所有频道"; - else return join(',',$result); + else return $c; } ?> \ No newline at end of file diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index bc0c230a..0ce9a852 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -8,24 +8,24 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_User'); +CheckPurview('sys_User'); +require_once(DEDEINC."/typelink/typelink.class.php"); if (empty($dopost)) $dopost = ''; if ($dopost == 'add') { CheckCSRF(); if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) { - ShowMsg(Lang('sys_admin_err_pwd_check'), '-1', 0, 3000); + ShowMsg('密码或或用户名不合法，
    请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecode != $safecodeok) { - ShowMsg(Lang("sys_admin_err_safecodeok_check"), '-1', 0, 3000); + ShowMsg('请填写验证安全码', '-1', 0, 3000); exit(); } - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid'"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid' "); if ($row['dd'] > 0) { - ShowMsg(Lang('sys_admin_user_err_uname_exists'), '-1'); + ShowMsg('用户名已存在', '-1'); exit(); } $pfd = "pwd"; @@ -40,33 +40,38 @@ if ($dopost == 'add') { $typeid = join(',', $typeids); if ($typeid == '0') $typeid = ''; //关连前台会员帐号 - $adminquery = "INSERT INTO `#@__member` (`mtype`,`userid`,`$pfd`,`uname`,`sex`,`rank`,`money`,`email`,`scores`,`matt`,`face`,`safequestion`,`safeanswer`,`jointime`,`joinip`,`logintime`,`loginip` ) VALUES ('个人','$userid','$mpwd','$uname','男','100','0','$email','1000','10','','0','','0','','0','');"; + $adminquery = "INSERT INTO `#@__member` (`mtype`,`userid`,`$pfd`,`uname`,`sex`,`rank`,`money`,`email`,`scores`,`matt`,`face`,`safequestion`,`safeanswer`,`jointime`,`joinip`,`logintime`,`loginip` ) + VALUES ('个人','$userid','$mpwd','$uname','男','100','0','$email','1000','10','','0','','0','','0',''); "; $dsql->ExecuteNoneQuery($adminquery); $mid = $dsql->GetLastID(); if ($mid <= 0) { - die($dsql->GetError().' '.Lang('sys_admin_user_err_database')); + die($dsql->GetError().' 数据库出错'); } //后台管理员 - $inquery = "INSERT INTO `#@__admin`(id,usertype,userid,$pfd,uname,typeid,tname,email) VALUES ('$mid','$usertype','$userid','$pwd','$uname','$typeid','$tname','$email');"; + $inquery = "INSERT INTO `#@__admin`(id,usertype,userid,$pfd,uname,typeid,tname,email) + VALUES ('$mid','$usertype','$userid','$pwd','$uname','$typeid','$tname','$email'); "; $rs = $dsql->ExecuteNoneQuery($inquery); - $adminquery = "INSERT INTO `#@__member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) VALUES ('$mid','1','男','{$userid}','','','','','0','0','1980-01-01','1','0','0','160','0','0','0','0','0','0','0','0','','','','','0');"; + $adminquery = "INSERT INTO `#@__member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) + VALUES ('$mid', '1', '男', '{$userid}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); "; $dsql->ExecuteNoneQuery($adminquery); - $adminquery = "INSERT INTO `#@__member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) VALUES ('$mid','0','0','0','0','0','0','0','0');"; + $adminquery = "INSERT INTO `#@__member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) + VALUES ('$mid','0','0','0','0','0','0','0','0'); "; $dsql->ExecuteNoneQuery($adminquery); - $adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('$mid','10','0','{$uname}的空间','','person','',''); "; + $adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) + VALUES ('$mid','10','0','{$uname}的空间','','person','',''); "; $dsql->ExecuteNoneQuery($adminquery); - ShowMsg(Lang('sys_admin_user_add_success'), 'sys_admin_user.php'); + ShowMsg('成功增加一个用户', 'sys_admin_user.php'); exit(); } $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); $typeOptions = ''; -$dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); +$dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1) "); $dsql->Execute('op'); while ($row = $dsql->GetObject('op')) { $topc = $row->id; $typeOptions .= "\r\n"; - $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1)"); + $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1) "); $dsql->Execute('s'); while ($row = $dsql->GetObject('s')) { $typeOptions .= "\r\n"; diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index b505a7ba..32c5bf5f 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -8,22 +8,21 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_User'); +CheckPurview('sys_User'); +require_once(DEDEINC.'/typelink/typelink.class.php'); if (empty($dopost)) $dopost = ''; $id = preg_replace("#[^0-9]#", '', $id); if ($dopost == 'saveedit') { CheckCSRF(); $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg(Lang('sys_admin_err_pwd_check'), '-1', 0, 3000); + ShowMsg('密码不合法，请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg(Lang("sys_admin_err_safecodeok_check"), "sys_admin_user_edit.php?id={$id}&dopost=edit"); + ShowMsg("请填写正确的验证安全码", "sys_admin_user_edit.php?id={$id}&dopost=edit"); exit(); } $pwdm = ''; @@ -50,40 +49,43 @@ if ($dopost == 'saveedit') { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET uname='$uname',email='$email'$pwdm WHERE mid='$id'"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("sys_admin_user_edit_success"), "sys_admin_user.php"); + ShowMsg("成功修改一个帐户", "sys_admin_user.php"); exit(); } else if ($dopost == 'delete') { if (empty($userok)) $userok = ""; if ($userok != "yes") { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); - $wintitle = Lang("sys_admin_user_delete"); - $wecome_info = "".Lang('sys_admin_user')."::".Lang("sys_admin_user_delete"); - DedeWin::Instance()->Init("sys_admin_user_edit.php", "js/blank.js", "POST") - ->AddHidden("dopost", $dopost) - ->AddHidden("userok", "yes") - ->AddHidden("randcode", $randcode) - ->AddHidden("safecode", $safecode) - ->AddHidden("id", $id) - ->AddTitle(Lang("message_info")) - ->AddMsgItem(Lang('sys_admin_user_delete_confirm',array('userid'=>$userid)), "50") - ->AddMsgItem(Lang('safecode')."：（".Lang('safecode')."：$safecode）", "30") - ->GetWindow("ok")->Display(); + require_once(DEDEINC."/libraries/oxwindow.class.php"); + $wintitle = "删除用户"; + $wecome_info = "系统帐号管理::删除用户"; + $win = new OxWindow(); + $win->Init("sys_admin_user_edit.php", "js/blank.js", "POST"); + $win->AddHidden("dopost", $dopost); + $win->AddHidden("userok", "yes"); + $win->AddHidden("randcode", $randcode); + $win->AddHidden("safecode", $safecode); + $win->AddHidden("id", $id); + $win->AddTitle("系统提示"); + $win->AddMsgItem("您确定要删除用户：$userid 吗", "50"); + $win->AddMsgItem("验证安全码：（安全码：$safecode）", "30"); + $winform = $win->GetWindow("ok"); + $win->Display(); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg(Lang("sys_admin_err_safecodeok_check"), "sys_admin_user.php"); + ShowMsg("请填写正确的验证安全码", "sys_admin_user.php"); exit(); } //不能删除id为1的创建人帐号，不能删除自己 - $rs = $dsql->ExecuteNoneQuery2("DELETE FROM `#@__admin` WHERE id='$id' AND id<>1 AND id<>'".$cUserLogin->getUserID()."'"); + $rs = $dsql->ExecuteNoneQuery2("DELETE FROM `#@__admin` WHERE id='$id' AND id<>1 AND id<>'".$cuserLogin->getUserID()."' "); if ($rs > 0) { //更新前台用户信息 $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt='0' WHERE mid='$id' LIMIT 1"); - ShowMsg(Lang("sys_admin_user_delete_success"), "sys_admin_user.php"); + ShowMsg("成功删除一个帐户", "sys_admin_user.php"); } else { - ShowMsg(Lang("sys_admin_user_err_delete_admin"), "sys_admin_user.php", 0, 3000); + ShowMsg("不能删除id为1的创建人帐号，不能删除自己", "sys_admin_user.php", 0, 3000); } exit(); } diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index d34923d6..a43d336a 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -8,11 +8,10 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_User'); +CheckPurview('sys_User'); if (isset($dopost) && $dopost == 'getone') { - $row = $dsql->GetOne("SELECT userid FROM `#@__admin` WHERE id='$uid';"); + $row = $dsql->GetOne("SELECT userid FROM `#@__admin` WHERE id='$uid'; "); $userid = $row['userid']; $y = intval(MyDate('Y', time())); $m = intval(MyDate('m', time())); @@ -23,11 +22,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $dd = empty($dd) ? "0" : $dd; $cc = empty($cc) ? "0" : $cc; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE mid='$uid'; "); $dd += $row['dd']; $cc += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE mid='$uid'; "); $dd = $row['dd'] + $dd; $cc = $row['cc'] + $cc; //季度 @@ -42,11 +41,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $dds = empty($dds) ? "0" : $dds; $ccs = empty($ccs) ? "0" : $ccs; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); $dds += $row['dd']; $ccs += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $dds = $row['dd'] + $dds; $ccs = $row['cc'] + $ccs; //当月 @@ -57,11 +56,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddm = empty($ddm) ? "0" : $ddm; $ccm = empty($ccm) ? "0" : $ccm; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); $ddm += $row['dd']; $ccm += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddm = $row['dd'] + $ddm; $ccm = $row['cc'] + $ccm; //本周 @@ -72,11 +71,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddw = empty($ddw) ? "0" : $ddw; $ccw = empty($ccw) ? "0" : $ccw; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); $ddw += $row['dd']; $ccw += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddw = $row['dd'] + $ddw; $ccw = $row['cc'] + $ccw; //当天 @@ -87,21 +86,21 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddd = empty($ddd) ? "0" : $ddd; $ccd = empty($ccd) ? "0" : $ccd; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); $ddd += $row['dd']; $ccd += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddd = $row['dd'] + $ddd; $ccd = $row['cc'] + $ccd; $msg = " - - - - - - - + + + + + + + diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php index ff9d2d11..dd537bff 100644 --- a/src/admin/sys_cache_up.php +++ b/src/admin/sys_cache_up.php @@ -8,41 +8,40 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_ArcBatch'); +CheckPurview('sys_ArcBatch'); if (empty($dopost)) $dopost = ''; if (empty($step)) $step = 1; if ($dopost == "ok") { if (empty($uparc)) $uparc = 0; if ($step == -1) { if ($uparc == 0) sleep(1); - ShowMsg(Lang("sys_cache_up_success"), "javascript:;"); + ShowMsg("成功更新所有缓存", "javascript:;"); exit(); } //更新栏目缓存 else if ($step == 1) { UpDateCatCache(); ClearOptCache(); - ShowMsg(Lang("sys_cache_up_success_1"), "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); + ShowMsg("成功更新栏目缓存及后台栏目选项，准备更新枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); exit(); } //更新枚举缓存 else if ($step == 2) { - helper('enums'); + include_once(DEDEINC."/enums.func.php"); WriteEnumsCache(); //WriteAreaCache(); 已过期 - ShowMsg(Lang("sys_cache_up_success_2"), "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); + ShowMsg("成功更新枚举缓存，准备更新调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); exit(); } //清理arclist调用缓存、过期会员访问历史、过期短信 else if ($step == 3) { - echo ''; + echo ''; $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`"); - echo DedeAlert(Lang("sys_cache_up_success_3_1"), ALERT_SUCCESS); + echo "\n成功更新arclist调用缓存，准备清理过期会员访问历史
    "; $oldtime = time() - (90 * 24 * 3600); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime'"); - echo DedeAlert(Lang("sys_cache_up_success_3_2"), ALERT_SUCCESS); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' "); + echo "成功清理过期短信，准备修正错误文档，这可能要占较长的时间"; if ($uparc == 1) { echo ""; } else { @@ -52,7 +51,7 @@ if ($dopost == "ok") { } //修正错误文档 else if ($step == 9) { - ShowMsg(Lang('sys_cache_up_success_9'), 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); + ShowMsg('修正错误文档操作已经取消，后台系统中系统错误修复中操作', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); exit(); } } diff --git a/src/admin/sys_data.php b/src/admin/sys_data.php index f470845f..9a7b2aff 100644 --- a/src/admin/sys_data.php +++ b/src/admin/sys_data.php @@ -8,30 +8,25 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); -} -UserLogin::CheckPurview('sys_Data'); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); + } +CheckPurview('sys_Data'); if (empty($dopost)) $dopost = ''; if ($cfg_dbtype == 'sqlite') { - showMsg( Lang('sys_data_sqlite_tip',array('cfg_dbname'=>$cfg_dbname)), 'javascript:;'); - exit(); -} -if ($cfg_dbtype == 'pgsql') { - showMsg( Lang('sys_data_pgsql_tip',array('cfg_dbname'=>$cfg_dbname)), 'javascript:;'); + showMsg('备份系统根目录下/data/'.$cfg_dbname.'.db文件即可', 'javascript:;'); exit(); } if ($dopost == "viewinfo") //查看表结构 { echo ""; if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { $dsql->SetQuery("SHOW CREATE TABLE ".$dsql->dbName.".".$tablename); $dsql->Execute('me'); - $row2 = $dsql->GetArray('me', PDO::FETCH_BOTH); + $row2 = $dsql->GetArray('me', MYSQL_BOTH); $ctinfo = $row2[1]; echo trim($ctinfo); } @@ -41,13 +36,13 @@ if ($dopost == "viewinfo") //查看表结构 { echo "<xmp>"; if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { - $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`"); + $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` "); if ($rs) { - echo Lang('sys_data_opimize_ok',array('tablename'=>$tablename)); + echo "执行优化表：$tablename OK"; } else { - echo Lang('sys_data_opimize_err',array('tablename'=>$tablename,'err'=>$dsql->GetError())); + echo "执行优化表：$tablename 失败，原因是：".$dsql->GetError(); } } echo ''; @@ -56,13 +51,13 @@ if ($dopost == "viewinfo") //查看表结构 { echo ""; if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { - $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename`"); + $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` "); if ($rs) { - echo Lang('sys_data_repair_ok',array('tablename'=>$tablename)); + echo "修复表：$tablename OK"; } else { - echo Lang('sys_data_repair_err',array('tablename'=>$tablename,'err'=>$dsql->GetError())); + echo "修复表：$tablename 失败，原因是：".$dsql->GetError(); } } echo ''; @@ -72,14 +67,14 @@ if ($dopost == "viewinfo") //查看表结构 $otherTables = array(); $dedeSysTables = array(); $channelTables = array(); -$dsql->SetQuery("SELECT addtable FROM `#@__channeltype`"); +$dsql->SetQuery("SELECT addtable FROM `#@__channeltype` "); $dsql->Execute(); while ($row = $dsql->GetObject()) { $channelTables[] = $row->addtable; } $dsql->SetQuery("SHOW TABLES"); $dsql->Execute('t'); -while ($row = $dsql->GetArray('t', PDO::FETCH_BOTH)) { +while ($row = $dsql->GetArray('t', MYSQL_BOTH)) { if (preg_match("#^{$cfg_dbprefix}#", $row[0]) || in_array($row[0], $channelTables)) { $dedeSysTables[] = $row[0]; } else { diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index 041274de..eb5330cf 100644 --- a/src/admin/sys_data_done.php +++ b/src/admin/sys_data_done.php @@ -8,24 +8,26 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; @ob_start(); @set_time_limit(0); ini_set('memory_limit', '-1'); require_once(dirname(__FILE__).'/config.php'); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); -} -UserLogin::CheckPurview('sys_Data'); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); + } +CheckPurview('sys_Data'); if (empty($dopost)) $dopost = ''; $bkdir = DEDEDATA.'/'.$cfg_backup_dir; //跳转到一下页的js $gotojs = "function GotoNextPage(){document.gonext."."submit();}"."\r\nset"."Timeout('GotoNextPage()',500);"; $dojs = ""; -//备份数据 +/*-------------------- +备份数据 +function __bak_data(); +--------------------*/ if ($dopost == 'bak') { if (empty($tablearr)) { - ShowMsg(Lang('sys_data_err_select_db'), 'javascript:;'); + ShowMsg('您没选中数据表', 'javascript:;'); exit(); } if (!is_dir($bkdir)) { @@ -64,7 +66,7 @@ if ($dopost == 'bak') { } } $dh->close(); - $tmsg .= Lang("sys_data_success_backup"); + $tmsg .= "清除备份目录旧数据完成"; if ($isstruct == 1) { $bkfile = $bkdir."/tables_struct_".substr(md5(time().mt_rand(1000, 5000).$cfg_cookie_encode), 0, 16).".txt"; $mysql_version = $dsql->GetVersion(); @@ -73,7 +75,7 @@ if ($dopost == 'bak') { fwrite($fp, "DROP TABLE IF EXISTS `$t`;\r\n\r\n"); $dsql->SetQuery("SHOW CREATE TABLE ".$dsql->dbName.".".$t); $dsql->Execute('me'); - $row = $dsql->GetArray('me', PDO::FETCH_BOTH); + $row = $dsql->GetArray('me', MYSQL_BOTH); //去除AUTO_INCREMENT $row[1] = preg_replace("#AUTO_INCREMENT=([0-9]{1,})[ \r\n\t]{1,}#i", "", $row[1]); $eng1 = "#ENGINE=MyISAM[ \r\n\t]{1,}DEFAULT[ \r\n\t]{1,}CHARSET=".$cfg_db_language."#i"; @@ -81,9 +83,9 @@ if ($dopost == 'bak') { fwrite($fp, ''.$tableStruct.";\r\n\r\n"); } fclose($fp); - $tmsg .= Lang("sys_data_success_backup_struct"); + $tmsg .= "备份数据表结构信息完成"; } - $tmsg .= Lang("sys_data_running"); + $tmsg .= "正在进行数据备份初始化工作，请稍后"; $doneForm = " @@ -101,15 +103,16 @@ if ($dopost == 'bak') { $fs = array(); $bakStr = ''; //分析表里的字段信息 - $it = $dsql->GetTableFields($nowtable); - $intable = "INSERT INTO `$nowtable` VALUES ("; - foreach ($it as $row) { - $fs[$j] = trim($row->name); + $dsql->GetTableFields($nowtable); + $intable = "INSERT INTO `$nowtable` VALUES("; + while ($r = $dsql->GetFieldObject()) { + + $fs[$j] = trim($r->name); $j++; } $fsd = $j - 1; //读取表的内容 - $dsql->SetQuery("SELECT * FROM `$nowtable`"); + $dsql->SetQuery("SELECT * FROM `$nowtable` "); $dsql->Execute(); $m = 0; $bakfilename = "$bkdir/{$nowtable}_{$startpos}_".substr(md5(time().mt_rand(1000, 5000).$cfg_cookie_encode), 0, 16).".txt"; @@ -123,7 +126,7 @@ if ($dopost == 'bak') { $fp = fopen($bakfilename, "w"); fwrite($fp, $bakStr); fclose($fp); - $tmsg = Lang('sys_data_success_finish',array('m'=>$m,'nowtable'=>$nowtable)); + $tmsg = "完成到{$m}条数据备份，继续备份{$nowtable}"; $doneForm = " @@ -160,12 +163,12 @@ if ($dopost == 'bak') { $startpos = 0; break; } else { - PutInfo(Lang("sys_data_success_finish_all"), ""); + PutInfo("完成所有数据备份", ""); exit(); } } } - $tmsg = Lang('sys_data_success_finish',array('m'=>$m,'nowtable'=>$nowtable)); + $tmsg = "完成到{$m}条数据备份，继续备份{$nowtable}"; $doneForm = " @@ -174,12 +177,16 @@ if ($dopost == 'bak') { \r\n\r\n{$dojs}\r\n"; PutInfo($tmsg, $doneForm); exit(); - }//分页备份代码结束 + } + //分页备份代码结束 } -//还原数据 +/*------------------------- +还原数据 +function __re_data(); +-------------------------*/ else if ($dopost == 'redat') { if ($bakfiles == '') { - ShowMsg(Lang('sys_data_err_redat'), 'javascript:;'); + ShowMsg('没指定任何要还原数据', 'javascript:;'); exit(); } $bakfilesTmp = $bakfiles; @@ -208,7 +215,7 @@ else if ($dopost == 'redat') { if ($delfile == 1) { @unlink("$bkdir/$structfile"); } - $tmsg = Lang("sys_data_success_redat"); + $tmsg = "完成数据表还原，继续还原数据"; $doneForm = " @@ -234,10 +241,10 @@ else if ($dopost == 'redat') { @unlink("$bkdir/$nowfile"); } if ($bakfilesTmp == "") { - ShowMsg(Lang('sys_data_success_redat_all'), 'javascript:;'); + ShowMsg('成功还原所有的文件数据', 'javascript:;'); exit(); } - $tmsg = Lang('sys_data_success_redat_finish',array('nowfile'=>$nowfile,'oknum'=>$oknum)); + $tmsg = "成功还原{$nowfile}文件{$oknum}条数据，正在继续还原其它数据"; $doneForm = " @@ -249,7 +256,8 @@ else if ($dopost == 'redat') { } function PutInfo($msg1, $msg2) { - $msginfo = "".Lang('message_info')."

    ".Lang('message_info')."

    {$msg1}{$msg2}
    "; + global $cfg_soft_lang; + $msginfo = "提示信息

    提示信息

    {$msg1}{$msg2}
    "; echo $msginfo."
    "; } function RpLine($str) diff --git a/src/admin/sys_data_replace.php b/src/admin/sys_data_replace.php index ddeb7ceb..4627074b 100644 --- a/src/admin/sys_data_replace.php +++ b/src/admin/sys_data_replace.php @@ -8,58 +8,59 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); -} -if ($cfg_dbtype == 'pgsql') { - showMsg( Lang('sys_data_pgsql_tip',array('cfg_dbname'=>$cfg_dbname)), 'javascript:;'); - exit(); -} -UserLogin::CheckPurview('sys_Data'); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); + } +CheckPurview('sys_Data'); if (empty($action)) $action = ''; if (empty($action)) { require_once(DEDEADMIN."/templets/sys_data_replace.htm"); exit(); } +/*------------------------------- //列出数据库表里的字段 +function __getfields() +--------------------------------*/ else if ($action == 'getfields') { AjaxHead(); - $it = $dsql->GetTableFields($exptable); - echo "
    "; - echo Lang('sys_data_getfields',array('exptable'=>$exptable)); - foreach ($it as $row) { + $dsql->GetTableFields($exptable); + echo "
    "; + echo "表(".$exptable.")含有的字段：
    "; + while ($row = $dsql->GetFieldObject()) { echo "name}')\">".$row->name."\r\n"; } echo "
    "; exit(); } +/*------------------------------- //保存用户设置，清空会员数据 +function __Apply() +--------------------------------*/ else if ($action == 'apply') { $validate = empty($validate) ? '' : strtolower($validate); $svali = GetCkVdValue(); if ($validate == "" || $validate != $svali) { - ShowMsg(Lang("incorrect_verification_code"), "javascript:;"); + ShowMsg("安全确认码不正确!", "javascript:;"); exit(); } if ($exptable == '' || $rpfield == '') { - ShowMsg(Lang("sys_data_err_exptable"), "javascript:;"); + ShowMsg("请指定数据表和字段", "javascript:;"); exit(); } if ($rpstring == '') { - ShowMsg(Lang("sys_data_err_rpstring"), "javascript:;"); + ShowMsg("请指定被替换内容", "javascript:;"); exit(); } if ($rptype == 'replace') { $condition = empty($condition) ? '' : " WHERE $condition "; - $rs = $dsql->ExecuteNoneQuery("UPDATE $exptable SET $rpfield=REPLACE($rpfield,'$rpstring','$tostring') $condition"); + $rs = $dsql->ExecuteNoneQuery("UPDATE $exptable SET $rpfield=REPLACE($rpfield,'$rpstring','$tostring') $condition "); $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$exptable`"); if ($rs) { - ShowMsg(Lang("sys_data_replace_success"), "javascript:;"); + ShowMsg("成功完成数据替换", "javascript:;"); exit(); } else { - ShowMsg(Lang("sys_data_err_replace"), "javascript:;"); + ShowMsg("数据替换失败", "javascript:;"); exit(); } } else { @@ -67,24 +68,24 @@ else if ($action == 'apply') { $rpstring = stripslashes($rpstring); $rpstring2 = str_replace("\\", "\\\\", $rpstring); $rpstring2 = str_replace("'", "\\'", $rpstring2); - $dsql->SetQuery("SELECT $keyfield,$rpfield FROM $exptable WHERE $rpfield REGEXP '$rpstring2' $condition"); + $dsql->SetQuery("SELECT $keyfield,$rpfield FROM $exptable WHERE $rpfield REGEXP '$rpstring2' $condition "); $dsql->Execute(); $tt = $dsql->GetTotalRow(); if ($tt == 0) { - ShowMsg(Lang("sys_data_err_none"), "javascript:;"); + ShowMsg("根据您指定的正则，找不到任何东西", "javascript:;"); exit(); } $oo = 0; while ($row = $dsql->GetArray()) { $kid = $row[$keyfield]; $rpf = preg_replace("#".$rpstring."#i", $tostring, $row[$rpfield]); - $rs = $dsql->ExecuteNoneQuery("UPDATE $exptable SET $rpfield='$rpf' WHERE $keyfield='$kid'"); + $rs = $dsql->ExecuteNoneQuery("UPDATE $exptable SET $rpfield='$rpf' WHERE $keyfield='$kid' "); if ($rs) { $oo++; } } $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$exptable`"); - ShowMsg(Lang('sys_data_replace_success_rs',array('tt'=>$tt,'oo'=>$oo)), "javascript:;"); + ShowMsg("共找到 $tt 条记录，成功替换了 $oo 条", "javascript:;"); exit(); } } diff --git a/src/admin/sys_data_revert.php b/src/admin/sys_data_revert.php index 2f70e702..42a8ff61 100644 --- a/src/admin/sys_data_revert.php +++ b/src/admin/sys_data_revert.php @@ -6,16 +6,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); -} -UserLogin::CheckPurview('sys_Data'); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); + } +CheckPurview('sys_Data'); $bkdir = DEDEDATA."/".$cfg_backup_dir; $filelists = array(); $dh = dir($bkdir); -$structfile = Lang("sys_data_revert_no_structfile"); +$structfile = "没找到数据结构文件"; while (($filename = $dh->read()) !== false) { if (!preg_match("#txt$#", $filename)) { continue; diff --git a/src/admin/sys_group.php b/src/admin/sys_group.php index 2195e071..14373176 100644 --- a/src/admin/sys_group.php +++ b/src/admin/sys_group.php @@ -8,9 +8,8 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Group'); +CheckPurview('sys_Group'); if (empty($dopost)) $dopost = ""; include DedeInclude('templets/sys_group.htm'); ?> \ No newline at end of file diff --git a/src/admin/sys_group_add.php b/src/admin/sys_group_add.php index fac77ee4..ad70ba00 100644 --- a/src/admin/sys_group_add.php +++ b/src/admin/sys_group_add.php @@ -8,18 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -$dlang->extendLang('grouplist'); //加载用户权限语言包 -UserLogin::CheckPurview('sys_Group'); +CheckPurview('sys_Group'); if (!empty($dopost)) { $row = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE `rank`='".$rankid."'"); if (is_array($row)) { - ShowMsg(Lang('sys_group_add_err_noneresult'), '-1'); + ShowMsg('您所创建的组别的级别值已存在，不允许重复!', '-1'); exit(); } if ($rankid > 10) { - ShowMsg(Lang('sys_group_add_err_rank'), '-1'); + ShowMsg('组级别值不能大于10， 否则一切权限设置均无效!', '-1'); exit(); } $AllPurviews = ''; @@ -29,8 +27,8 @@ if (!empty($dopost)) { } $AllPurviews = trim($AllPurviews); } - $dsql->ExecuteNoneQuery("INSERT INTO `#@__admintype` (`rank`,typename,`system`,purviews) VALUES ('$rankid','$groupname',0,'$AllPurviews');"); - ShowMsg(Lang("sys_group_add_success"), "sys_group.php"); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__admintype` (`rank`,typename,`system`,purviews) VALUES ('$rankid','$groupname', 0, '$AllPurviews');"); + ShowMsg("成功创建一个新的用户组", "sys_group.php"); exit(); } include DedeInclude('templets/sys_group_add.htm'); diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php index 855bb4fe..a043fef5 100644 --- a/src/admin/sys_group_edit.php +++ b/src/admin/sys_group_edit.php @@ -8,13 +8,12 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Group'); +CheckPurview('sys_Group'); if (empty($dopost)) $dopost = ""; if ($dopost == 'save') { if ($rank == 10) { - ShowMsg(Lang('sys_group_edit_err_admin'), 'sys_group.php'); + ShowMsg('超级管理员的权限不允许修改!', 'sys_group.php'); exit(); } $purview = ""; @@ -25,15 +24,15 @@ if ($dopost == 'save') { $purview = trim($purview); } $dsql->ExecuteNoneQuery("UPDATE `#@__admintype` SET typename='$typename',purviews='$purview' WHERE CONCAT(`rank`)='$rank'"); - ShowMsg(Lang('sys_group_edit_success'), 'sys_group.php'); + ShowMsg('成功修改用户组的权限', 'sys_group.php'); exit(); } else if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__admintype` WHERE CONCAT(`rank`)='$rank' AND `system`='0';"); - ShowMsg(Lang("sys_group_delete_success!"), "sys_group.php"); + ShowMsg("成功删除一个用户组", "sys_group.php"); exit(); } $groupRanks = array(); -$groupSet = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE CONCAT(`rank`)='{$rank}'"); +$groupSet = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE CONCAT(`rank`)='{$rank}' "); $groupRanks = explode(' ', $groupSet['purviews']); include DedeInclude('templets/sys_group_edit.htm'); //检查是否已经有此权限 diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 4de24546..56585b23 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -8,24 +8,22 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Edit'); +CheckPurview('sys_Edit'); if (empty($dopost)) $dopost = ""; $configfile = DEDEDATA.'/config.cache.inc.php'; -$dlang->extendLang('config'); //加载配置语言包 //更新配置函数 function ReWriteConfig() { global $dsql, $configfile; if (!is_writeable($configfile)) { - echo Lang('config_file_nowriteable',array('file'=>$configfile)); + echo "配置文件{$configfile}不支持写入，无法修改系统配置参数"; exit(); } $fp = fopen($configfile, 'w'); flock($fp, 3); fwrite($fp, "<"."?php\r\n"); - $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC"); + $dsql->SetQuery("SELECT `varname`,`type`,`value`,`groupid` FROM `#@__sysconfig` ORDER BY aid ASC "); $dsql->Execute(); while ($row = $dsql->GetArray()) { if ($row['type'] == 'number') { @@ -52,42 +50,42 @@ if ($dopost == "save") { $v = $dsql->Esc($v); $k = $dsql->Esc($k); - $dsql->ExecuteNoneQuery("UPDATE `#@__sysconfig` SET `value`=$v WHERE varname=$k"); + $dsql->ExecuteNoneQuery("UPDATE `#@__sysconfig` SET `value`='$v' WHERE varname='$k' "); } ReWriteConfig(); - ShowMsg(Lang("sys_info_success_save"), "sys_info.php"); + ShowMsg("成功修改站点配置", "sys_info.php"); exit(); } //增加新变量 else if ($dopost == 'add') { CheckCSRF(); if ($vartype == 'bool' && ($nvarvalue != 'Y' && $nvarvalue != 'N')) { - ShowMsg(Lang("sys_info_err_bool"), "-1"); + ShowMsg("布尔变量值必须为'Y'或'N'!", "-1"); exit(); } if (trim($nvarname) == '' || preg_match("#[^a-z_]#i", $nvarname)) { - ShowMsg(Lang("sys_info_err_novarname_isempty"), "-1"); + ShowMsg("变量名不能为空并且必须为[a-z_]组成", "-1"); exit(); } - $row = $dsql->GetOne("SELECT varname FROM `#@__sysconfig` WHERE varname LIKE '$nvarname'"); + $row = $dsql->GetOne("SELECT varname FROM `#@__sysconfig` WHERE varname LIKE '$nvarname' "); if (is_array($row)) { - ShowMsg(Lang("sys_info_err_varname_exists"), "-1"); + ShowMsg("该变量名称已经存在", "-1"); exit(); } - $row = $dsql->GetOne("SELECT aid FROM `#@__sysconfig` ORDER BY aid DESC"); + $row = $dsql->GetOne("SELECT aid FROM `#@__sysconfig` ORDER BY aid DESC "); $aid = $row['aid'] + 1; $inquery = "INSERT INTO `#@__sysconfig` (`aid`,`varname`,`info`,`value`,`type`,`groupid`) VALUES ('$aid','$nvarname','$varmsg','$nvarvalue','$vartype','$vargroup')"; $rs = $dsql->ExecuteNoneQuery($inquery); if (!$rs) { - ShowMsg(Lang("sys_info_err_varname"), "sys_info.php?gp=$vargroup"); + ShowMsg("新增变量失败，可能有非法字符", "sys_info.php?gp=$vargroup"); exit(); } if (!is_writeable($configfile)) { - ShowMsg(Lang("sys_info_err_configfile",array('configfile'=>$configfile)), "sys_info.php?gp=$vargroup"); + ShowMsg("成功保存变量，但由于 $configfile 无法写入，因此不能更新配置文件", "sys_info.php?gp=$vargroup"); exit(); } else { ReWriteConfig(); - ShowMsg(Lang("sys_info_success"), "sys_info.php?gp=$vargroup"); + ShowMsg("成功保存变量并更新配置文件", "sys_info.php?gp=$vargroup"); exit(); } } @@ -95,25 +93,21 @@ else if ($dopost == 'add') { else if ($dopost == 'search') { $keywords = isset($keywords) ? strip_tags($keywords) : ''; $i = 1; - $config_varmsg = Lang('config_varmsg'); - $config_varvalue = Lang('config_varvalue'); - $config_varname = Lang('config_varname'); $configstr = <<
    - - - - + + + + EOT; echo $configstr; if ($keywords) { - $dsql->SetQuery("SELECT * FROM `#@__sysconfig` WHERE info LIKE '%$keywords%' OR varname LIKE '%$keywords%' ORDER BY aid ASC"); + $dsql->SetQuery("SELECT * FROM `#@__sysconfig` WHERE info LIKE '%$keywords%' OR varname LIKE '%$keywords%' order by aid asc"); $dsql->Execute(); while ($row = $dsql->GetArray()) { $bgcolor = ($i++ % 2 == 0) ? "#f8f8f8" : "#ffffff"; - $row['info'] = Lang($row['varname']); $row['info'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['info']); $row['varname'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['varname']); ?> @@ -125,8 +119,8 @@ EOT; $c1 = ''; $c2 = ''; $row['value'] == 'Y' ? $c1 = " checked" : $c2 = " checked"; - echo " "; - echo " "; + echo " "; + echo " "; } else if ($row['type'] == 'bstring') { echo ""; } else if ($row['type'] == 'number') { @@ -138,14 +132,16 @@ EOT; - +
    ".Lang('administrator')."".Lang('sys_admin_user_tj_docandclick')."".Lang('quarter')."".Lang('current_month')."".Lang('sys_admin_user_n7day')."".Lang('today')."
    管理员文档与点击季度当月近七天当天
    {$userid}
    {$config_varmsg}{$config_varvalue}{$config_varname}
    参数说明参数值变量名
    		'.Lang('config_none_result').'
    '; -} + } + if ($i == 1) { + echo '没有找到搜索的内容'; + } exit; } else if ($dopost == 'make_encode') { $chars = 'abcdefghigklmnopqrstuvwxwyABCDEFGHIGKLMNOPQRSTUVWXWY0123456789'; diff --git a/src/admin/sys_info_mark.php b/src/admin/sys_info_mark.php index 4244ae16..403fca38 100644 --- a/src/admin/sys_info_mark.php +++ b/src/admin/sys_info_mark.php @@ -8,12 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Edit'); -helper('image'); +CheckPurview('sys_Edit'); +require_once(DEDEINC."/image.func.php"); if ($cfg_photo_support == '') { - echo Lang('sys_info_mark_nogd'); + echo "您的系统没安装GD库，不允许使用本功能"; exit(); } $ImageWaterConfigFile = DEDEDATA."/mark/inc_photowatermark_config.php"; @@ -34,7 +33,7 @@ if ($action == "save") { if (is_uploaded_file($newimg)) { $imgfile_type = strtolower(trim($newimg_type)); if (!in_array($imgfile_type, $allow_mark_types)) { - ShowMsg(Lang("sys_info_mark_err_imgtype_0"), "-1"); + ShowMsg("上传的图片格式错误，请使用 gif、png格式的其中一种", "-1"); exit(); } if ($imgfile_type == 'image/xpng' || $imgfile_type == 'image/png') { @@ -42,27 +41,27 @@ if ($action == "save") { } else if ($imgfile_type == 'image/gif') { $shortname = ".gif"; } else { - ShowMsg(Lang("sys_info_mark_err_imgtype_1"), "-1"); + ShowMsg("水印图片仅支持gif、png格式的其中一种", "-1"); exit; } $photo_markimg = 'mark'.$shortname; $mime = get_mime_type($newimg); if (preg_match("#^unknow#", $mime)) { - ShowMsg(Lang("media_no_fileinfo"), -1); + ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); exit; } if (!preg_match("#^(image|video|audio|application)#i", $mime)) { - ShowMsg(Lang("media_only_media"), -1); + ShowMsg("仅支持媒体文件及应用程序上传", -1); exit; } @move_uploaded_file($newimg, DEDEDATA."/mark/".$photo_markimg); } $configstr .= "\$photo_markimg = '{$photo_markimg}';\r\n"; $configstr = "<"."?php\r\n".$configstr."?".">\r\n"; - $fp = fopen($ImageWaterConfigFile, "w") or die(Lang('sys_info_mark_err_write',array('ImageWaterConfigFile'=>$ImageWaterConfigFile))); + $fp = fopen($ImageWaterConfigFile, "w") or die("写入文件 $ImageWaterConfigFile 失败，请检查权限"); fwrite($fp, $configstr); fclose($fp); - echo "\r\n"; + echo "\r\n"; } require_once($ImageWaterConfigFile); include DedeInclude('templets/sys_info_mark.htm'); diff --git a/src/admin/sys_payment.php b/src/admin/sys_payment.php index 53ada98b..1abbf62c 100644 --- a/src/admin/sys_payment.php +++ b/src/admin/sys_payment.php @@ -8,13 +8,13 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); -UserLogin::CheckPurview('sys_Data'); +require_once(DEDEINC.'/datalistcp.class.php'); +CheckPurview('sys_Data'); $dopost = (empty($dopost)) ? '' : $dopost; $pid = (empty($pid)) ? 0 : intval($pid); -/*一个简单的[数组<->表单]解析类，数组结构应该为: +//一个简单的[数组<->表单]解析类 +/*数组结构应该为: array( [name]=>array( [title]=>'当前表单项的名称', @@ -23,6 +23,7 @@ $pid = (empty($pid)) ? 0 : intval($pid); [iterm]=>'1:使用标准双接口,使用担保交易接口', //如果含有":",则前面为value值,后面为显示内容 [value]=>'使用担保交易接口', ), + ) 使用方法: 将上述的格式传入到数组中去,然后进行解析: @@ -141,7 +142,11 @@ $tplstring = " if ($dopost == 'install') { $row = $dsql->GetOne("SELECT * FROM `#@__payment` WHERE id='$pid'"); if (is_array($row)) { - $config_row = AutoCharset(unserialize(utf82gb($row['config']))); + if ($cfg_soft_lang == 'utf-8') { + $config_row = AutoCharset(unserialize(utf82gb($row['config']))); + } else if ($cfg_soft_lang == 'gb2312') { + $config_row = unserialize($row['config']); + } //print_r($config_row);exit; $af = new Array2form($config_row); $af->SetDefaultTpl($tplstring); @@ -153,11 +158,15 @@ if ($dopost == 'install') { //配置支付接口 else if ($dopost == 'config') { if ($pay_name == "" || $pay_desc == "" || $pay_fee == "") { - ShowMsg(Lang("sys_payment_parms_empty"), "-1"); + ShowMsg("您有未填写的项目", "-1"); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__payment` WHERE id='$pid'"); - $config = AutoCharset(unserialize(utf82gb($row['config']))); + if ($cfg_soft_lang == 'utf-8') { + $config = AutoCharset(unserialize(utf82gb($row['config']))); + } else if ($cfg_soft_lang == 'gb2312') { + $config = unserialize($row['config']); + } $payments = "'code' => '".$row['code']."',"; foreach ($config as $key => $v) { $config[$key]['value'] = ${$key}; @@ -172,9 +181,13 @@ else if ($dopost == 'config') { fwrite($fp, $configstr); fclose($fp); } - $config = AutoCharset($config, 'utf-8', 'gb2312'); - $config = serialize($config); - $config = gb2utf8($config); + if ($cfg_soft_lang == 'utf-8') { + $config = AutoCharset($config, 'utf-8', 'gb2312'); + $config = serialize($config); + $config = gb2utf8($config); + } else { + $config = serialize($config); + } $query = "UPDATE `#@__payment` SET name = '$pay_name',fee='$pay_fee',description='$pay_desc',config='$config',enabled='1' WHERE id='$pid'"; $dsql->ExecuteNoneQuery($query); if ($pm == 'edit') $msg = "保存修改成功"; @@ -185,17 +198,25 @@ else if ($dopost == 'config') { //删除支付接口 else if ($dopost == 'uninstall') { $row = $dsql->GetOne("SELECT * FROM `#@__payment` WHERE id='$pid'"); - $config = AutoCharset(unserialize(utf82gb($row['config']))); + if ($cfg_soft_lang == 'utf-8') { + $config = AutoCharset(unserialize(utf82gb($row['config']))); + } else if ($cfg_soft_lang == 'gb2312') { + $config = unserialize($row['config']); + } foreach ($config as $key => $v) $config[$key]['value'] = ""; - $config = AutoCharset($config, 'utf-8', 'gb2312'); - $config = serialize($config); - $config = gb2utf8($config); + if ($cfg_soft_lang == 'utf-8') { + $config = AutoCharset($config, 'utf-8', 'gb2312'); + $config = serialize($config); + $config = gb2utf8($config); + } else { + $config = serialize($config); + } $query = "UPDATE `#@__payment` SET fee='',config='$config',enabled='0' WHERE id='$pid'"; $dsql->ExecuteNoneQuery($query); //同时需要删除对应的缓存 $m_file = DEDEDATA."/payment/".$row['code'].".php"; @unlink($m_file); - ShowMsg(Lang("member_success_edituser_del"), "sys_payment.php"); + ShowMsg("删除成功", "sys_payment.php"); exit(); } $sql = "SELECT * FROM `#@__payment` ORDER BY `rank` ASC"; diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 51eec6e2..611ecd2d 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -8,36 +8,75 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeWin; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_ArcBatch'); +CheckPurview('sys_ArcBatch'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); if (empty($dopost)) { - $wecome_info = "".Lang('admin_home')." > ". Lang("sys_repair"); - $msg = Lang("sys_repair_msg"); - DedeWin::Instance()->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ") - ->AddTitle(Lang('sys_repair_title'))->AddMsgItem("
    $msg
    ") - ->GetWindow('hand', '')->Display(); + $win = new OxWindow(); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); + $win->mainTitle = "系统修复工具"; + $wecome_info = "系统主页 > 系统错误修复工具"; + $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); + $msg = " + + + + +
    + 由于手动升级时用户没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，可能会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：
    + 1、修复/优化数据表；
    + 2、更新系统缓存；
    + 3、检测系统变量一致性
    + 4、检测微表与主表数据一致性
    +
    常规检测 +
    + "; + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('hand', ''); + $win->Display(); exit(); } -//数据结构常规检测 +/*------------------- +数据结构常规检测 +function 1_test_db() { } +--------------------*/ else if ($dopost == 1) { - $wecome_info = "".Lang("sys_repair")." > ".Lang('sys_repair_test_db'); - $msg = Lang("sys_repair_test_db_msg"); - DedeWin::Instance()->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ") - ->AddTitle(Lang('sys_repair_test_db_title'))->AddMsgItem("
    $msg
    ") - ->GetWindow('hand', '')->Display(); + $win = new OxWindow(); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); + $win->mainTitle = "系统修复工具"; + $wecome_info = "系统错误修复工具 > 检测数据结构"; + $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); + $msg = " + + + + +
    + 已完成数据结构完整性检测 + 如果您系统有下面几种问题之一，请检测微表正确性：
    + 1、无法获得主键，因此无法进行后续操作
    + 2、更新数据库archives表时出错
    + 3、列表显示数据目与实际文档数不一致
    +
    检测数据 +
    + "; + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('hand', ''); + $win->Display(); exit(); } -//检测微表正确性并尝试修复 +/*------------------- +检测微表正确性并尝试修复 +function 2_test_arctiny() { } +--------------------*/ else if ($dopost == 2) { $msg = ''; $allarcnum = 0; - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives`"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives` "); $allarcnum = $arcnum = $row['dd']; - $msg .= "#@__archives ".Lang('sys_repair_test_arctiny_tt')."：{$arcnum}
    "; + $msg .= "#@__archives 表总记录数：{$arcnum}
    "; $shtables = array(); - $dsql->Execute('me', "SELECT addtable FROM `#@__channeltype` WHERE id < -1"); + $dsql->Execute('me', "SELECT addtable FROM `#@__channeltype` WHERE id < -1 "); while ($row = $dsql->GetArray('me')) { $addtable = strtolower(trim(str_replace('#@__', $cfg_dbprefix, $row['addtable']))); if (empty($addtable)) { @@ -45,77 +84,82 @@ else if ($dopost == 2) { } else { if (!isset($shtables[$addtable])) { $shtables[$addtable] = 1; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable`"); - $msg .= "{$addtable} ".Lang('sys_repair_test_arctiny_tt')."：{$row['dd']}
    "; + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable` "); + $msg .= "{$addtable} 表总记录数：{$row['dd']}
    "; $allarcnum += $row['dd']; } } } - $msg .= Lang('sys_repair_test_arctiny_tt2')."：{$allarcnum}
    "; - $errall = "".Lang('sys_repair_test_arctiny_ok').""; - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`"); - $msg .= Lang('sys_repair_test_arctiny_tt3')."：{$row['dd']}
    "; + $msg .= "总有效记录数：{$allarcnum}
    "; + $errall = "完成修正"; + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); + $msg .= "微统计表记录数：{$row['dd']}
    "; if ($row['dd'] == $allarcnum) { - $msg .= "".Lang('sys_repair_test_arctiny_same')."
    "; + $msg .= "两者记录一致，无需修正
    "; } else { $sql = "TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); - $msg .= "".Lang('sys_repair_test_arctiny_diff')."
    "; + $msg .= "两者记录不一致，尝试进行简单修正
    "; //导入普通模型微数据 - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) - SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; + $sql = "INSERT INTO `#@__arctiny` (id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid) SELECT id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid FROM `#@__archives` "; $dsql->ExecuteNoneQuery($sql); //导入单表模型微数据 foreach ($shtables as $tb => $v) { - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT aid, typeid, 0, arcrank, channel, senddate, 0, mid FROM `$tb`"; + $sql = "INSERT INTO `#@__arctiny` (id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid) SELECT aid,typeid,0,arcrank,channel,senddate,0,mid FROM `$tb` "; $rs = $dsql->ExecuteNoneQuery($sql); $doarray[$tb] = 1; } - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`"); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); if ($row['dd'] == $allarcnum) { - $msg .= "".Lang('sys_repair_test_arctiny_same2')."
    "; + $msg .= "修正记录成功
    "; } else { - $msg .= "".Lang('sys_repair_test_err_arctiny')."
    "; - $errall = "".Lang('sys_repair_test_check')." "; + $msg .= "修正记录失败，建议进行高级综合检测
    "; + $errall = "结合性检测 "; } } UpDateCatCache(); - $wecome_info = "".Lang("sys_repair")." > ".Lang('sys_repair_test_check_title'); + $win = new OxWindow(); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); + $win->mainTitle = "系统修复工具"; + $wecome_info = "系统错误修复工具 > 检测微表正确性"; + $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = " - - - -
    - {$msg} -
    - {$errall} -
    + + + {$msg}
    + {$errall} + + + "; - DedeWin::Instance()->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ") - ->AddTitle(Lang('sys_repair_test_check_title2'))->AddMsgItem("
    $msg
    ") - ->GetWindow('hand', '')->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('hand', ''); + $win->Display(); exit(); } -//高级方式修复微表，会删除不合法主键的内容 +/*------------------- +高级方式修复微表，会删除不合法主键的内容 +function 3_re_arctiny() { } +--------------------*/ else if ($dopost == 3) { $errnum = 0; $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); - $sql = "SELECT arc.id, arc.typeid, arc.typeid2, arc.arcrank, arc.channel, arc.senddate, arc.sortrank, arc.mid, ch.addtable FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel"; + $sql = "SELECT arc.id, arc.typeid, arc.typeid2,arc.arcrank,arc.channel,arc.senddate,arc.sortrank,arc.mid, ch.addtable FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel "; $dsql->Execute('me', $sql); while ($row = $dsql->GetArray('me')) { - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) VALUES ('{$row['id']}','{$row['typeid']}','{$row['typeid2']}','{$row['arcrank']}', '{$row['channel']}','{$row['senddate']}','{$row['sortrank']}','{$row['mid']}'); "; + $sql = "INSERT INTO `#@__arctiny`(id,typeid, typeid2,arcrank,channel,senddate,sortrank,mid) VALUES ('{$row['id']}','{$row['typeid']}','{$row['typeid2']}','{$row['arcrank']}','{$row['channel']}','{$row['senddate']}','{$row['sortrank']}','{$row['mid']}'); "; $rs = $dsql->ExecuteNoneQuery($sql); if (!$rs) { $addtable = trim($addtable); $errnum++; - $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='{$row['id']}'"); - if (!empty($addtable)) $dsql->ExecuteNoneQuery("DELETE FROM `$addtable` WHERE id='{$row['id']}'"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='{$row['id']}' "); + if (!empty($addtable)) $dsql->ExecuteNoneQuery("DELETE FROM `$addtable` WHERE id='{$row['id']}' "); } } //导入单表模型微数据 - $dsql->SetQuery("SELECT id,addtable FROM `#@__channeltype` WHERE id < -1"); + $dsql->SetQuery("SELECT id,addtable FROM `#@__channeltype` WHERE id < -1 "); $dsql->Execute(); $doarray = array(); while ($row = $dsql->GetArray()) { @@ -123,22 +167,29 @@ else if ($dopost == 3) { if (empty($tb) || isset($doarray[$tb])) { continue; } else { - $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT aid, typeid, 0, arcrank, channel, senddate, 0, mid FROM `$tb`"; + $sql = "INSERT INTO `#@__arctiny`(id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid) SELECT aid,typeid,0,arcrank,channel,senddate,0,mid FROM `$tb` "; $rs = $dsql->ExecuteNoneQuery($sql); $doarray[$tb] = 1; } } - $wecome_info = "".Lang("sys_repair")." > ".Lang('sys_repair_test_retiny'); + $win = new OxWindow(); + $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $win->mainTitle = "系统修复工具"; + $wecome_info = "系统错误修复工具 > 高级综合检测修复"; + $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = " - - - + + +
    ".Lang('sys_repair_test_retiny_success',array('errnum'=>$errnum))."
    ".Lang('sys_repair_test_arctiny_ok')."
    + 完成所有修复操作，移除错误记录{$errnum}条
    +
    完成修正 +
    "; - DedeWin::Instance()->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'") - ->AddTitle(Lang('sys_repair_test_retiny_title'))->AddMsgItem("
    $msg
    ") - ->GetWindow('hand', '')->Display(); + $win->AddMsgItem("
    $msg
    "); + $winform = $win->GetWindow('hand', ''); + $win->Display(); exit(); } ?> \ No newline at end of file diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index f0abbb93..764afbab 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -8,12 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DedeHttpDown; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_Edit'); +require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); +CheckPurview('sys_Edit'); if (empty($action)) $action = ''; -if (empty($message)) $message = Lang('sys_safetest_no_testing'); +if (empty($message)) $message = '尚未进行检测……'; if (empty($filetype)) $filetype = 'php|inc'; if (empty($info)) $info = 'eval|cmd|system|exec|_GET|_POST|_REQUEST|base64_decode'; $fileHashURL = "https://cdn.dedebiz.com/release/{$cfg_version_detail}.json"; @@ -26,7 +25,7 @@ foreach ($filelist as $key => $ff) { } $alter = ""; if (count($offFiles) == 0) { - $alter = DedeAlert(Lang('sys_safetest_offical'), ALERT_DANGER); + $alter = DedeAlert('无法同官方网站文件服务器通信，校验时候无法保证本地文件是否同官方服务器文件是否一致', ALERT_DANGER); } function TestOneFile($f) { @@ -49,10 +48,10 @@ function TestOneFile($f) return 0; } $message .= "
    -
    ".Lang('sys_safetest_trfile')."：{$trfile}
    - ".Lang('sys_safetest_viewdiff')." - ".Lang('delete')." - ".Lang('sys_safetest_edit')." +
    可疑文件：{$trfile}
    + 修改记录 + 删除 + 查看源码
    \r\n"; return 1; } @@ -77,13 +76,13 @@ if ($action == 'test') { $message = ''; AjaxHead(); TestSafe(DEDEROOT); - if ($message == '') $message = "".Lang('sys_safetest_notrfile').""; + if ($message == '') $message = "没发现可疑文件"; echo $message; exit(); } else if ($action == 'viewdiff') { $filename = isset($filename) ? $filename : ""; if (empty($filename)) { - ShowMsg(Lang("sys_safetest_no_file"), "-1"); + ShowMsg("没有选择对应的文件", "-1"); exit; } $baseFile = "https://cdn.dedebiz.com/release/{$cfg_version_detail}$filename"; @@ -114,7 +113,7 @@ else if ($action == 'clear') { @unlink($d.'/'.$filename); } } - $message = "".Lang('sys_safetest_clearcache').""; + $message = "成功清空模板缓存"; echo $message; exit(); } diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index aeb17b5a..7a0b64f6 100644 --- a/src/admin/sys_sql_query.php +++ b/src/admin/sys_sql_query.php @@ -8,26 +8,21 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -if ($cfg_dbtype == 'pgsql') { - showMsg( Lang('sys_data_pgsql_tip',array('cfg_dbname'=>$cfg_dbname)), 'javascript:;'); - exit(); -} -UserLogin::CheckPurview('sys_Data'); +CheckPurview('sys_Data'); if (empty($dopost)) $dopost = ""; //查看表结构 if ($dopost == "viewinfo") { CheckCSRF(); if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { $dsql->SetQuery("SHOW CREATE TABLE ".$dsql->dbName.".".$tablename); $dsql->Execute('me'); - $row2 = $dsql->GetArray('me', PDO::FETCH_BOTH); + $row2 = $dsql->GetArray('me', MYSQL_BOTH); $ctinfo = $row2[1]; echo "".trim($ctinfo).""; } @@ -37,11 +32,11 @@ if ($dopost == "viewinfo") { else if ($dopost == "opimize") { CheckCSRF(); if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { - $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`"); - if ($rs) echo Lang('sys_data_opimize_ok',array('tablename'=>$tablename)); - else echo Lang('sys_data_opimize_err',array('tablename'=>$tablename,'err'=>$dsql->GetError())); + $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` "); + if ($rs) echo "执行优化表：$tablename OK"; + else echo "执行优化表：$tablename 失败，原因是：".$dsql->GetError(); } exit(); } @@ -50,12 +45,12 @@ else if ($dopost == "opimizeAll") { CheckCSRF(); $dsql->SetQuery("SHOW TABLES"); $dsql->Execute('t'); - while ($row = $dsql->GetArray('t', PDO::FETCH_BOTH)) { - $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `{$row[0]}`"); + while ($row = $dsql->GetArray('t', MYSQL_BOTH)) { + $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `{$row[0]}` "); if ($rs) { - echo Lang('sys_data_opimize_ok',array('tablename'=>$row[0]))."
    \r\n"; + echo "优化表: {$row[0]} ok!
    \r\n"; } else { - echo Lang('sys_data_opimize_err',array('tablename'=>$row[0],'err'=>$dsql->GetError()))."
    \r\n"; + echo "优化表: {$row[0]} 失败! 原因是: ".$dsql->GetError()."
    \r\n"; } } exit(); @@ -64,11 +59,11 @@ else if ($dopost == "opimizeAll") { else if ($dopost == "repair") { CheckCSRF(); if (empty($tablename)) { - echo Lang("sys_data_err_table"); + echo "没有指定表名"; } else { - $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename`"); - if ($rs) echo Lang('sys_data_repair_ok',array('tablename'=>$tablename)); - else echo Lang('sys_data_repair_err',array('tablename'=>$tablename,'err'=>$dsql->GetError())); + $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` "); + if ($rs) echo "修复表：$tablename OK"; + else echo "修复表：$tablename 失败，原因是：".$dsql->GetError(); } exit(); } @@ -77,12 +72,12 @@ else if ($dopost == "repairAll") { CheckCSRF(); $dsql->SetQuery("Show Tables"); $dsql->Execute('t'); - while ($row = $dsql->GetArray('t', PDO::FETCH_BOTH)) { - $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `{$row[0]}`"); + while ($row = $dsql->GetArray('t', MYSQL_BOTH)) { + $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `{$row[0]}` "); if ($rs) { - echo Lang('sys_data_repair_ok',array('tablename'=>$row[0]))."
    \r\n"; + echo "修复表: {$row[0]} ok!
    \r\n"; } else { - echo Lang('sys_data_repair_err',array('tablename'=>$row[0],'err'=>$dsql->GetError()))."
    \r\n"; + echo "修复表: {$row[0]} 失败，原因是: ".$dsql->GetError()."
    \r\n"; } } exit(); @@ -92,7 +87,7 @@ else if ($dopost == "query") { CheckCSRF(); $sqlquery = trim(stripslashes($sqlquery)); if (preg_match("#drop(.*)table#i", $sqlquery) || preg_match("#drop(.*)database#", $sqlquery)) { - echo Lang("sys_sql_query_err_drop"); + echo "删除数据表或数据库的语句不允许在这里执行"; exit(); } //运行查询语句 @@ -100,9 +95,9 @@ else if ($dopost == "query") { $dsql->SetQuery($sqlquery); $dsql->Execute(); if ($dsql->GetTotalRow() <= 0) { - echo Lang("sys_sql_query_success_none",array('sqlquery'=>$sqlquery)); + echo "运行SQL：{$sqlquery}，无返回记录"; } else { - echo Lang('sys_sql_query_success_num',array('sqlquery'=>$sqlquery,'num'=>$dsql->GetTotalRow())); + echo "运行SQL：{$sqlquery}，共有".$dsql->GetTotalRow()."条记录，最大返回100条"; } $j = 0; while ($row = $dsql->GetArray()) { @@ -111,7 +106,7 @@ else if ($dopost == "query") { break; } echo "
    "; - echo Lang('record')."：$j"; + echo "记录：$j"; echo "
    "; foreach ($row as $k => $v) { echo "{$k}：{$v}
    \r\n"; @@ -135,15 +130,15 @@ else if ($dopost == "query") { if ($errCode == "") { $i++; } else { - $nerrCode .= Lang('query')."：$q ".Lang('sys_sql_query_err_info')."：".$errCode."
    "; + $nerrCode .= "执行：$q 出错，错误提示：".$errCode."
    "; } } - echo Lang('sys_sql_query_success_query',array('i'=>$i)); + echo "成功执行{$i}个SQL语句

    "; echo $nerrCode; } else { $dsql->ExecuteNoneQuery($sqlquery); $nerrCode = trim($dsql->GetError()); - echo Lang('sys_sql_query_success_query',array('i'=>1)); + echo "成功执行1个SQL语句

    "; echo $nerrCode; } exit(); diff --git a/src/admin/tag_test.php b/src/admin/tag_test.php index 5ffb7867..df6b825a 100644 --- a/src/admin/tag_test.php +++ b/src/admin/tag_test.php @@ -8,11 +8,11 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Other'); +CheckPurview('temp_Other'); +require_once(DEDEINC."/typelink/typelink.class.php"); include DedeInclude('templets/tag_test.htm'); ?> \ No newline at end of file diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index 5fb89af2..1b143747 100644 --- a/src/admin/tag_test_action.php +++ b/src/admin/tag_test_action.php @@ -8,16 +8,15 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\PartView; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__)."/config.php"); if (DEDEBIZ_SAFE_MODE) { - die(DedeAlert(Lang("err_safemode_check"),ALERT_DANGER)); + die(DedeAlert("系统已启用安全模式，无法使用当前功能",ALERT_DANGER)); } -UserLogin::CheckPurview('temp_Test'); +CheckPurview('temp_Test'); +require_once(DEDEINC."/archive/partview.class.php"); CheckCSRF(); if (empty($partcode)) { - ShowMsg(Lang('tag_test_err_submit'), 'javascript:;'); + ShowMsg('错误请求', 'javascript:;'); exit; } $partcode = stripslashes($partcode); @@ -27,9 +26,9 @@ if ($typeid > 0) $pv = new PartView($typeid); else $pv = new PartView(); $pv->SetTemplet($partcode, "string"); if ($showsource == "" || $showsource == "yes") { - echo Lang('tag_test_tcode').":"; + echo "模板代码:"; echo "
    ".dede_htmlspecialchars($partcode)."
    "; - echo Lang('result').":
    "; + echo "结果:
    "; } $pv->Display(); ?> \ No newline at end of file diff --git a/src/admin/tags_main.php b/src/admin/tags_main.php index 4088865c..f79d301d 100644 --- a/src/admin/tags_main.php +++ b/src/admin/tags_main.php @@ -8,10 +8,9 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\libraries\DataListCP; -use DedeBIZ\Login\UserLogin; require_once(dirname(__FILE__).'/config.php'); -UserLogin::CheckPurview('sys_Keyword'); +CheckPurview('sys_Keyword'); +require_once(DEDEINC.'/datalistcp.class.php'); $timestamp = time(); if (empty($tag)) $tag = ''; if (empty($action)) { @@ -32,34 +31,40 @@ if (empty($action)) { $dlist->Display(); exit(); } +/* +function update() +*/ else if ($action == 'update') { $tid = (empty($tid) ? 0 : intval($tid)); $count = (empty($count) ? 0 : intval($count)); if (empty($tid)) { - ShowMsg(Lang('tags_err_update'), '-1'); + ShowMsg('没有选择要删除的tag', '-1'); exit(); } - $query = "UPDATE `#@__tagindex` SET `count`='$count' WHERE id='$tid'"; + $query = "UPDATE `#@__tagindex` SET `count`='$count' WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang("tags_success_update"), 'tags_main.php'); + ShowMsg("成功保存标签的点击信息", 'tags_main.php'); exit(); } +/* +function delete() +*/ else if ($action == 'delete') { if (@is_array($ids)) { $stringids = implode(',', $ids); } else if (!empty($ids)) { $stringids = $ids; } else { - ShowMsg(Lang('tags_err_delete'), '-1'); + ShowMsg('没有选择要删除的tag', '-1'); exit(); } $query = "DELETE FROM `#@__tagindex` WHERE id IN ($stringids)"; if ($dsql->ExecuteNoneQuery($query)) { $query = "DELETE FROM `#@__taglist` WHERE tid IN ($stringids)"; $dsql->ExecuteNoneQuery($query); - ShowMsg(Lang('tags_delete_success',array('stringids'=>$stringids)), 'tags_main.php'); + ShowMsg("删除tags [$stringids] 成功", 'tags_main.php'); } else { - ShowMsg(Lang('tags_delete_failed',array('stringids'=>$stringids)), 'tags_main.php'); + ShowMsg("删除tags [$stringids] 失败", 'tags_main.php'); } exit(); } else if ($action == 'get_one') { @@ -76,6 +81,9 @@ else if ($action == 'delete') { $dsql->ExecuteNoneQuery("UPDATE `#@__tagindex` SET title='{$title}',keywords='{$kw}',`description`='{$des}',`uptime`='{$now}' WHERE id = {$tid}"); echo json_encode(array('code' => 200, 'result' => true)); } +/* +function fetch() +*/ else if ($action == 'fetch') { $wheresql = ''; $start = isset($start) && is_numeric($start) ? $start : 0; @@ -118,11 +126,11 @@ else if ($action == 'fetch') { $trow = $dsql->GetOne("SELECT COUNT(*) as dd FROM `#@__taglist` WHERE tag LIKE '$keyword'"); if (intval($trow['dd']) != $row['total']) { - $query = "UPDATE `#@__tagindex` SET `total`=".$trow['dd'].",uptime=$now WHERE id='$tid'"; + $query = "UPDATE `#@__tagindex` SET `total`=".$trow['dd'].",uptime=$now WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } } else { - $query = " INSERT INTO `#@__tagindex` (`tag`,`count`,`total`,`weekcc`,`monthcc`,`weekup`,`monthup`,`addtime`,`uptime`) VALUES ('$keyword','0','1','0','0','$timestamp','$timestamp','$timestamp','$now');"; + $query = "INSERT INTO `#@__tagindex` (`tag`,`count`,`total`,`weekcc`,`monthcc`,`weekup`,`monthup`,`addtime`,`uptime`) VALUES ('$keyword','0','1','0','0','$timestamp','$timestamp','$timestamp','$now');"; $dsql->ExecuteNoneQuery($query); $tid = $dsql->GetLastID(); } @@ -133,12 +141,12 @@ else if ($action == 'fetch') { $complete = FALSE; } if ($complete) { - ShowMsg(Lang("tags_success_get"), 'tags_main.php'); + ShowMsg("tags获取完成", 'tags_main.php'); exit(); } $start = $start + 100; $goto = "tags_main.php?action=fetch&startaid=$startaid&endaid=$endaid&start=$start"; - ShowMsg(Lang('tags_success_get_continue'), $goto, 0, 500); + ShowMsg('继续获取tags ', $goto, 0, 500); exit(); } ?> \ No newline at end of file diff --git a/src/admin/task_do.php b/src/admin/task_do.php index 6329c07d..efc45999 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -8,15 +8,16 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -use DedeBIZ\Archive\Archives; -use DedeBIZ\Archive\ListView; -use DedeBIZ\Archive\PartView; -use DedeBIZ\Archive\SgListView; require(dirname(__FILE__).'/config.php'); $dopost = (!isset($dopost) ? '' : $dopost); -/* -返回到下一任务的URL特殊变量，除非知道作用，否则不能在任务传递中占用f临时，仅为了方便网址结构dopost当前任务（指向下一个任务），由用户自行处理或在nextdo中自动获得del上一次任务删除的变量morejob，设定后，表示当前任务需请求多次，会把dopost和nextdo处理后转为doposttmp,nextdotmp然后由用户自行处理 -*/ +/****************************** +返回到下一任务的URL +特殊变量，除非知道作用，否则不能在任务传递中占用 +f 临时，仅为了方便网址结构 +dopost 当前任务(指向下一个任务)， 由用户自行处理或在 nextdo 中自动获得 +del 上一次任务删除的变量 +morejob ，设定后，表示当前任务需请求多次，会把 dopost 和 nextdo 处理后转为 doposttmp, nextdotmp，然后由用户自行处理 + ******************************/ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) { $reurl = "task_do.php?f=0"; @@ -46,8 +47,12 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) } return $reurl; } +/****************************** //更新上一篇和下一篇 +function makeprenext() { } + ******************************/ if ($dopost == 'makeprenext') { + require_once(DEDEINC.'/archive/archives.class.php'); $aid = intval($aid); $preRow = $dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id<$aid AND arcrank>-1 AND typeid='$typeid' ORDER BY id DESC"); $nextRow = $dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id>$aid AND arcrank>-1 AND typeid='$typeid' ORDER BY id ASC"); @@ -62,16 +67,20 @@ if ($dopost == 'makeprenext') { $arc->MakeHtml(); } if (empty($nextdo)) { - ShowMsg(Lang("makehtml_makeprenext"), "close::tgtable"); + ShowMsg("完成上下篇文档更新任务完成所有更新任务", "close::tgtable"); exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg(Lang("makehtml_makeprenext_continue"), $jumpurl, 0, 500); + ShowMsg("完成下篇文档更新任务 继续执行其它任务", $jumpurl, 0, 500); exit(); } } +/****************************** //更新主页的任务 +function makeindex() { } + ******************************/ if ($dopost == 'makeindex') { + require_once(DEDEINC.'/archive/partview.class.php'); $envs = $_sys_globals = array(); $envs['aid'] = 0; $pv = new PartView(); @@ -79,35 +88,39 @@ if ($dopost == 'makeindex') { $templet = str_replace("{style}", $cfg_df_style, $row['templet']); $homeFile = dirname(__FILE__).'/'.$row['position']; $homeFile = str_replace("//", "/", str_replace("\\", "/", $homeFile)); - $fp = fopen($homeFile, 'w') or die(Lang('makehtml_err_index',array('file'=>$homeFile))); + $fp = fopen($homeFile, 'w') or die("无法更新网站主页到：$homeFile 位置"); fclose($fp); $tpl = $cfg_basedir.$cfg_templets_dir.'/'.$templet; if (!file_exists($tpl)) { $tpl = $cfg_basedir.$cfg_templets_dir.'/default/index.htm'; - if (!file_exists($tpl)) exit( Lang('makehtml_err_notpl',array('tpl'=>$tpl))); + if (!file_exists($tpl)) exit("无法找到主页模板：$tpl "); } $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($tpl); $pv->SaveToHtml($homeFile); $pv->Close(); if (empty($nextdo)) { - ShowMsg(Lang("makehtml_success_index"), "close::tgtable"); + ShowMsg("完成主页更新任务完成所有更新任务", "close::tgtable"); exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg(Lang("makehtml_success_index_continue"), $jumpurl, 0, 500); + ShowMsg("完成主页更新 现在跳转到其它更新任务", $jumpurl, 0, 500); exit(); } } +/****************************** //更新所有关连的栏目 +function makeparenttype() { } +******************************/ else if ($dopost == 'makeparenttype') { require_once(DEDEDATA."/cache/inc_catalog_base.inc"); + require_once(DEDEINC.'/archive/listview.class.php'); $notallowArr = array('dopost', 'f', 'del', 'curpage', 'morejob'); $jumpurl = GetNextUrl($notallowArr); if (empty($typeid)) { - ShowMsg(Lang("makehtml_makeparenttype"), "close::tgtable"); + ShowMsg("完成栏目更新任务完成所有更新任务", "close::tgtable"); exit(); } $topids = explode(',', GetTopids($typeid)); @@ -115,30 +128,33 @@ else if ($dopost == 'makeparenttype') { $tid = $topids[$curpage]; if (isset($cfg_Cs[$tid]) && $cfg_Cs[$tid][1] > 0) { + require_once(DEDEINC."/archive/listview.class.php"); $lv = new ListView($tid); $lv->CountRecord(); $lv->MakeHtml(); $lv->Close(); } else { + require_once(DEDEINC."/archive/sglistview.class.php"); $lv = new SgListView($tid); $lv->CountRecord(); $lv->MakeHtml(); $lv->Close(); } + if ($curpage >= count($topids) - 1) { if (!empty($doposttmp)) { $jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl); $jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}"; - ShowMsg(Lang("makehtml_success_makeparenttype",array('tid'=>$tid)), $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid} 更新
    完成栏目更新任务，继续执行后续任务", $jumpurl, 0, 500); exit(); } else { - ShowMsg(Lang("makehtml_success_makeparenttype",array('tid'=>$tid)), "close::tgtable"); + ShowMsg("完成栏目:{$tid} 更新
    完成栏目更新任务，完成所有更新任务", "close::tgtable"); exit(); } } else { $curpage++; $jumpurl .= "&curpage={$curpage}&dopost=makeparenttype"; - ShowMsg(Lang("makehtml_success_makeparenttype_continue",array('tid'=>$tid)), $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid} 更新，继续更新其它栏目", $jumpurl, 0, 500); exit(); } } diff --git a/src/admin/templets/_widget_lang.htm b/src/admin/templets/_widget_lang.htm deleted file mode 100644 index 5ff808fb..00000000 --- a/src/admin/templets/_widget_lang.htm +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 5ae490ff..5af0454a 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -1,43 +1,43 @@ - - - - <?php echo Lang('action_search');?> - - - - - - - - - - - - - - - -
    >
    ""
    - - - - - - - - -
    =>
    - - - - - - -

    -
    - -
    - + + + + 搜索结果 + + + + + + + + + + + + + + + +
    当前位置 > 搜索结果
    ""的搜索结果
    + + + + + + + + +
    =>
    + + + + + + +

    +
    + +
    + \ No newline at end of file diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 1e0963e1..da15a7b8 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -1,20 +1,21 @@ - + - <?php echo Lang('ad_add');?> + 增加广告 - + + - - +
    - + - + - - + + - + - + - + - + - + - + - + - +
    > 广告管理 > 增加广告位置
    @@ -86,61 +64,61 @@
    广告代码的调用方法：{dede:myad name='广告位标识'/}
    ：广告位标识：（使用英文或数字表示的简洁标识）
    ：广告分类：
    ：广告投放范围： GetOptionArray(0,0,0); echo ""; - ?> + ?>（如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）
    ：广告位名称：
    ：时间限制： - - + +
    ：投放时间： - ： - ： + 从： + 到：
    ：广告内容：
      -
      • -
      • -
      • -
      • +
    • 代码
      • +
    • 文字
      • +
    • 图片
      • +
    • Flash
    @@ -149,24 +127,24 @@
    ：过期显示内容：
    -