diff --git a/src/apps/arcmulti.php b/src/apps/arcmulti.php
deleted file mode 100755
index 1393bc8a..00000000
--- a/src/apps/arcmulti.php
+++ /dev/null
@@ -1,110 +0,0 @@
-GetOne("SELECT * FROM `#@__arcmulti` WHERE tagid='$tagid'");
- $ids = explode(',', $row['arcids']);
- $totalnum = $line = count($ids);
- //取出属性并解析为变量
- $attarray = unserialize($row['attstr']);
- extract($attarray, EXTR_SKIP);
- $artlist = '';
- //通过页面及总数解析当前页面数据范围
- $strnum = ($pnum-1) * $row['pagesize'];
- $limitsql = " LIMIT $strnum,{$row['pagesize']} ";
- if ($mtype == 0)
- {
- //处理列表文档项
- $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath {$row['addfieldsSql']} FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id {$row['addfieldsSqlJoin']} WHERE arc.id IN({$row['arcids']}) {$row['ordersql']} $limitsql";
- $dsql->SetQuery($query);
- $dsql->Execute('al');
- $dtp2 = new DedeTagParse();
- $dtp2->SetNameSpace('field', '[', ']');
- $dtp2->LoadString($row['innertext']);
- $GLOBALS['autoindex'] = 0;
- $ids = array();
- for ($i=0; $i<$line; $i++)
- {
- if ($col>1) $artlist .= "\r\n";
- for ($j=0; $j<$col; $j++)
- {
- if ($col>1) $artlist .= "\r\n";
- if ($row = $dsql->GetArray("al")) {
- $ids[] = $row['id'];
- //处理一些特殊字段
- $row['info'] = $row['infos'] = cn_substr($row['description'],$infolen);
- $row['id'] = $row['id'];
- if ($row['corank'] > 0 && $row['arcrank']==0)
- {
- $row['arcrank'] = $row['corank'];
- }
- $row['filename'] = $row['arcurl'] = GetFileUrl($row['id'],$row['typeid'],$row['senddate'],$row['title'],$row['ismake'],
- $row['arcrank'],$row['namerule'],$row['typedir'],$row['money'],$row['filename'],$row['moresite'],$row['siteurl'],$row['sitepath']);
- $row['typeurl'] = GetTypeUrl($row['typeid'],$row['typedir'],$row['isdefault'],$row['defaultname'],$row['ispart'],
- $row['namerule2'],$row['moresite'],$row['siteurl'],$row['sitepath']);
- if ($row['litpic'] == '-' || $row['litpic'] == '')
- {
- $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
- }
- if (!preg_match("#^http:\/\/#", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y')
- {
- $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];
- }
- $row['picname'] = $row['litpic'];
- $row['stime'] = GetDateMK($row['pubdate']);
- $row['typelink'] = "".$row['typename']."";
- $row['image'] = "![](".$row[ "\".preg_replace(\"#[") <]#", "", $row['title'])."'>";
- $row['imglink'] = "".$row['image']."";
- $row['fulltitle'] = $row['title'];
- $row['title'] = cn_substr($row['title'],$titlelen);
- if ($row['color']!='') $row['title'] = "".$row['title']."";
- if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title']."";
- //$row['title'] = "".$row['title']."";
- $row['textlink'] = "".$row['title']."";
- $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl'];
- $row['memberurl'] = $GLOBALS['cfg_memberurl'];
- $row['templeturl'] = $GLOBALS['cfg_templeturl'];
- if (is_array($dtp2->CTags))
- {
- foreach($dtp2->CTags as $k=>$ctag)
- {
- if ($ctag->GetName()=='array')
- {
- //传递整个数组，在runphp模式中有特殊作用
- $dtp2->Assign($k,$row);
- } else {
- if (isset($row[$ctag->GetName()])) $dtp2->Assign($k,$row[$ctag->GetName()]);
- else $dtp2->Assign($k,'');
- }
- }
- $GLOBALS['autoindex']++;
- }
- $artlist .= $dtp2->GetResult()."\r\n";
- }//if hasRow
- else {
- $artlist .= '';
- }
- if ($col>1) $artlist .= " | \r\n";
- }//Loop Col
- if ($col>1) $i += $col - 1;
- if ($col>1) $artlist .= "
\r\n";
- }//loop line
- if ($col>1) $artlist .= " \r\n";
- $dsql->FreeResult("al");
- } else {
- //处理分页字段
- $artlist .= '';
- $artlist .= multipage($totalnum, $pnum, $row['pagesize'], $tagid);
- $artlist .= '
';
- }
-}
-AjaxHead();
-echo $artlist;
-exit();
-?>
\ No newline at end of file
diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt
index 6afa1357..5d041142 100755
--- a/src/install/sql-dftables.txt
+++ b/src/install/sql-dftables.txt
@@ -208,21 +208,6 @@ CREATE TABLE `#@__archives` (
KEY `lastpost` (`lastpost`,`scores`,`goodpost`,`badpost`,`notpost`)
) TYPE=MyISAM;
-DROP TABLE IF EXISTS `#@__arcmulti`;
-CREATE TABLE `#@__arcmulti` (
- `id` mediumint(8) unsigned NOT NULL auto_increment,
- `tagid` char(60) NOT NULL default '',
- `uptime` int(11) NOT NULL default '0',
- `innertext` varchar(255) NOT NULL default '',
- `pagesize` int(11) NOT NULL default '0',
- `arcids` text NOT NULL,
- `ordersql` varchar(255) default NULL,
- `addfieldsSql` varchar(255) default NULL,
- `addfieldsSqlJoin` varchar(255) default NULL,
- `attstr` text,
- PRIMARY KEY (`id`)
-) TYPE=MyISAM;
-
DROP TABLE IF EXISTS `#@__arcrank`;
CREATE TABLE `#@__arcrank` (
`id` smallint(5) unsigned NOT NULL auto_increment,
diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css
index 3cea24d7..d6180fc0 100644
--- a/src/static/web/css/user.css
+++ b/src/static/web/css/user.css
@@ -1,69 +1,84 @@
.login-from {
- margin:6rem 0
+ margin: 6rem 0
}
+
.login-box {
- padding:1.25rem;
- width:500px;
- background:#fff
+ padding: 1.25rem;
+ width: 500px;
+ background: #fff
}
+
#validateimg {
- border-radius:0 .2rem .2rem 0
+ border-radius: 0 .2rem .2rem 0
}
+
.member-actions {
- line-height:40px;
- text-align:right
+ line-height: 40px;
+ text-align: right
}
+
.member-logo {
- max-width:60px;
- min-height:60px;
- border-radius:50%
+ max-width: 60px;
+ min-height: 60px;
+ border-radius: 50%
}
+
.member-type span {
- position:relative;
- padding:.3rem;
- font-size:14px;
- font-weight:400;
- top:-10px
+ position: relative;
+ padding: .3rem;
+ font-size: 14px;
+ font-weight: 400;
+ top: -10px
}
+
.dropdown {
- display:inline-block;
- margin-left:.25rem;
- content:"";
- border-top:.3em solid;
- border-right:.3em solid transparent;
- border-bottom:0;
- border-left:.3em solid transparent;
- vertical-align:.25rem
+ display: inline-block;
+ margin-left: .25rem;
+ content: "";
+ border-top: .3em solid;
+ border-right: .3em solid transparent;
+ border-bottom: 0;
+ border-left: .3em solid transparent;
+ vertical-align: .25rem
}
+
.pannel-main .pannel-main-container {
- padding:1rem;
- background:#fff
+ padding: 1rem;
+ background: #fff
}
+
.list-group-item.active a {
- color:#fff
+ color: #fff
}
+
.list-group-flush>.list-group-item {
- cursor:pointer
+ cursor: pointer
}
+
.pannel-main .nav-link.active {
- font-weight:600
+ font-weight: 600
}
+
.user-meter i {
- font-size:24px!important
+ font-size: 24px !important
}
+
.user-img {
- margin-right:10px;
- width:30px;
- height:30px;
- border-radius:50%;
- border:1px solid #dee2e6
+ margin-right: 10px;
+ width: 30px;
+ height: 30px;
+ border-radius: 50%;
+ border: 1px solid #dee2e6
}
+
.form-control {
- height:36px;
- line-height:36px
+ height: 36px;
+ line-height: 36px
}
+
@media (max-width:480px) {
- .login-from,.login-box {
- width:100%
-}
+ .login-from,
+ .login-box {
+ width: 100%
+ }
}
\ No newline at end of file
diff --git a/src/static/web/js/user.js b/src/static/web/js/user.js
new file mode 100644
index 00000000..f904c59d
--- /dev/null
+++ b/src/static/web/js/user.js
@@ -0,0 +1,11 @@
+function checkSubmit(t) {
+ if (document.addcontent.title.value == "") {
+ ShowMsg(`${t}不能为空`);
+ document.addcontent.title.focus();
+ return false;
+ }
+ if (document.addcontent.typeid.value == 0) {
+ ShowMsg("隶属栏目必须选择");
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php
index c28890fb..289832f9 100755
--- a/src/system/taglib/arclist.lib.php
+++ b/src/system/taglib/arclist.lib.php
@@ -421,22 +421,6 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
if ($col > 1) $artlist .= " \r\n";
$dsql->FreeResult("al");
$idsstr = join(',', $ids);
- //分页特殊处理
- if ($pagesize > 0) {
- $artlist .= " \r\n";
- $row = $dsql->GetOne("SELECT tagid FROM `#@__arcmulti` WHERE tagid='$tagid'");
- $uptime = time();
- $attstr = addslashes(serialize($attarray));
- $innertext = addslashes($innertext);
- if (!is_array($row)) {
- $query = "INSERT INTO `#@__arcmulti` (tagid,uptime,innertext,pagesize,arcids,ordersql,addfieldsSql,addfieldsSqlJoin,attstr) VALUES ('$tagid','$uptime','$innertext','$pagesize','$idsstr','$ordersql','$addfieldsSql','$addfieldsSqlJoin','$attstr');
- ";
- $dsql->ExecuteNoneQuery($query);
- } else {
- $query = "UPDATE `#@__arcmulti` SET uptime='$uptime', innertext='$innertext', pagesize='$pagesize', arcids='$idsstr', ordersql='$ordersql', addfieldsSql='$addfieldsSql', addfieldsSqlJoin='$addfieldsSqlJoin', attstr='$attstr' WHERE tagid='$tagid'";
- $dsql->ExecuteNoneQuery($query);
- }
- }
//保存ID缓存
if ($needSaveCache) {
if ($idsstr == '') $idsstr = '0';
diff --git a/src/system/taglib/arcpagelist.lib.php b/src/system/taglib/arcpagelist.lib.php
deleted file mode 100755
index 558f90f5..00000000
--- a/src/system/taglib/arcpagelist.lib.php
+++ /dev/null
@@ -1,70 +0,0 @@
-CAttribute->Items, $attlist);
- extract($ctag->CAttribute->Items, EXTR_SKIP);
- $row = $dsql->GetOne("SELECT * FROM `#@__arcmulti` WHERE tagid='$tagid'");
- if (is_array($row)) {
- $ids = explode(',', $row['arcids']);
- $totalnum = count($ids);
- $pagestr = '';
- if ($row['pagesize'] < $totalnum) {
- $pagestr .= multipage($totalnum, 1, $row['pagesize'], $tagid);
- } else {
- $pagestr .= '共1页';
- }
- $pagestr .= '
';
- return $pagestr;
- } else {
- $pagestr = '';
- $pagestr .= '没有检索到对应分页';
- $pagestr .= '
';
- return $pagestr;
- }
-}
-/**
- * 分页函数
- *
- * @access public
- * @param string $allItemTotal 所有记录
- * @param string $currPageNum 当前页面数
- * @param string $pagesize 显示条数
- * @param string $tagid 标签ID
- * @return string
- */
-function multipage($allItemTotal, $currPageNum, $pagesize, $tagid = '')
-{
- if ($allItemTotal == 0) return "";
- //计算总页数
- $pagesNum = ceil($allItemTotal / $pagesize);
- //第一页显示
- $firstPage = ($currPageNum <= 1) ? $currPageNum."<<" : "1<<";
- //最后一页显示
- $lastPage = ($currPageNum >= $pagesNum) ? ">".$currPageNum : ">".$pagesNum."";
- //上一页显示
- $prePage = ($currPageNum <= 1) ? "上页" : "[上一页]";
- //下一页显示
- $nextPage = ($currPageNum >= $pagesNum) ? "下页" : "[下一页]";
- //按页显示
- $listNums = "";
- for ($i = ($currPageNum - 4); $i < ($currPageNum + 9); $i++) {
- if ($i < 1 || $i > $pagesNum) continue;
- if ($i == $currPageNum) $listNums .= "".$i."";
- else $listNums .= " ".$i." ";
- }
- $returnUrl = $listNums;
- return $returnUrl;
-}
-?>
\ No newline at end of file
diff --git a/src/user/inc/archives_check.php b/src/user/inc/archives_check.php
index d777d8b0..24ba81fe 100755
--- a/src/user/inc/archives_check.php
+++ b/src/user/inc/archives_check.php
@@ -11,12 +11,6 @@ if (!defined('DEDEMEMBER')) exit('dedebiz');
*/
include_once(DEDEINC.'/image.func.php');
include_once(DEDEINC.'/libraries/oxwindow.class.php');
-$svali = GetCkVdValue();
-if (strtolower($vdcode) != $svali || $svali == '') {
- ResetVdValue();
- ShowMsg('验证码不正确', '-1');
- exit();
-}
//校验CSRF
CheckCSRF();
$flag = '';
diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php
index 007d8ca6..c98343fa 100755
--- a/src/user/inc/inc_catalog_options.php
+++ b/src/user/inc/inc_catalog_options.php
@@ -38,7 +38,7 @@ function GetOptionList($selid = 0, $channeltype = 0)
if ($row->ispart == 0) {
$OptionArrayList .= "\r\n";
} else if ($row->ispart == 1) {
- $OptionArrayList .= "\r\n";
+ $OptionArrayList .= "\r\n";
}
}
$selected = '';
@@ -70,7 +70,7 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0)
if ($row->ispart == 0) {
$OptionArrayList .= "\r\n";
} else if ($row->ispart == 1) {
- $OptionArrayList .= "\r\n";
+ $OptionArrayList .= "\r\n";
}
}
$selected = '';
diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm
index 9104f579..911f935f 100755
--- a/src/user/templets/album_add.htm
+++ b/src/user/templets/album_add.htm
@@ -81,15 +81,6 @@
-
diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm
index 8e7af0ec..575b222c 100755
--- a/src/user/templets/archives_add.htm
+++ b/src/user/templets/archives_add.htm
@@ -9,6 +9,7 @@
+
@@ -23,7 +24,7 @@
返回
-