diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 7abc1532..2fee740e 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -58,7 +58,7 @@ if ($dopost == 'add') { 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','',''); "; + VALUES ('$mid','10','0','{$uname}的主页','','person','',''); "; $dsql->ExecuteNoneQuery($adminquery); ShowMsg('成功添加一个账户', 'sys_admin_user.php'); exit(); diff --git a/src/install/index.php b/src/install/index.php index 949d21da..2d1b54d9 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -246,7 +246,7 @@ else if ($step==2) { $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) VALUES ('1','0','0','0','0','0','0','0','0'); "; $dbtype == 'sqlite'? $db->exec($adminquery): mysql_query($adminquery,$conn); - $adminquery = "INSERT INTO `{$dbprefix}member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('1','10','0','{$adminuser}的空间','','person','',''); "; + $adminquery = "INSERT INTO `{$dbprefix}member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('1','10','0','{$adminuser}的个人主页','','person','',''); "; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); //锁定程序安装 $fp = fopen(INSLOCKFILE,'w'); diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 86d57435..8ead2e2b 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -59,7 +59,7 @@ class Archives $this->TypeLink = new TypeLink($arr['typeid']); if ($this->ChannelUnit->ChannelInfos['issystem'] != -1) { //如果当前文档不是系统模型,为自定义模型 - $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable,mb.uname,mb.face FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp on tp.id=arc.typeid LEFT JOIN `#@__channeltype` as ch on arc.channel = ch.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.id='$aid' "; + $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable,mb.uname,mb.face,mb.userid FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp on tp.id=arc.typeid LEFT JOIN `#@__channeltype` as ch on arc.channel = ch.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.id='$aid' "; $this->Fields = $this->dsql->GetOne($query); } else { $this->Fields['title'] = ''; @@ -99,7 +99,7 @@ class Archives //为了减少重复查询,这里直接把附加表查询记录放在$this->addTableRow中,在ParAddTable()不再查询 if ($this->ChannelUnit->ChannelInfos['addtable'] != '') { if ($this->ChannelUnit->ChannelID < -1) { - $query = "SELECT tb.*,mb.uname,mb.face FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` tb LEFT JOIN `#@__member` mb on tb.mid = mb.mid WHERE tb.`aid` = '$aid'"; + $query = "SELECT tb.*,mb.uname,mb.face,mb.userid FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` tb LEFT JOIN `#@__member` mb on tb.mid = mb.mid WHERE tb.`aid` = '$aid'"; } else { $query = "SELECT * FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` WHERE `aid` = '$aid'"; } @@ -120,6 +120,7 @@ class Archives $this->Fields['uname'] = $this->addTableRow['uname']; } $this->Fields['face'] = empty($this->Fields['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $this->Fields['face']; + $this->Fields['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$this->Fields['userid']; } //!error } //php4构造函数 diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 95bebeba..1e897d2b 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -485,7 +485,7 @@ class FreeList } } } - $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face $addField FROM {$this->maintable} arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addJoin WHERE $orwhere $ordersql LIMIT $limitstart,".$this->pagesize; + $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid $addField FROM {$this->maintable} arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addJoin WHERE $orwhere $ordersql LIMIT $limitstart,".$this->pagesize; $this->dsql->SetQuery($query); $this->dsql->Execute("al"); $artlist = ""; @@ -555,6 +555,7 @@ class FreeList $row['image'] = ""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['title'] = cn_substr($row['title'], $titlelen); if ($row['color'] != "") { diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index 7b4d29be..0d91847f 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -463,7 +463,7 @@ class ListView } //如果不用默认的sortrank或id排序,使用联合查询数据量大时非常缓慢 if (preg_match('/hot|click|lastpost/', $orderby)) { - $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row"; + $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row"; } //普通情况先从arctiny表查出id,然后按di查询速度非常快 else { @@ -479,7 +479,7 @@ class ListView if ($idstr == '') { return ''; } else { - $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,mb.uname,mb.face $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE arc.id in($idstr) $ordersql "; + $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,mb.uname,mb.face,mb.userid $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE arc.id in($idstr) $ordersql "; } $t2 = ExecTime(); } @@ -546,6 +546,7 @@ class ListView $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; //编译附加表里的数据 foreach ($row as $k => $v) { @@ -872,7 +873,7 @@ class ListView } //如果不用默认的sortrank或id排序,使用联合查询数据量大时非常缓慢 if (preg_match('/hot|click|lastpost/', $orderby)) { - $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row"; + $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE {$this->addSql} $filtersql $ordersql LIMIT $limitstart,$row"; } //普通情况先从arctiny表查出id,然后按di查询速度非常快 else { @@ -888,7 +889,7 @@ class ListView if ($idstr == '') { return ''; } else { - $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,mb.uname,mb.face $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE arc.id in($idstr) $ordersql "; + $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,mb.uname,mb.face,mb.userid $addField FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb ON arc.mid=mb.mid $addJoin WHERE arc.id in($idstr) $ordersql "; } $t2 = ExecTime(); } @@ -961,6 +962,7 @@ class ListView $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; //编译附加表里的数据 foreach ($row as $k => $v) { diff --git a/src/system/archive/partview.class.php b/src/system/archive/partview.class.php index 6d6d4c39..ff09c45e 100755 --- a/src/system/archive/partview.class.php +++ b/src/system/archive/partview.class.php @@ -218,6 +218,15 @@ class PartView } return SpGetArcList($this->dsql,$templets,$typeid,$row,$col,$titlelen,$infolen,$imgwidth,$imgheight,$listtype,$orderby,$keyword,$innertext,$tablewidth,$arcid,$idlist,$channelid,$limit,$att,$order,$subday,$ismember,$maintable,$ctag); } + function GetAutoChannelID($sortid, $topid) + { + global $dsql; + if (empty($sortid)) $sortid = 1; + $getstart = $sortid - 1; + $row = $dsql->GetOne("SELECT id,typename FROM `#@__arctype` WHERE reid='{$topid}' And ispart<2 And ishidden<>'1' ORDER BY sortrank asc limit $getstart,1"); + if (!is_array($row)) return 0; + else return $row['id']; + } //关闭所占用的资源 function Close() { diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index a7c36cee..ca4f2bd1 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -523,7 +523,7 @@ class SearchView } } //搜索 - $query = "SELECT arc.*,act.typedir,act.typename,act.isdefault,act.defaultname,act.namerule,act.namerule2,act.ispart,act.moresite,act.siteurl,act.sitepath,mb.uname,mb.face FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` act ON arc.typeid=act.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE {$this->AddSql} $ordersql LIMIT $limitstart,$row"; + $query = "SELECT arc.*,act.typedir,act.typename,act.isdefault,act.defaultname,act.namerule,act.namerule2,act.ispart,act.moresite,act.siteurl,act.sitepath,mb.uname,mb.face,mb.userid FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` act ON arc.typeid=act.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE {$this->AddSql} $ordersql LIMIT $limitstart,$row"; $this->dsql->SetQuery($query); $this->dsql->Execute("al"); $artlist = ""; @@ -586,6 +586,7 @@ class SearchView $row['memberurl'] = $GLOBALS['cfg_memberurl']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; if (is_array($this->dtp2->CTags)) { foreach ($this->dtp2->CTags as $k => $ctag) { if ($ctag->GetName() == 'array') { diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 3439dc6c..34cb0966 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -387,7 +387,7 @@ class SgListView if ($idstr == '') { return ''; } else { - $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.aid IN($idstr) AND arc.arcrank >-1 $ordersql"; + $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,mb.userid,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.aid IN($idstr) AND arc.arcrank >-1 $ordersql"; } $t2 = ExecTime(); } @@ -450,6 +450,7 @@ class SgListView $row['memberurl'] = $GLOBALS['cfg_memberurl']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; //编译附加表里的数据 foreach ($row as $k => $v) $row[strtolower($k)] = $v; foreach ($this->ChannelUnit->ChannelFields as $k => $arr) { @@ -712,7 +713,7 @@ class SgListView $addField = 'arc.'.join(',arc.', $this->ListFields); //如果不用默认的sortrank或id排序,使用联合查询数据量大时非常缓慢 if (preg_match('/hot|click/', $orderby) || $this->sAddTable) { - $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE {$this->addSql} $ordersql LIMIT $limitstart,$row"; + $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,mb.userid,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE {$this->addSql} $ordersql LIMIT $limitstart,$row"; } //普通情况先从arctiny表查出id,然后按id查询速度非常快 else { @@ -729,7 +730,7 @@ class SgListView if ($idstr == '') { return ''; } else { - $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.aid IN($idstr) AND arc.arcrank >-1 $ordersql"; + $query = "SELECT tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,arc.aid,arc.aid AS id,arc.typeid,mb.uname,mb.face,mb.userid,$addField FROM `{$this->AddTable}` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.aid IN($idstr) AND arc.arcrank >-1 $ordersql"; } $t2 = ExecTime(); } @@ -798,6 +799,7 @@ class SgListView $row['memberurl'] = $GLOBALS['cfg_memberurl']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; //编译附加表里的数据 foreach ($row as $k => $v) $row[strtolower($k)] = $v; foreach ($this->ChannelUnit->ChannelFields as $k => $arr) { diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 0a32a461..fc4f22e1 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -165,6 +165,9 @@ class SpecView } } $this->dtp->Display(); + } + function DisplayPartTemplets(){ + } /** * 开始创建列表 @@ -324,7 +327,7 @@ class SpecView } else { $ordersql = " ORDER BY arc.sortrank desc"; } - $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,arc.money,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE $orwhere $ordersql LIMIT $limitstart,$row "; + $query = "SELECT arc.*,tp.typedir,tp.typename,tp.isdefault,arc.money,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE $orwhere $ordersql LIMIT $limitstart,$row "; $this->dsql->SetQuery($query); $this->dsql->Execute('al'); $artlist = ''; @@ -378,6 +381,7 @@ class SpecView $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; //编译附加表里的数据 foreach ($this->ChannelUnit->ChannelFields as $k => $arr) { diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index 0793a32c..5c6380bb 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -295,7 +295,7 @@ class TagList } else { $ordersql = " ORDER BY se.id $orderWay"; } - $query = "SELECT se.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face FROM `#@__archives` se LEFT JOIN `#@__arctype` tp ON se.typeid=tp.id LEFT JOIN `#@__member` mb on se.mid = mb.mid WHERE $orwhere $ordersql "; + $query = "SELECT se.*,tp.typedir,tp.typename,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath,mb.uname,mb.face,mb.userid FROM `#@__archives` se LEFT JOIN `#@__arctype` tp ON se.typeid=tp.id LEFT JOIN `#@__member` mb on se.mid = mb.mid WHERE $orwhere $ordersql "; $this->dsql->SetQuery($query); $this->dsql->Execute('al'); $row = $this->pagesize / $col; @@ -361,6 +361,7 @@ class TagList $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; if (is_array($this->dtp2->CTags)) { diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index cbfc66c7..c94f99cf 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -271,7 +271,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele $addfieldsSqlJoin = " LEFT JOIN `$addtable` addf ON addf.aid = arc.id "; } } - $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,mb.uname,mb.face $addfieldsSql FROM `$maintable` arc LEFT JOIN `#@__arctype` tp on arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addfieldsSqlJoin $orwhere $ordersql $limitsql"; + $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,mb.userid,mb.uname,mb.face $addfieldsSql FROM `$maintable` arc LEFT JOIN `#@__arctype` tp on arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addfieldsSqlJoin $orwhere $ordersql $limitsql"; //统一hash $taghash = md5(serialize($ctag).$typeid); $needSaveCache = true; @@ -292,7 +292,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele } //指定了id或使用缓存中的id if ($idlist != '') { - $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 $addfieldsSql FROM `$maintable` arc left join `#@__arctype` tp on arc.typeid=tp.id $addfieldsSqlJoin WHERE arc.id in($idlist) $ordersql "; + $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,mb.userid,mb.uname,mb.face $addfieldsSql FROM `$maintable` arc left join `#@__arctype` tp on arc.typeid=tp.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid $addfieldsSqlJoin WHERE arc.id in($idlist) $ordersql "; } $dsql->SetQuery($query); $dsql->Execute('al'); @@ -362,6 +362,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid']; $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; if (is_array($dtp2->CTags)) { diff --git a/src/system/taglib/feedback.lib.php b/src/system/taglib/feedback.lib.php index ba22be56..ff271956 100755 --- a/src/system/taglib/feedback.lib.php +++ b/src/system/taglib/feedback.lib.php @@ -46,6 +46,7 @@ function lib_feedback(&$ctag, &$refObj) $dsql->Execute('fb', $equery); while ($arr = $dsql->GetArray('fb')) { $arr['face'] = empty($arr['mface']) ? $GLOBALS['cfg_cmspath'].'/static/web/img/admin.png' : $arr['mface']; + $arr['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$arr['userid']; $arr['title'] = cn_substr($arr['arctitle'], $titlelen); $arr['msg'] = jsTrim(Html2Text($arr['msg']), $infolen); foreach ($ctp->CTags as $tagid => $ctag) { diff --git a/src/system/taglib/memberlist.lib.php b/src/system/taglib/memberlist.lib.php index 8c9caaa5..fb3a0179 100755 --- a/src/system/taglib/memberlist.lib.php +++ b/src/system/taglib/memberlist.lib.php @@ -26,10 +26,8 @@ function lib_memberlist(&$ctag, &$refObj) $ctp->LoadSource($innerText); $dsql->Execute('mb', $sql); while ($row = $dsql->GetArray('mb')) { - $row['spaceurl'] = $GLOBALS['cfg_basehost'].'/user/index.php?uid='.$row['userid']; - if (empty($row['face'])) { - $row['face'] = ($row['sex'] == '女') ? $GLOBALS['cfg_memberurl'].'/templets/images/dfgirl.png' : $GLOBALS['cfg_memberurl'].'/templets/images/dfboy.png'; - } + $row['userurl'] = $row['spaceurl'] = $GLOBALS['cfg_basehost'].'/user/index.php?uid='.$row['userid']; + $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; foreach ($ctp->CTags as $tagid => $ctag) { if (isset($row[$ctag->GetName()])) { $ctp->Assign($tagid, $row[$ctag->GetName()]); diff --git a/src/system/tpllib/plus_channel.php b/src/system/tpllib/plus_channel.php index f45499ba..95138d2f 100755 --- a/src/system/tpllib/plus_channel.php +++ b/src/system/tpllib/plus_channel.php @@ -3,7 +3,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); /** * 动态模板channel标签 * - * @version $id:plus_ask.php 13:58 2010年7月5日 tianya $ + * @version $id:plus_channel.php 13:58 2010年7月5日 tianya $ * @package DedeBIZ.Tpllib * @copyright Copyright (c) 2022 DedeBIZ.COM * @license GNU GPL v2 (https://www.dedebiz.com/license) diff --git a/src/system/tpllib/plus_memberlist.php b/src/system/tpllib/plus_memberlist.php index 231c97ba..a505f5f4 100755 --- a/src/system/tpllib/plus_memberlist.php +++ b/src/system/tpllib/plus_memberlist.php @@ -22,10 +22,8 @@ function plus_memberlist(&$atts, &$refObj, &$fields) $sql = "SELECT mb.*,ms.spacename,ms.sign FROM `#@__member` mb LEFT JOIN `#@__member_space` ms ON ms.mid = mb.mid $wheresql ORDER BY mb.{$orderby} DESC LIMIT 0,$row "; $dsql->Execute('mb', $sql); while ($row = $dsql->GetArray('mb')) { - $row['spaceurl'] = $GLOBALS['cfg_basehost'].'/user/index.php?uid='.$row['userid']; - if (empty($row['face'])) { - $row['face'] = ($row['sex'] == '?') ? $GLOBALS['cfg_memberurl'].'/templets/images/dfgirl.png' : $GLOBALS['cfg_memberurl'].'/templets/images/dfboy.png'; - } + $row['userurl'] = $row['spaceurl'] = $GLOBALS['cfg_basehost'].'/user/index.php?uid='.$row['userid']; + $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face']; $rearray[] = $row; } return $rearray; diff --git a/src/system/tpllib/plus_userarclist.php b/src/system/tpllib/plus_userarclist.php new file mode 100644 index 00000000..425c9673 --- /dev/null +++ b/src/system/tpllib/plus_userarclist.php @@ -0,0 +1,71 @@ +SetQuery($sql); + $dsql->Execute("ul"); + $rearr = array(); + while($row = $dsql->GetArray("ul")) + { + //处理一些特殊字段 + $row['infos'] = cn_substr($row['description'],$infolen); + $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'] = '/images/defaultpic.gif'; + if(!preg_match("#^(http|https):\/\/#i", $row['litpic'])) + { + $row['picname'] = $row['litpic'] = $GLOBALS['cfg_cmsurl'].$row['litpic']; + } else { + $row['picname'] = $row['litpic']; + } + $row['stime'] = GetDateMK($row['pubdate']); + $row['typelink'] = "".$row['typename'].""; + $row['image'] = "".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['textlink'] = "".$row['title'].""; + $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; + $row['memberurl'] = $GLOBALS['cfg_memberurl']; + $row['templeturl'] = $GLOBALS['cfg_templeturl']; + + $rearr[] = $row; + } + $dsql->FreeResult("ul"); + return $rearr; +} +?> \ No newline at end of file diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm index 412bd779..2db2d81b 100644 --- a/src/theme/dedebiz/article_article.htm +++ b/src/theme/dedebiz/article_article.htm @@ -37,7 +37,7 @@

{dede:field.title/}

- {dede:field.uname/} + {dede:field.uname/} {dede:field.pubdate function="MyDate('Y-m-d',@me)"/} {dede:field.source/} diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index 721499c2..d81f1f3e 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -36,7 +36,7 @@

{dede:field.title/}