Browse Source

结构调整

tags/6.1.0^2
tianya 3 years ago
parent
commit
446e3869cf
7 changed files with 14 additions and 7 deletions
  1. +1
    -1
      src/admin/templets/tags_main.htm
  2. +1
    -1
      src/apps/tags.php
  3. +3
    -2
      src/system/archive/taglist.class.php
  4. +1
    -1
      src/system/database/dedesqli.class.php
  5. +3
    -0
      src/system/database/dedesqlite.class.php
  6. +4
    -1
      src/system/taglib/tag.lib.php
  7. +1
    -1
      src/templets/muban/taglist.htm

+ 1
- 1
src/admin/templets/tags_main.htm View File

@@ -157,7 +157,7 @@
<input type="checkbox" name="ids[]" value="<?php echo $fields['id']; ?>" class='np' /> <input type="checkbox" name="ids[]" value="<?php echo $fields['id']; ?>" class='np' />
</td> </td>
<td> <td>
<a href="../tags.php?/<?php echo urlencode($fields['tag']); ?>/" target="_blank">{dede:field.tag/}</a>
<a href="../apps/tags.php?/<?php echo urlencode($fields['tag']); ?>/" target="_blank">{dede:field.tag/}</a>
</td> </td>
<td> <td>
<input type="text" value="<?php echo $fields['count']; ?>" id="count<?php echo $fields['id']; ?>" size='5' /> <input type="text" value="<?php echo $fields['count']; ?>" id="count<?php echo $fields['id']; ?>" size='5' />


src/tags.php → src/apps/tags.php View File

@@ -6,7 +6,7 @@
* @license https://www.dedebiz.com/license * @license https://www.dedebiz.com/license
* @link https://www.dedebiz.com * @link https://www.dedebiz.com
*/ */
require_once(dirname(__FILE__)."/system/common.inc.php");
require_once(dirname(__FILE__)."/../system/common.inc.php");
require_once(DEDEINC."/archive/taglist.class.php"); require_once(DEDEINC."/archive/taglist.class.php");
$PageNo = 1; $PageNo = 1;

+ 3
- 2
src/system/archive/taglist.class.php View File

@@ -115,8 +115,8 @@ class TagList
//关闭相关资源 //关闭相关资源
function Close() function Close()
{ {
@$this->dsql->Close();
@$this->TypeLink->Close(); @$this->TypeLink->Close();
@$this->dsql->Close();
} }
/** /**
@@ -203,8 +203,9 @@ class TagList
if ($this->Tag != '') { if ($this->Tag != '') {
$this->ParseDMFields($this->PageNo, 0); $this->ParseDMFields($this->PageNo, 0);
} }
$this->Close();
$this->dtp->Display(); $this->dtp->Display();
// $this->Close();
} }
/** /**


+ 1
- 1
src/system/database/dedesqli.class.php View File

@@ -496,7 +496,7 @@ class DedeSqli
if (!is_array($this->result)) { if (!is_array($this->result)) {
return ''; return '';
} }
foreach ($this->result as $kk => $vv) {
foreach ($this->result as $vv) {
if ($vv) { if ($vv) {
@mysqli_free_result($vv); @mysqli_free_result($vv);
} }


+ 3
- 0
src/system/database/dedesqlite.class.php View File

@@ -33,6 +33,9 @@ if (!defined('MYSQL_BOTH')) {
if (!defined('MYSQL_ASSOC')) { if (!defined('MYSQL_ASSOC')) {
define('MYSQL_ASSOC', SQLITE3_ASSOC); define('MYSQL_ASSOC', SQLITE3_ASSOC);
} }
if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
mysqli_report(MYSQLI_REPORT_OFF);
}
class DedeSqlite class DedeSqlite
{ {
var $linkID; var $linkID;


+ 4
- 1
src/system/taglib/tag.lib.php View File

@@ -25,6 +25,9 @@ function lib_tag(&$ctag, &$refObj)
$num = $row; $num = $row;
$dd = $dsql->GetOne("SELECT ROUND(AVG(total)) as tt FROM `#@__tagindex`"); //取一个平均 $dd = $dsql->GetOne("SELECT ROUND(AVG(total)) as tt FROM `#@__tagindex`"); //取一个平均
if (!$dd['tt']) {
$dd['tt'] = 0;
}
$addsql = "WHERE 1=1 AND total >= {$dd['tt']}"; $addsql = "WHERE 1=1 AND total >= {$dd['tt']}";
if ($getall == 0 && isset($refObj->Fields['tags']) && !empty($refObj->Fields['aid'])) { if ($getall == 0 && isset($refObj->Fields['tags']) && !empty($refObj->Fields['aid'])) {
@@ -64,7 +67,7 @@ function lib_tag(&$ctag, &$refObj)
if (isset($envs['makeTag']) && $envs['makeTag'] == 1) { if (isset($envs['makeTag']) && $envs['makeTag'] == 1) {
$row['link'] = $cfg_cmsurl."/a/tags/".GetPinyin($row['keyword'])."/"; $row['link'] = $cfg_cmsurl."/a/tags/".GetPinyin($row['keyword'])."/";
} else { } else {
$row['link'] = $cfg_cmsurl."/tags.php?/".urlencode($row['keyword'])."/";
$row['link'] = $cfg_cmsurl."/apps/tags.php?/".urlencode($row['keyword'])."/";
} }
$row['highlight'] = mt_rand(1, 10); $row['highlight'] = mt_rand(1, 10);


+ 1
- 1
src/templets/muban/taglist.htm View File

@@ -27,7 +27,7 @@
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb mb-0"> <ol class="breadcrumb mb-0">
<li class="breadcrumb-item">当前位置</li> <li class="breadcrumb-item">当前位置</li>
<li class="breadcrumb-item"><a href='/tags.php'>TAG标签</a></li>
<li class="breadcrumb-item"><a href='/apps/tags.php'>TAG标签</a></li>
<li class="breadcrumb-item">{dede:field.title /}</li> <li class="breadcrumb-item">{dede:field.title /}</li>
</ol> </ol>
</nav> </nav>


Loading…
Cancel
Save