Merge branch 'develop' into adminsite

docs/changelog.md

@@ -1,14 +1,14 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
-# V6.5.10
+# V6.5.9
+- 支持设置是否开启自动检查更新；
+- 增加数据表注释，方便开发者进行二次开发，移除无用表；
 - 全面移除IE浏览器多余代码；
 - 调整文档分页过多导致的手机端前台适配问题；
 - 优化文档分页title标题；
-- 优化海外站与官方通信网络问题；
 - 修正自动提取关键词功能；
 - 修正开启绝对链接文档正文上传图片问题；
-- 调整支持htpps综合功能，如：远程图片下载问题；
 - 其他常规问题修复；
 
 # V6.5.8

src/admin/archives_do.php

@@ -113,8 +113,8 @@ else if ($dopost == "viewArchives") {
         $arcRow['money'],
         $arcRow['filename']
     );
-    if (preg_match("#^http:#", $arcfile)) {
-        $arcfile = preg_replace("#^http:\/\/([^\/]*)\/#i", '/', $arcfile);
+    if (preg_match("#^https?://#", $arcfile)) {
+        $arcfile = preg_replace("#^https?://[^/]+/#i", '/', $arcfile);
     }
     $truefile = GetTruePath().$arcfile;
     if (!file_exists($truefile)) {

src/admin/member_do.php

@@ -37,8 +37,6 @@ if ($dopost == "delmember") {
             if ($rs > 0) {
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_tj` WHERE mid='$id' LIMIT 1");
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid='$id' LIMIT 1");
-                $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid='$id' LIMIT 1");
-                $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid='$id' LIMIT 1");
                 //删除会员相关数据
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid='$id' ");
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid='$id' ");
@@ -83,8 +81,6 @@ if ($dopost == "delmember") {
             if ($rs > 0) {
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_tj` WHERE mid IN (".str_replace("`", ",", $id).") ");
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid IN (".str_replace("`", ",", $id).") ");
-                $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid IN (".str_replace("`", ",", $id).") ");
-                $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid IN (".str_replace("`", ",", $id).") ");
                 //删除会员相关数据
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid IN (".str_replace("`", ",", $id).") ");
                 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid IN (".str_replace("`", ",", $id).") ");

src/admin/sys_admin_user_add.php

@@ -55,13 +55,10 @@ if ($dopost == 'add') {
     $inquery = "INSERT INTO `#@__admin`(id,usertype,userid,$pfd,uname,typeid,tname,email)
         VALUES ('$mid','$usertype','$userid','$pwd','$uname','$typeid','$tname','$email'); ";
     $rs = $dsql->ExecuteNoneQuery($inquery);
-    $adminquery = "INSERT INTO `#@__member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`)
-        VALUES ('$mid', '1', '男', '{$userid}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); ";
-    $dsql->ExecuteNoneQuery($adminquery);
     $adminquery = "INSERT INTO `#@__member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`)
         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`)
+    $adminquery = "INSERT INTO `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`)
         VALUES ('$mid','10','0','{$uname}的主页','','person','',''); ";
     $dsql->ExecuteNoneQuery($adminquery);
     ShowMsg('成功添加一个账户', 'sys_admin_user.php');

src/admin/templets/mychannel_add.htm

@@ -79,14 +79,8 @@
 									<tr>
 										<td>会员投稿组</td>
 										<td>
-											<?php
-											$dsql->SetQuery("SELECT * FROM `#@__member_model`");
-											$dsql->Execute();
-											while($row3 = $dsql->GetObject())
-											{
-												echo "<label><input type='radio' name='usertype' value=".$row3->name."> ".$row3->name."</label> ";
-											}
-											?>
+											<label><input type='radio' name='usertype' value='个人'> 个人</label>
+											<label><input type='radio' name='usertype' value='企业'> 企业</label>
 											<label><input type="radio" name="usertype" checked> 不限</label>
 										</td>
 									</tr>

src/admin/templets/mychannel_edit.htm

@@ -80,15 +80,9 @@
 									<tr>
 										<td>会员投稿组</td>
 										<td>
-											<?php
-											$dsql->SetQuery("SELECT * FROM `#@__member_model`");
-											$dsql->Execute();
-											while($row3 = $dsql->GetObject())
-											{
-												echo "<label><input type='radio' name='usertype' value='".$row3->name."'".($row['usertype']==$row3->name? "checked" : "")."> ".$row3->name."</label> ";
-											}
-											?>
-											<label><input type="radio" name="usertype" value="0" <?php if ($row['usertype']=='') echo 'checked';?>> 不限</label>
+											<label><input type='radio' name='usertype' value='个人'<?php echo $row['usertype']=='个人'? " checked" : "";?>> 个人</label>
+											<label><input type='radio' name='usertype' value='企业' <?php echo $row['usertype']=='企业' ? " checked" : "" ;?>> 企业</label>
+											<label><input type="radio" name="usertype" value="0" <?php if ($row['usertype']=='' ) echo 'checked' ;?>> 不限</label>
 										</td>
 									</tr>
 									<tr>

src/data/admin/update.txt

@@ -68,7 +68,6 @@ CREATE TABLE `#@__statistics_detail` (`id` int NOT NULL AUTO_INCREMENT,
 ALTER TABLE `#@__addonarticle` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__addonimages` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__addoninfos` MODIFY COLUMN `userip` varchar(46) NOT NULL DEFAULT '' AFTER `litpic`;
-ALTER TABLE `#@__addonshop` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__addonsoft` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__addonspec` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`;
 ALTER TABLE `#@__admin` MODIFY COLUMN `loginip` varchar(46) NOT NULL DEFAULT '' AFTER `logintime`;

src/install/index.php

@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.5.8'; //详细版本号
+$cfg_version_detail = '6.5.9'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);

src/system/common.inc.php

@@ -202,7 +202,7 @@ $cfg_medias_dir = $cfg_cmspath.$cfg_medias_dir;
 $cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir;
 //程序信息摘要，请不要删除则系统无法接收升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.5.8';//详细版本号
+$cfg_version_detail = '6.5.9';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';

src/system/helpers/upload.helper.php

@@ -181,7 +181,7 @@ if (!function_exists('MemberUploads')) {
                 exit('Not allow filename for not safe!');
             } else if (!preg_match("/\.(".$allAllowType.")$/", $handname)) {
                 exit('Not allow filename for filetype!');
-            } else if (!preg_match('#^http:#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) {
+            } else if (!preg_match('#^(http|https):#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) {
                 exit('Not allow filename for not userdir!');
             }
             return $handname;

src/system/taglib/channel/img.lib.php

@@ -82,10 +82,10 @@ function ch_img($fvalue, &$arcTag, &$refObj, $fname = '')
             }
             if ($cfg_multi_site == 'Y') {
                 //$cfg_basehost)
-                if (!preg_match('#^http:#i', $fields['imgsrc'])) {
+                if (!preg_match('#^(http|https):#i', $fields['imgsrc'])) {
                     $fields['imgsrc'] = $cfg_basehost.$fields['imgsrc'];
                 }
-                if (!preg_match('#^http:#i', $fields['ddimg'])) {
+                if (!preg_match('#^(http|https):#i', $fields['ddimg'])) {
                     $fields['ddimg'] = $cfg_basehost.$fields['ddimg'];
                 }
             }