Browse Source

常规问题修复

tags/6.2.0
llgoer 1 year ago
parent
commit
6c2ca127d0
7 changed files with 31 additions and 30 deletions
  1. +5
    -4
      src/admin/sys_sql_query.php
  2. +1
    -1
      src/admin/templets/sys_sql_query.htm
  3. +15
    -15
      src/install/sql-dftables.txt
  4. +3
    -3
      src/system/database/dedesqlite.class.php
  5. +2
    -2
      src/system/taglib/flink.lib.php
  6. +4
    -4
      src/user/inc/inc_catalog_options.php
  7. +1
    -1
      src/user/templets/album_edit.htm

+ 5
- 4
src/admin/sys_sql_query.php View File

@@ -90,14 +90,15 @@ else if ($dopost == "query") {
echo "删除数据表或数据库的语句不允许在这里执行";
exit();
}
echo '<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">';
//运行查询语句
if (preg_match("#^select #i", $sqlquery)) {
$dsql->SetQuery($sqlquery);
$dsql->Execute();
if ($dsql->GetTotalRow() <= 0) {
echo "运行SQL<span class='text-primary'>{$sqlquery}</span>,无返回记录<br>";
echo "运行SQL<span class='text-primary'>{$sqlquery}</span>,无返回记录<br>";
} else {
echo "运行SQL<span class='text-primary'>{$sqlquery}</span>,共有<span class='text-primary'>".$dsql->GetTotalRow()."</span>条记录,最大返回100条<br>";
echo "运行SQL<span class='text-primary'>{$sqlquery}</span>,共有<span class='text-primary'>".$dsql->GetTotalRow()."</span>条记录,最大返回100条<br>";
}
$j = 0;
while ($row = $dsql->GetArray()) {
@@ -106,10 +107,10 @@ else if ($dopost == "query") {
break;
}
echo "<hr size=1 width='100%'/>";
echo "记录<span class='text-primary'>$j</span>";
echo "记录<span class='text-primary'>$j</span>";
echo "<hr size=1 width='100%'/>";
foreach ($row as $k => $v) {
echo "<span class='text-primary'>{$k}</span>{$v}<br>\r\n";
echo "<span class='text-primary'>{$k}</span>{$v}<br>\r\n";
}
}
exit();


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

@@ -80,7 +80,7 @@
<td colspan="2"><textarea name="sqlquery" id="sqlquery"></textarea></td>
</tr>
<tr>
<td colspan="2" align="center" class="py-2"><button type="submit" class="btn btn-success btn-sm">保存</button></td>
<td colspan="2" align="center" class="py-2"><button type="submit" class="btn btn-success btn-sm">运行</button></td>
</tr>
</form>
</table>


+ 15
- 15
src/install/sql-dftables.txt View File

@@ -892,21 +892,21 @@ CREATE TABLE `#@__statistics` (
DROP TABLE IF EXISTS `#@__statistics_detail`;
CREATE TABLE `#@__statistics_detail` (
`id` int NOT NULL AUTO_INCREMENT,
`t` int DEFAULT NULL COMMENT 'unixtime',
`created_date` int DEFAULT NULL COMMENT '日期,20220326',
`created_hour` int DEFAULT NULL COMMENT '时间,12',
`dduuid` varchar(32) DEFAULT NULL COMMENT 'uuid',
`ssid` varchar(32) DEFAULT NULL COMMENT 'session_id',
`ip` varchar(46) DEFAULT NULL COMMENT 'ip地址',
`browser` varchar(50) DEFAULT NULL COMMENT '浏览器',
`device` varchar(50) DEFAULT NULL COMMENT '设备',
`device_type` varchar(10) DEFAULT NULL COMMENT '设备类型',
`os` varchar(20) DEFAULT NULL COMMENT '操作系统',
`url_type` tinyint DEFAULT NULL COMMENT '访问地址类型:0:未知 1:列表 2:文档 3:搜索 4:TAG',
`typeid` int DEFAULT NULL COMMENT '栏目id',
`aid` int DEFAULT NULL COMMENT '文档ID',
`value` varchar(50) DEFAULT NULL COMMENT '值',
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`t` int DEFAULT NULL,
`created_date` int DEFAULT NULL,
`created_hour` int DEFAULT NULL,
`dduuid` varchar(32) DEFAULT NULL,
`ssid` varchar(32) DEFAULT NULL,
`ip` varchar(46) DEFAULT NULL,
`browser` varchar(50) DEFAULT NULL,
`device` varchar(50) DEFAULT NULL,
`device_type` varchar(10) DEFAULT NULL,
`os` varchar(20) DEFAULT NULL,
`url_type` tinyint DEFAULT NULL,
`typeid` int DEFAULT NULL,
`aid` int DEFAULT NULL,
`value` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_created_date_dduuid` (`created_date`,`dduuid`),
KEY `idx_created_date_ip` (`created_date`,`ip`),


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

@@ -161,7 +161,7 @@ class DedeSqlite
function ExecuteNoneQuery($sql = '')
{
global $dsqlite;
if (!$dsqlite->isInit) {
if (!@$dsqlite->isInit) {
$this->Init($this->pconnect);
}
if ($dsqlite->isClose) {
@@ -235,7 +235,7 @@ class DedeSqlite
function Execute($id = "me", $sql = '')
{
global $dsqlite;
if (!$dsqlite->isInit) {
if (!@$dsqlite->isInit) {
$this->Init($this->pconnect);
}
if ($dsqlite->isClose) {
@@ -275,7 +275,7 @@ class DedeSqlite
function GetOne($sql = '', $acctype = SQLITE3_ASSOC)
{
global $dsqlite;
if (!$dsqlite->isInit) {
if (!@$dsqlite->isInit) {
$this->Init($this->pconnect);
}
if ($dsqlite->isClose) {


+ 2
- 2
src/system/taglib/flink.lib.php View File

@@ -37,8 +37,8 @@ function lib_flink(&$ctag, &$refObj)
if (trim($ctag->GetInnerText()) == '') $innertext = "[field:link/] ";
else $innertext = $ctag->GetInnerText();
$dsql->SetQuery($equery);
$dsql->Execute();
while ($dbrow = $dsql->GetObject()) {
$dsql->Execute('fl');
while ($dbrow = $dsql->GetObject('fl')) {
if ($type == 'text' || $type == 'textall') {
$link = "<a href='".$dbrow->url."' target='_blank'>".cn_substr($dbrow->webname, $titlelen)."</a> ";
} else if ($type == 'image') {


+ 4
- 4
src/user/inc/inc_catalog_options.php View File

@@ -20,17 +20,17 @@ function GetOptionList($selid = 0, $channeltype = 0)
{
global $OptionArrayList, $channels, $dsql;
$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` ");
$dsql->Execute();
$dsql->Execute('opt');
$channels = array();
while ($row = $dsql->GetObject()) {
while ($row = $dsql->GetObject('opt')) {
$channels[$row->id] = $row->typename;
}
$OptionArrayList = "";
$query = "SELECT id,typename,ispart,channeltype,issend FROM `#@__arctype` WHERE ispart<2 AND reid=0 ORDER BY sortrank ASC";
$dsql->SetQuery($query);
$dsql->Execute();
$dsql->Execute('arr');
$selected = '';
while ($row = $dsql->GetObject()) {
while ($row = $dsql->GetObject('arr')) {
if ($selid == $row->id) {
$selected = " selected='$selected'";
}


+ 1
- 1
src/user/templets/album_edit.htm View File

@@ -105,7 +105,7 @@
$dtp->Clear();
?>
<script>
startNum = <? php echo $j;?>;
startNum = <?php echo $j;?>;
</script>
<div class="text-center">
<button type="submit" class="btn btn-success">提交</button>


Loading…
Cancel
Save