diff --git a/src/dede/inc/grouplist.txt b/src/dede/inc/grouplist.txt
index 39e2b67a..afaa9bc4 100755
--- a/src/dede/inc/grouplist.txt
+++ b/src/dede/inc/grouplist.txt
@@ -17,7 +17,7 @@
>t_New>新建任意栏目
>t_Edit>修改任意栏目
>t_Move>移动任意栏目
->t_Del>删除任意栏目[br]
+>t_Del>删除任意栏目
>t_AccList>列出授权栏目
>t_AccNew>新建授权子栏目
>t_AccEdit>修改授权子栏目
@@ -30,12 +30,12 @@
>a_Edit>修改任意文档
>a_Del>删除任意文档
>a_Commend>推荐任意文档
->a_Check>审核任意文档[br]
+>a_Check>审核任意文档
>a_AccNew>发布授权文档
>a_AccList>列出授权文档
>a_AccEdit>修改授权文档
>a_AccDel>删除授权文档
->a_AccCheck>审核授权文档[br]
+>a_AccCheck>审核授权文档
>a_MyList>列出我发布的文档
>a_MyEdit>修改我发布的文档
>a_MyDel>删除我发布的文档
@@ -48,7 +48,7 @@
>co_Switch>导入外部数据
>co_AddNote>增加采集节点
>co_EditNote>修改采集节点
->co_PlayNote>采集数据[br]
+>co_PlayNote>采集数据
>co_ListNote>列出采集节点
>co_ViewNote>管理已下载内容
>co_Export>采集内容入库
@@ -78,18 +78,18 @@
>sys_Group>系统组管理
>sys_MdPwd>更改个人密码
>sys_DelUpload>删除附件
->sys_Task>计划任务管理[br]
+>sys_Task>计划任务管理
>sys_Edit>修改系统参数
>sys_Log>管理日志
>sys_plus>插件管理
->sys_Data>数据备份还原[br]
+>sys_Data>数据备份还原
>sys_Att>自定义文档属性
>sys_ArcBatch>文档批量维护
->sys_ArcTj>文档信息统计[br]
+>sys_ArcTj>文档信息统计
>sys_Source>新闻来源
>sys_Writer>作者管理
>sys_SoftConfig>软件频道参数
->sys_Keyword>关键字管理[br]
+>sys_Keyword>关键字管理
>sys_MakeHtml>更新HTML
>sys_Feedback>评论管理
>sys_Upload>管理任意上传
diff --git a/src/dede/inc/inc_action_info.php b/src/dede/inc/inc_action_info.php
index c1e20c5a..11a5376f 100755
--- a/src/dede/inc/inc_action_info.php
+++ b/src/dede/inc/inc_action_info.php
@@ -201,12 +201,6 @@ $actionSearch[5] = array(
'purview' =>'member_Type',
'linkurl' =>'member_scores.php'
),
- 3 => array(
- 'title' =>'会员模型管理',
- 'description' =>'为会员制定不同的会员分类,默认有个人,企业两种用户类型,并且同时可以为用户模型添加不同的字段',
- 'purview' =>'member_Type',
- 'linkurl' =>'member_model_main.php'
- ),
4 => array(
'title' =>'会员短信管理',
'description' =>'会员之间发送的短消息管理,其中包含群发短消息和对单个会员发送短消息两种',
diff --git a/src/dede/inc/inc_menu.php b/src/dede/inc/inc_menu.php
index 0b31c288..58d818c8 100755
--- a/src/dede/inc/inc_menu.php
+++ b/src/dede/inc/inc_menu.php
@@ -61,7 +61,6 @@ $adminMenu2 = "
-
@@ -154,7 +153,6 @@ $adminMenu1
-
diff --git a/src/dede/inc/inc_menu_map.php b/src/dede/inc/inc_menu_map.php
index 6f0db23d..3054b30f 100755
--- a/src/dede/inc/inc_menu_map.php
+++ b/src/dede/inc/inc_menu_map.php
@@ -107,7 +107,6 @@ $menusMain = "
-
diff --git a/src/dede/member_model_add.php b/src/dede/member_model_add.php
deleted file mode 100755
index f522b6bb..00000000
--- a/src/dede/member_model_add.php
+++ /dev/null
@@ -1,70 +0,0 @@
-GetVersion();
-$mysql_versions = explode(".", trim($mysql_version));
-$mysql_version = $mysql_versions[0].".".$mysql_versions[1];
-if(empty($action))
-{
- $row = $dsql->GetOne("SELECT id FROM #@__member_model ORDER BY id DESC LIMIT 0,1 ");
- if(is_array($row)) $newid = $row['id']+1;
- else $newid = 1;
- include(DEDEADMIN."/templets/member_model_add.htm");
-} else {
- if(preg_match("#[^0-9-]#", $id) || empty($id))
- {
- ShowMsg("'会员模型ID'必须为数字!","-1");
- exit();
- }
- if($table=="")
- {
- ShowMsg("表名不能为空!","-1");
- exit();
- }
- $state = isset($state) && is_numeric($state) ? $state : 0;
- $name = dede_htmlspecialchars($name);
- $row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$id' OR `table` LIKE '$table' OR name LIKE '$name' ");
- if(is_array($row))
- {
- ShowMsg("可能会员模型的‘ID’、‘名称’在数据库中已存在,不能重复使用!","-1");
- exit();
- }
- $query = "SHOW TABLES FROM {$dsql->dbName} ";
- $dsql->SetQuery($query);
- $dsql->Execute();
- while($row = $dsql->GetArray())
- {
- if(empty($row[0])) $row[0] = '';
- if($table == $row[0])
- {
- ShowMsg('指定的表在数据库中重复', '-1');
- exit();
- }
- }
- $sql = "CREATE TABLE IF NOT EXISTS `$table`(
- `mid` int(10) unsigned NOT NULL auto_increment,
- ";
- if($mysql_version < 4.1){
- $sql .= " PRIMARY KEY (`mid`)\r\n) TYPE=MyISAM; ";
- }else{
- $sql .= " PRIMARY KEY (`mid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; ";
- }
- if($dsql->ExecNoneQuery($sql)){
- $query = "INSERT INTO #@__member_model (`id`, `name`, `table`, `description`, `issystem`, `state`) VALUES ('$id', '$name', '$table', '$description', 0, '$state')";
- $dsql->ExecNoneQuery($query);
- //更新会员模型缓存
- UpDateMemberModCache();
- ShowMsg('会员模型创建成功,请自行添加字段', 'member_model_main.php');
- }else{
- ShowMsg('会员模型创建失败', '-1');
- }
-}
\ No newline at end of file
diff --git a/src/dede/member_model_edit.php b/src/dede/member_model_edit.php
deleted file mode 100755
index c8d82cc4..00000000
--- a/src/dede/member_model_edit.php
+++ /dev/null
@@ -1,221 +0,0 @@
-ExecuteNoneQuery($query);
- //更新会员模型缓存
- UpDateMemberModCache();
- ShowMsg("成功更改一个会员模型!", "member_model_main.php");
- exit();
-}
-/*----------------
-function __Disabled()
------------------*/
-else if($dopost=="disabled")
-{
- @set_time_limit(0);
- CheckPurview('c_Del');
- $row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$id'");
- $statenum = ($row['state']==0)? 1 : 0;
- $statestr = ($row['state']==0)? '启用' : '禁用';
- //禁用模型
- $dsql->ExecuteNoneQuery("UPDATE #@__member_model SET state={$statenum} WHERE id='$id' ");
- //更新会员模型缓存
- UpDateMemberModCache();
- ShowMsg("成功{$statestr}一个会员模型!","member_model_main.php");
- exit();
-}
-/*----------------
-function __Copy()
------------------*/
-else if($dopost=="copy")
-{
- @set_time_limit(0);
- CheckPurview('c_Del');
- $row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$id'");
- $thisname = $row['name'];
- $thistable = $row['table'];
- $thisinfo = $row['info'];
- $row = $dsql->GetOne("SELECT id From #@__member_model ORDER BY id DESC LIMIT 0,1 ");
- if(is_array($row)) $newid = $row['id'] + 1;
- else $newid = 1;
- if(empty($job)) $job="";
-
- //确认提示
- if($job=="")
- {
- $wintitle = "会员模型管理-复制会员模型";
- $wecome_info = "会员模型管理::复制会员模型";
- $win = new OxWindow();
- $win->Init("member_model_edit.php","js/blank.js","POST");
- $win->AddHidden("job","yes");
- $win->AddHidden("dopost",$dopost);
- $win->AddHidden("id",$id);
- $win->AddTitle("你确实要复制 \"".$thisname."\" 这个会员模型?");
- $msg ="";
- $msg.="
";
- $win->AddMsgItem("$msg
");
- $winform = $win->GetWindow("ok");
- $win->Display();
- exit();
- }
-
- //操作
- else if($job=="yes")
- {
- if(preg_match("#[^0-9-]#", $newid) || empty($newid))
- {
- ShowMsg("'会员模型ID'必须为数字!","-1");
- exit();
- }
- if($newtable=="")
- {
- ShowMsg("表名不能为空!", "-1");
- exit();
- }
- $state = isset($state) && is_numeric($state) ? $state : 0;
- $newname = dede_htmlspecialchars($newname);
- $row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$newid' OR `table` LIKE '$newtable' OR name LIKE '$newname' ");
- if(is_array($row))
- {
- ShowMsg("可能会员模型的‘ID’、‘名称’在数据库中已存在,不能重复使用!","-1");
- exit();
- }
- //拷贝数据表
- if(!$dsql->IsTable($newtable))
- {
- $dsql->Execute('me',"SHOW CREATE TABLE {$dsql->dbName}.{$thistable}");
- $row = $dsql->GetArray('me', MYSQL_BOTH);
- $tableStruct = $row[1];
- $tb = str_replace('#@__', $cfg_dbprefix, $thistable);
- $tableStruct = preg_replace("/CREATE TABLE `$thistable`/iU","CREATE TABLE `$newtable`",$tableStruct);
- $dsql->ExecuteNoneQuery($tableStruct);
- }
- $query = "INSERT INTO #@__member_model (`id`, `name`, `table`, `description`, `issystem`, `state`, `info`) VALUES ('$newid', '$newname', '$newtable', '$description', 0, '$state','$thisinfo')";
- $rs = $dsql->ExecuteNoneQuery($query);
- if($rs)
- {
- UpDateMemberModCache();
- ShowMsg("成功复制会员模型,现转到详细参数页... ","member_model_edit.php?id={$newid}&dopost=edit");
- exit();
- }
- else
- {
- $errv = $dsql->GetError();
- ShowMsg("系统出错,请把错误代码发送到官方论坛,以检查原因!
错误代码:member_model_edit.php?dopost=copy $errv","javascript:;");
- exit();
- }
- //echo "Do it!";exit();
- }
-}
-/*----------------
-function __Delete()
------------------*/
-else if($dopost=="delete")
-{
- @set_time_limit(0);
- CheckPurview('c_Del');
- $row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$id'");
- if($row['issystem'] == 1)
- {
- ShowMsg("系统模型,禁止删除!","-1");
- exit();
- }
- if(empty($job)) $job="";
-
- //确认提示
- if($job=="")
- {
- $wintitle = "会员模型管理-删除会员模型";
- $wecome_info = "会员模型管理::删除会员模型";
- $win = new OxWindow();
- $win->Init("member_model_edit.php","js/blank.js","POST");
- $win->AddHidden("job","yes");
- $win->AddHidden("dopost",$dopost);
- $win->AddHidden("id",$id);
- $win->AddTitle("!将删除所有与该会员模型相关的文件和数据
你确实要删除 \"".$row['name']."\" 这个会员模型?");
- $winform = $win->GetWindow("ok");
- $win->Display();
- exit();
- }
-
- //操作
- else if($job=="yes")
- {
- $row = $dsql->GetOne("SELECT `table` FROM `#@__member_model` WHERE id='$id'",MYSQL_ASSOC);
- if(!is_array($row))
- {
- ShowMsg("你所指定的会员模型信息不存在!","-1");
- exit();
- }
-
- //删除表
- $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$row['table']}`;");
-
- //删除频道配置信息
- $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_model` WHERE id='$id'");
- UpDateMemberModCache();
- ShowMsg("成功删除一个会员模型!","member_model_main.php");
- exit();
- }
-}
-
-/*----------------
-function edit()
------------------*/
-$row = $dsql->GetOne("SELECT * FROM #@__member_model WHERE id='$id'");
-include DEDEADMIN."/templets/member_model_edit.htm";
\ No newline at end of file
diff --git a/src/dede/member_model_field_add.php b/src/dede/member_model_field_add.php
deleted file mode 100755
index 99cd12d3..00000000
--- a/src/dede/member_model_field_add.php
+++ /dev/null
@@ -1,121 +0,0 @@
-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 #@__member_model WHERE id='$id'");
- $fieldset = $row['info'];
- require_once(DEDEINC."/dedetag.class.php");
- $dtp = new DedeTagParse();
- $dtp->SetNameSpace("field","<",">");
- $dtp->LoadSource($fieldset);
- $trueTable = $row['table'];
-
- //修改字段配置信息
- $dfvalue = trim($vdefault);
- $isnull = ($isnull==1 ? "true" : "false");
- $mxlen = $maxlength;
-
- //检测被修改的字段类型
- $fieldinfos = GetFieldMake($dtype, $fieldname, $dfvalue, $mxlen);
- $ntabsql = $fieldinfos[0];
- $buideType = $fieldinfos[1];
-
- $rs = $dsql->ExecuteNoneQuery(" ALTER TABLE `$trueTable` ADD $ntabsql ");
-
- if(!$rs)
- {
- $gerr = $dsql->GetError();
- ShowMsg("增加字段失败,错误提示为:".$gerr,"javascript:;");
- exit();
- }
- $ok = false;
-
- //检测旧配置信息,并替换为新配置
- if(is_array($dtp->CTags))
- {
- //遍历旧配置
- foreach($dtp->CTags as $tagid=>$ctag)
- {
- if($fieldname == strtolower($ctag->GetName()))
- {
- $dtp->Assign($tagid,stripslashes($fieldstring),false);
- $ok = true;
- break;
- }
- }
- $oksetting = $ok ? $dtp->GetResultNP() : $fieldset."\n".stripslashes($fieldstring);
- }
- else
- {
- //原来的配置为空
- $oksetting = $fieldset."\n".stripslashes($fieldstring);
- }
- $addlist = GetAddFieldList($dtp, $oksetting);
- $oksetting = addslashes($oksetting);
- $rs = $dsql->ExecuteNoneQuery("UPDATE #@__member_model SET `info`='$oksetting' WHERE id='$id' ");
- if(!$rs)
- {
- $grr = $dsql->GetError();
- ShowMsg("保存节点配置出错!".$grr,"javascript:;");
- exit();
- }
- ShowMsg("成功增加一个字段!","member_model_edit.php?id=$id");
- exit();
-}
-
-//检测模型相关信息,并初始化相关数据
-/*----------------------
-function ShowPage()
----------------------*/
-$row = $dsql->GetOne("SELECT `table` FROM #@__member_model WHERE id='$id'");
-$trueTable = $row['table'];
-$tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`(
-`mid` int(10) unsigned NOT NULL auto_increment,
-";
-if($mysql_version < 4.1)
-{
- $tabsql .= " PRIMARY KEY (`mid`)\r\n) TYPE=MyISAM; ";
-}
-else
-{
- $tabsql .= " PRIMARY KEY (`mid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; ";
-}
-$dsql->ExecuteNoneQuery($tabsql);
-
-//检测附加表里含有的字段
-$fields = array();
-$rs = $dsql->SetQuery("SHOW fields FROM `$trueTable`");
-$dsql->Execute('a');
-while($nrow = $dsql->GetArray('a',MYSQL_ASSOC))
-{
- $fields[strtolower($nrow['Field'])] = 1;
-}
-$f = '';
-foreach($fields as $k=>$v)
-{
- $f .= ($f=='' ? $k : ' '.$k);
-}
-require_once(DEDEADMIN."/templets/member_model_field_add.htm");
\ No newline at end of file
diff --git a/src/dede/member_model_field_edit.php b/src/dede/member_model_field_edit.php
deleted file mode 100755
index 2e562ae4..00000000
--- a/src/dede/member_model_field_edit.php
+++ /dev/null
@@ -1,161 +0,0 @@
-GetVersion();
-$mysql_versions = explode(".", trim($mysql_version));
-$mysql_version = $mysql_versions[0].".".$mysql_versions[1];
-$row = $dsql->GetOne("SELECT `table`,`info` FROM #@__member_model WHERE id='$id'");
-$fieldset = $row['info'];
-$trueTable = $row['table'];
-$dtp = new DedeTagParse();
-$dtp->SetNameSpace("field", "<",">");
-$dtp->LoadSource($fieldset);
-foreach($dtp->CTags as $ctag)
-{
- if(strtolower($ctag->GetName())==strtolower($fname)) break;
-}
-
-//字段类型信息
-$ds = file(DEDEADMIN."/inc/fieldtype.txt");
-foreach($ds as $d)
-{
- $dds = explode(',',trim($d));
- $fieldtypes[$dds[0]] = $dds[1];
-}
-
-//保存更改
-/*--------------------
-function _SAVE()
-----------------------*/
-if($action=='save')
-{
- if(!isset($fieldtypes[$dtype]))
- {
- ShowMsg("你修改的是系统专用类型的数据,禁止操作!","-1");
- exit();
- }
-
- //检测数据库是否存在附加表,不存在则新建一个
- $tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`(
- `mid` int(10) unsigned NOT NULL auto_increment,
- ";
- if($mysql_version < 4.1)
- {
- $tabsql .= " PRIMARY KEY (`mid`)\r\n) TYPE=MyISAM; ";
- }
- else
- {
- $tabsql .= " PRIMARY KEY (`mid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; ";
- }
-
- //检测表里含有的字段
- $fields = array();
- $rs = $dsql->SetQuery("SHOW fields FROM `$trueTable`");
- $dsql->Execute('a');
- while($nrow = $dsql->GetArray('a',MYSQL_ASSOC))
- {
- $fields[ strtolower($nrow['Field']) ] = $nrow['Type'];
- }
-
- //修改字段配置信息
- $dfvalue = $vdefault;
- $isnull = "true";
- $mxlen = $maxlength;
- $fieldname = strtolower($fname);
-
- //检测被修改的字段类型,并更新数据表
- $fieldinfos = GetFieldMake($dtype, $fieldname, $dfvalue, $mxlen);
- $ntabsql = $fieldinfos[0];
- $buideType = $fieldinfos[1];
- $tabsql = '';
-
- //检测旧数据类型,并替换为新配置
- foreach($dtp->CTags as $tagid=>$ctag)
- {
- if(trim($fieldname)==trim(strtolower($ctag->GetName())))
- {
-
- if(isset($fields[$fieldname]) && $fields[$fieldname]!=$buideType)
- {
- $tabsql = "ALTER TABLE `$trueTable` CHANGE `$fieldname` ".$ntabsql;
- $dsql->ExecuteNoneQuery($tabsql);
- }
- else if(!isset($fields[$fieldname]))
- {
- $tabsql = "ALTER TABLE `$trueTable` ADD ".$ntabsql;
- $dsql->ExecuteNoneQuery($tabsql);
- }
- else
- {
- $tabsql = '';
- }
- $dtp->Assign($tagid,stripslashes($fieldstring),false);
- break;
- }
- }
- $oksetting = $dtp->GetResultNP();
-
- $oksetting = addslashes($oksetting);
- $dsql->ExecuteNoneQuery("UPDATE #@__member_model SET info='$oksetting' WHERE id='$id' ");
- ShowMsg("成功更改一个字段的配置!","member_model_edit.php?id={$id}");
- exit();
-}
-/*----------------
-禁用字段
-function __Disabled()
------------------*/
-else if($action=="disabled")
-{
- foreach($dtp->CTags as $tagid=>$ctag)
- {
- if(strtolower($ctag->GetName())==strtolower($fname))
- {
- $statenum = ($ctag->GetAtt('state')==1)? 0 : 1;
- $fieldstring = "GetName()} itemname=\"{$ctag->GetAtt('itemname')}\" autofield=\"{$ctag->GetAtt('autofield')}\" type=\"{$ctag->GetAtt('type')}\" isnull=\"{$ctag->GetAtt('isnull')}\" default=\"{$ctag->GetAtt('default')}\" maxlength=\"{$ctag->GetAtt('maxlength')}\" issearch=\"{$ctag->GetAtt('issearch')}\" isshow=\"{$ctag->GetAtt('isshow')}\" state=\"{$statenum}\">\r\n";
- $fieldstring .= "GetName()}>";
- $dtp->Assign($tagid,stripslashes($fieldstring),false);
- }
- }
- $oksetting = addslashes($dtp->GetResultNP());
- //echo $oksetting;exit();
- $dsql->ExecuteNoneQuery("UPDATE #@__member_model SET info='$oksetting' WHERE id='$id' ");
- ShowMsg("成功禁用一个字段!","member_model_edit.php?id={$id}");
- exit();
-}
-/*------------------
-删除字段
-function _DELETE()
--------------------*/
-else if($action=="delete")
-{
- //检测旧数据类型,并替换为新配置
- foreach($dtp->CTags as $tagid=>$ctag)
- {
- if(strtolower($ctag->GetName())==strtolower($fname))
- {
- $dtp->Assign($tagid,"#@Delete@#");
- }
- }
- $oksetting = addslashes($dtp->GetResultNP());
- $dsql->ExecuteNoneQuery("Update #@__member_model set info='$oksetting' where id='$id' ");
- $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` ");
- ShowMsg("成功删除一个字段!","member_model_edit.php?id={$id}");
- exit();
-}
-require_once(DEDEADMIN."/templets/member_model_field_edit.htm");
\ No newline at end of file
diff --git a/src/dede/member_model_main.php b/src/dede/member_model_main.php
deleted file mode 100755
index 0bc45d1a..00000000
--- a/src/dede/member_model_main.php
+++ /dev/null
@@ -1,31 +0,0 @@
-IsTable($mtable)){
- $row =$dsql->GetOne("SELECT COUNT(*) AS nums FROM {$mtable}");
- return empty($row['nums'])? "0" : $row['nums'];
- }else{
- return '0';
- }
-}
-
-$sql = "SELECT `id`,`name`,`table`,`description`,`state`,`issystem` FROM #@__member_model ORDER BY id ASC";
-$dlist = new DataListCP();
-$dlist->SetTemplet(DEDEADMIN."/templets/member_model_main.htm");
-$dlist->SetSource($sql);
-$dlist->display();
-$dlist->Close();
\ No newline at end of file
diff --git a/src/dede/templets/member_model_add.htm b/src/dede/templets/member_model_add.htm
deleted file mode 100755
index ced1ceaf..00000000
--- a/src/dede/templets/member_model_add.htm
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
- 新增会员模型
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/dede/templets/member_model_edit.htm b/src/dede/templets/member_model_edit.htm
deleted file mode 100755
index ef511599..00000000
--- a/src/dede/templets/member_model_edit.htm
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
- 修改会员模型管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/dede/templets/member_model_field_add.htm b/src/dede/templets/member_model_field_add.htm
deleted file mode 100755
index 2dd00d7a..00000000
--- a/src/dede/templets/member_model_field_add.htm
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
-
-增加字段
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/dede/templets/member_model_field_edit.htm b/src/dede/templets/member_model_field_edit.htm
deleted file mode 100755
index 4df49b1d..00000000
--- a/src/dede/templets/member_model_field_edit.htm
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-更改字段
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/dede/templets/member_model_main.htm b/src/dede/templets/member_model_main.htm
deleted file mode 100755
index 13ce8bdc..00000000
--- a/src/dede/templets/member_model_main.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-{dede:page pagesize="50"/}
-
-
-
-
-会员模型管理
-
-
-
-
-
-
-
- ID号 |
- 模型名称 |
- 表名 |
- 会员数 |
- 启用状态 |
- 管理 |
-
- {dede:datalist}
-
- {dede:field.id/} |
- {dede:field.name/}{dede:if field.issystem==1 }[*]{/dede:if} |
- {dede:field.table/} |
- {dede:field.table function='GetTotalMember(@me)'/} |
- {dede:if field.state==0 } [×]Off {else} [√]On {/dede:if} |
- 编辑 | 复制 | {dede:if field.state==0 }启用{else}禁用{/dede:if} | 删除 |
-
- {/dede:datalist}
-
-
-
- {dede:pagelist listsize=6/} |
-
-
-
-
\ No newline at end of file
diff --git a/src/dede/templets/soft_add.htm b/src/dede/templets/soft_add.htm
index a77acf11..43d431aa 100755
--- a/src/dede/templets/soft_add.htm
+++ b/src/dede/templets/soft_add.htm
@@ -234,14 +234,6 @@
echo "【选择副栏目】";
}
?>
-
- >是否同步远程发布
diff --git a/src/dede/templets/soft_edit.htm b/src/dede/templets/soft_edit.htm
index 3f5b50b1..925b08ce 100755
--- a/src/dede/templets/soft_edit.htm
+++ b/src/dede/templets/soft_edit.htm
@@ -218,14 +218,6 @@
-
- >是否同步远程发布
diff --git a/src/dede/templets/spec_add.htm b/src/dede/templets/spec_add.htm
index b9a917c7..e40d5a45 100755
--- a/src/dede/templets/spec_add.htm
+++ b/src/dede/templets/spec_add.htm
@@ -209,16 +209,7 @@ function CheckVal(id){
echo "";
?>
-
- >
- 是否同步远程发布
-
-
+
diff --git a/src/dede/templets/spec_edit.htm b/src/dede/templets/spec_edit.htm
index d3fa5d63..a947c5c2 100755
--- a/src/dede/templets/spec_edit.htm
+++ b/src/dede/templets/spec_edit.htm
@@ -280,14 +280,7 @@
?>
-
- >是否同步远程发布
+
|
diff --git a/src/include/arc.archives.class.php b/src/include/arc.archives.class.php
index d2168aa6..1a033b28 100755
--- a/src/include/arc.archives.class.php
+++ b/src/include/arc.archives.class.php
@@ -350,7 +350,7 @@ class Archives
*/
function MakeHtml($isremote=0)
{
- global $cfg_remote_site,$fileFirst,$baidu_seo,$cfg_basehost;
+ global $fileFirst,$baidu_seo,$cfg_basehost;
if($this->IsError)
{
@@ -425,18 +425,6 @@ class Archives
$seoUrls = array_merge($seoUrls, array($cfg_basehost.$URLFilename));
$this->ParseDMFields($i,1);
$this->dtp->SaveTo($TRUEfilename);
- //如果启用远程发布则需要进行判断
- if($cfg_remote_site=='Y' && $isremote == 1)
- {
-
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '', $TRUEfilename);
- $localfile = '..'.$remotefile;
- //创建远程文件夹
- $remotedir = preg_replace("#[^\/]*\.html#", '', $remotefile);
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'ascii');
- }
}
if ($baidu_seo == true) {
diff --git a/src/include/arc.listview.class.php b/src/include/arc.listview.class.php
index c90cce1d..8bd085bf 100755
--- a/src/include/arc.listview.class.php
+++ b/src/include/arc.listview.class.php
@@ -279,7 +279,6 @@ class ListView
*/
function MakeHtml($startpage=1, $makepagesize=0, $isremote=0)
{
- global $cfg_remote_site;
if(empty($startpage))
{
$startpage = 1;
@@ -339,17 +338,6 @@ class ListView
$makeFile = preg_replace("/\/{1,}/", "/", $makeFile);
$murl = $this->GetTrueUrl($murl);
$this->dtp->SaveTo($makeFile);
- //如果启用远程发布则需要进行判断
- if($cfg_remote_site=='Y'&& $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '',$makeFile);
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.html/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
}
if($startpage==1)
{
@@ -361,17 +349,6 @@ class ListView
$onlyrule = str_replace("{page}","1",$onlyrule);
$list_1 = $this->GetTruePath().$onlyrule;
$murl = MfTypedir($this->Fields['typedir']).'/'.$this->Fields['defaultname'];
- //如果启用远程发布则需要进行判断
- if($cfg_remote_site=='Y'&& $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = $murl;
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.html/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
$indexname = $this->GetTruePath().$murl;
copy($list_1,$indexname);
}
@@ -462,34 +439,12 @@ class ListView
if($nmfa==0)
{
$this->PartView->SaveToHtml($makeFile);
- //如果启用远程发布则需要进行判断
- if($GLOBALS['cfg_remote_site']=='Y'&& $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '',$makeFile);
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.html/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
}
else
{
if(!file_exists($makeFile))
{
$this->PartView->SaveToHtml($makeFile);
- //如果启用远程发布则需要进行判断
- if($cfg_remote_site=='Y'&& $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '',$makeFile);
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.html/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
}
}
return $this->GetTrueUrl($makeUrl);
diff --git a/src/include/arc.partview.class.php b/src/include/arc.partview.class.php
index ff8e5795..e71bcafb 100755
--- a/src/include/arc.partview.class.php
+++ b/src/include/arc.partview.class.php
@@ -181,18 +181,6 @@ class PartView
*/
function SaveToHtml($filename,$isremote=0)
{
- global $cfg_remote_site;
- //如果启用远程发布则需要进行判断
- if($cfg_remote_site=='Y' && $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '', $filename);
- $localfile = '..'.$remotefile;
- //创建远程文件夹
- $remotedir = preg_replace('/[^\/]*\.js/', '', $remotefile);
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'ascii');
- }
$this->dtp->SaveTo($filename);
}
diff --git a/src/include/arc.rssview.class.php b/src/include/arc.rssview.class.php
index 8de609c3..d9afa50f 100755
--- a/src/include/arc.rssview.class.php
+++ b/src/include/arc.rssview.class.php
@@ -97,21 +97,9 @@ class RssView
*/
function MakeRss($isremote=0)
{
- global $cfg_remote_site;
$murl = $GLOBALS['cfg_cmspath']."/data/rss/".$this->TypeID.".xml";
$mfile = $GLOBALS['cfg_basedir'].$murl;
$this->dtp->SaveTo($mfile);
- //如果启用远程站点则上传
- if($cfg_remote_site=='Y' && $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = $murl;
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.xml/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
return $murl;
}
diff --git a/src/include/arc.specview.class.php b/src/include/arc.specview.class.php
index a9d11d8d..f5f3befd 100755
--- a/src/include/arc.specview.class.php
+++ b/src/include/arc.specview.class.php
@@ -221,7 +221,6 @@ class SpecView
*/
function MakeHtml($isremote=0)
{
- global $cfg_remote_site;
//初步给固定值的标记赋值
$this->ParseTempletsFirst();
$totalpage = ceil($this->TotalResult / $this->PageSize);
@@ -275,17 +274,6 @@ class SpecView
$murl = $makeFile;
$makeFile = $GLOBALS['cfg_basedir'].$makeFile;
$this->dtp->SaveTo($makeFile);
- //如果启用远程站点则上传
- if($cfg_remote_site=='Y'&& $isremote == 1)
- {
- //分析远程文件路径
- $remotefile = str_replace(DEDEROOT, '', $makeFile);
- $localfile = '..'.$remotefile;
- $remotedir = preg_replace('/[^\/]*\.html/', '',$remotefile);
- //不相等则说明已经切换目录则可以创建镜像
- $this->ftp->rmkdir($remotedir);
- $this->ftp->upload($localfile, $remotefile, 'acii');
- }
echo "成功创建:$murl
";
}
copy($GLOBALS['cfg_basedir'].$GLOBALS['cfg_special']."/spec_1".$GLOBALS['art_shortname'],$GLOBALS['cfg_basedir'].$GLOBALS['cfg_special']."/index.html");
diff --git a/src/include/membermodel.cls.php b/src/include/membermodel.cls.php
deleted file mode 100755
index a6abcbb5..00000000
--- a/src/include/membermodel.cls.php
+++ /dev/null
@@ -1,183 +0,0 @@
-__construct($modtype);
- }
-
- //析构函数
- function __construct($modtype)
- {
- $this->name = $modtype;
- $this->db = $GLOBALS['dsql'];
- $query = "SELECT * FROM #@__member_model WHERE name='{$modtype}'";
- $diyinfo = $this->db->getone($query);
- if (!is_array($diyinfo)) {
- showMsg('参数不正确,该会员模型不存在', 'javascript:;');
- exit();
- }
- $etypes = array();
- $egroups = array();
- $this->db->Execute('me', 'SELECT * FROM `#@__stepselect` ORDER BY id desc');
- while ($arr = $this->db->GetArray()) {
- $etypes[] = $arr;
- $egroups[$arr['egroup']] = $arr['itemname'];
- }
- $this->egroups = $egroups;
- $this->modid = $diyinfo['id'];
- $this->table = $diyinfo['table'];
- $this->description = $diyinfo['description'];
- $this->state = $diyinfo['state'];
- $this->issystem = $diyinfo['issystem'];
- $this->info = $diyinfo['info'];
- } //end func __construct()
-
- /**
- * 获取用户数据表单
- *
- * @access public
- * @param string $type 表单类型
- * @param string $value 值
- * @param string $admintype 模型类型
- * @return string
- */
- function getForm($type = 'post', $value = '', $admintype = 'membermodel2')
- {
- global $cfg_cookie_encode;
- $dtp = new DedeTagParse();
- $dtp->SetNameSpace("field", "<", ">");
- $dtp->LoadSource($this->info);
- $formstring = '';
- $formfields = '';
- $func = $type == 'post' ? 'GetFormItem' : 'GetFormItemValue';
-
- if (is_array($dtp->CTags)) {
- foreach ($dtp->CTags as $tagid => $tag) {
- if ($tag->GetAtt('autofield')) {
- if ($tag->GetAtt('state') == 1) {
- //如果启用该字段
- if ($type == 'post') {
- //对一些字段进行特殊处理
- if ($tag->GetName() == 'onlynet') {
- $formstring .= '联系方式限制:
-
- 不公开所有联系方式
-
- 不公开电话、详细地址
-
- 公开所有联系方式
';
- } else if ($tag->GetName() == 'place' || $tag->GetName() == 'oldplace') {
- $formtitle = ($tag->GetName() == 'place') ? '目前所在地' : '家乡所在地';
- $formstring .= '' . GetEnumsForm(
- 'nativeplace',
- 0,
- $tag->GetName()
- ) . '
' . $formtitle . ':';
- } else if (array_key_exists($tag->GetName(), $this->egroups)) {
- //对联动模型进行特殊处理
- $formstring .= '' . GetEnumsForm(
- $tag->GetName(),
- 0,
- $tag->GetName()
- ) . '
' . $this->egroups[$tag->GetName()] . ':';
- } else if ($tag->GetAtt('type') == 'checkbox') {
- //对checkbox模型进行特殊处理
- $formstring .= $func($tag, $admintype);
- } else {
- $formstring .= $func($tag, $admintype);
- }
- } else {
- if ($tag->GetName() == 'onlynet') {
- $formstring .= '
-
- 不公开所有联系方式
-
- 不公开电话、详细地址
-
- 公开所有联系方式
';
- } else if ($tag->GetName() == 'place' || $tag->GetName() == 'oldplace') {
- $formtitle = ($tag->GetName() == 'place') ? '目前所在地' : '家乡所在地';
- $formstring .= '';
- } else if ($tag->GetName() == 'birthday') {
- $formstring .= '';
- } else if (array_key_exists($tag->GetName(), $this->egroups)) {
- //对联动模型进行特殊处理
- $formstring .= '';
- } else if ($tag->GetAtt('type') == 'checkbox') {
- //对checkbox模型进行特殊处理
- $formstring .= $func($tag, dede_htmlspecialchars($value[$tag->GetName()], ENT_QUOTES), $admintype);
- } else if ($tag->GetAtt('type') == 'img') {
- $fieldname = $tag->GetName();
- $labelname = $tag->GetAtt('itemname');
- $fvalue = dede_htmlspecialchars($value[$tag->GetName()], ENT_QUOTES);
- $imgstrng = "";
- $formstring .= $imgstrng;
- } else {
- $formstring .= $func($tag, dede_htmlspecialchars($value[$tag->GetName()], ENT_QUOTES), $admintype);
- //echo $formstring;
- }
- }
- $formfields .= $formfields == '' ? $tag->GetName() . ',' . $tag->GetAtt('type') : ';' . $tag->GetName() . ',' . $tag->GetAtt('type');
- }
- }
- }
- }
- $formstring .= "\n";
- $formstring .= "";
- return $formstring;
- } //end func getForm
-
- /**
- * 获取字段列表
- *
- * @access public
- * @param string
- * @return array
- */
- function getFieldList()
- {
- $dtp = new DedeTagParse();
- $dtp->SetNameSpace("field", "<", ">");
- $dtp->LoadSource($this->info);
- $fields = array();
- if (is_array($dtp->CTags)) {
- foreach ($dtp->CTags as $tagid => $tag) {
- $fields[$tag->GetName()] = array($tag->GetAtt('itemname'), $tag->GetAtt('type'));
- }
- }
- return $fields;
- }
-}
diff --git a/src/member/reg_new.php b/src/member/reg_new.php
index be9bd8ba..ae396e96 100755
--- a/src/member/reg_new.php
+++ b/src/member/reg_new.php
@@ -8,7 +8,7 @@
* @link http://www.dedecms.com
*/
require_once(dirname(__FILE__) . "/config.php");
-require_once DEDEINC . '/membermodel.cls.php';
+
if ($cfg_mb_allowreg == 'N') {
ShowMsg('系统关闭了新用户注册!', 'index.php');
exit();
@@ -162,18 +162,6 @@ if ($step == 1) {
//写入其它默认数据
$dsql->ExecuteNoneQuery("INSERT INTO `#@__member_flink`(mid,title,url) VALUES('$mid','织梦内容管理系统','http://www.dedecms.com'); ");
- $membermodel = new membermodel($mtype);
- $modid = $membermodel->modid;
- $modid = empty($modid) ? 0 : intval($modid);
- $modelform = $dsql->getOne("SELECT * FROM `#@__member_model` WHERE id='$modid' ");
-
- if (!is_array($modelform)) {
- showmsg('模型表单不存在', '-1');
- exit();
- } else {
- $dsql->ExecuteNoneQuery("INSERT INTO `{$membermodel->table}` (`mid`) VALUES ('{$mid}');");
- }
-
//----------------------------------------------
//模拟登录
//---------------------------
@@ -234,8 +222,7 @@ if ($step == 1) {
exit;
}
}
- $membermodel = new membermodel($cfg_ml->M_MbType);
- $postform = $membermodel->getForm(true);
+
if ($dopost == 'reginfo') {
//这里完成详细内容填写
$dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
@@ -273,7 +260,6 @@ if ($step == 1) {
}
}
- $query = "UPDATE `{$membermodel->table}` SET `mid`='{$cfg_ml->M_ID}' $inadd_f WHERE `mid`='{$cfg_ml->M_ID}'; ";
if ($dsql->executenonequery($query)) {
$dsql->ExecuteNoneQuery("UPDATE `#@__member` SET `spacesta`='2' WHERE `mid`='{$cfg_ml->M_ID}'");
// 清除缓存
diff --git a/src/member/templets/reg-new2.htm b/src/member/templets/reg-new2.htm
index 1ca8eb14..be351a04 100755
--- a/src/member/templets/reg-new2.htm
+++ b/src/member/templets/reg-new2.htm
@@ -92,7 +92,6 @@ document.write("午夜好,");