扩展函数调整

src/system/common.func.php

@@ -9,6 +9,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
  * @license        GNU GPL v2 (https://www.dedebiz.com/license)
  * @link           https://www.dedebiz.com
  */
+require_once DEDEINC."/archive/partview.class.php";
 if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
     if (!function_exists('mysql_connect') and function_exists('mysqli_connect')) {
         function mysql_connect($server, $username, $password)
@@ -704,6 +705,7 @@ function DedeSearchAPIURL($action, $parms=array())
 
     return $finalUrl;
 }
+
 function ConvertMysqlToSqlite($mysqlQuery) {
     //移除CHARACTER SET和COLLATE
     $query = preg_replace('/character set \S+/i', '', $mysqlQuery);
@@ -785,6 +787,15 @@ function ConvertMysqlToSqlite($mysqlQuery) {
     $query = str_ireplace('rand', 'RANDOM', $query);
     return trim($query);
 }
+
+function ThemeInclude($path)
+{
+    global $cfg_basedir, $cfg_templets_dir, $cfg_df_style;
+    $tmpfile = $cfg_basedir.$cfg_templets_dir.'/'.$cfg_df_style.'/'.$path;
+    $dtp = new PartView();
+    $dtp->SetTemplet($tmpfile);
+    $dtp->Display();
+}
 //自定义函数接口
 if (file_exists(DEDEINC.'/extend.func.php')) {
     require_once(DEDEINC.'/extend.func.php');

src/system/extend.func.php

@@ -3,154 +3,13 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 /**
  * 扩展函数
  * 
- * @version        $id:extend.func.php 2 20:50 2010年7月7日 tianya $
+ * @version        $id:extend.func.php 2025 tianya $
  * @package        DedeBIZ.Libraries
  * @copyright      Copyright (c) 2022 DedeBIZ.COM
  * @license        GNU GPL v2 (https://www.dedebiz.com/license)
  * @link           https://www.dedebiz.com
  */
-/*会员中心调用主题模板<?php obtaintheme('head.htm');?>*/
-if (!function_exists('obtaintheme')) {
-    require_once DEDEINC."/archive/partview.class.php";
-    function obtaintheme($path)
-    {
-        global $cfg_basedir, $cfg_templets_dir, $cfg_df_style;
-        $tmpfile = $cfg_basedir.$cfg_templets_dir.'/'.$cfg_df_style.'/'.$path;
-        $dtp = new PartView();
-        $dtp->SetTemplet($tmpfile);
-        $dtp->Display();
-    }
-}
-//标签调用[field:id function='obtaintags(@me,3)'/]3表示调用文档3个标签
-function obtaintags($aid, $num = 3)
-{
-    global $dsql, $cfg_cmspath, $cfg_rewrite;
-    $newtag = '';
-    $query = "SELECT * FROM `#@__taglist` WHERE aid='$aid' LIMIT $num";
-    $dsql->Execute('tag', $query);
-    while ($row = $dsql->GetArray('tag')) {
-        if ($cfg_rewrite == 'Y') {
-            $link = $cfg_cmspath."/tags/{$row['tid']}";
-        } else {
-            $link = $cfg_cmspath."/apps/tags.php?/{$row['tid']}";
-        }
-        $newtag .= ($newtag == '' ? "<a href=\"{$link}\">{$row['tag']}</a>" : "、<a href=\"{$link}\">{$row['tag']}</a>");
-    }
-    return $newtag;
-}
-//提取文档多图片[field:body function='obtainimgs(@me,3)'/]3表示调用文档3张图片，例如：文档模型body字段，列表附加字段添加body，dede:arclist标签调用添加channelid='1' addfields='body'
-function obtainimgs($string, $num)
-{
-    preg_match_all("/<img([^>]*)\s*src=('|\")([^'\"]+)('|\")/", $string, $matches);
-    $imgsrc_arr = array_unique($matches[3]);
-    $i = 0;
-    $newimg = '';
-    foreach ($imgsrc_arr as $imgsrc)
-    {
-        if ($i == $num) break;
-        $newimg .= "<img src=\"{$imgsrc}\">";
-        $i++;
-    }
-    return $newimg;
-}
-//文档图片注释自动为标题{dede:field.body function='obtainalt(@me)'/}
-function obtainalt($newalt)
-{
-    global $dsql, $id, $aid;
-    $imgid = isset($id) ? $id : $aid;
-    $row = $dsql->GetOne("SELECT title FROM `#@__archives` WHERE id='$imgid'");
-    //检查$row是否有效
-    $title = isset($row['title']) ? $row['title'] : '';
-    //图片注释自动为标题
-    $newalt = str_ireplace(array('alt=""', 'alt=\'\'', 'title=""', 'title=\'\''), "", $newalt);
-    $newalt = str_ireplace("<img", "<img alt=\"{$title}\" title=\"{$title}\"", $newalt);
-    //去掉图片宽度和高度
-    $newalt = preg_replace("/style=\"width\:(.*)\"/", "", $newalt);
-    //去掉结尾多余的空格和斜杠
-    $newalt = str_ireplace("  ", " ", $newalt);
-    $newalt = str_ireplace(" /", "", $newalt);
-    return $newalt;
-}
-//联动单筛选{dede:php}obtainfilter(模型id,类型,'字段1,字段2');{/dede:php}类型表示前台展现方式，对应case值，例如：文档模型style字段radio选项卡类型，列表附加字段类别添加style，标签调用{dede:php}obtainfilter(1,1,'style');{/dede:php}
-function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0, $toptid = 0, $loadtype = 'autofield')
-{
-    global $dsql, $tid, $id, $aid, $cfg_rewrite;
-    $tid = $defaulttid ? $defaulttid : $tid;
-    if ($id != "" || $aid != "") {
-        $arcid = $id != "" ? $id : $aid;
-        $tidsq = $dsql->GetOne("SELECT * FROM `#@__archives` WHERE id='$arcid'");
-        $tid = $toptid == 0 ? $tidsq["typeid"] : $tidsq["topid"];
-    }
-    $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".$_REQUEST['PageNo'] : '');
-    if ($cfg_rewrite == 'Y') {
-        $filterarr = stripos($_SERVER['REQUEST_URI'], "list/") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/list/".$tid;
-    } else {
-        $filterarr = stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/apps/list.php?tid=".$tid;
-    }
-    $cInfos = $dsql->GetOne("SELECT * FROM  `#@__channeltype` WHERE id='$channelid'");
-    $fieldset=$cInfos['fieldset'];
-    $dtp = new DedeTagParse();
-    $dtp->SetNameSpace('field', '<', '>');
-    $dtp->LoadSource($fieldset);
-    $biz_addonfields = '';
-    if (is_array($dtp->CTags)) {
-        foreach($dtp->CTags as $tida=>$ctag)
-        {
-            $fieldsname = $fieldsnamef ? explode(",", $fieldsnamef) : explode(",", $ctag->GetName());
-            if (($loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)) && in_array($ctag->GetName(), $fieldsname)) {
-                $href1 = explode($ctag->GetName().'=', $filterarr);
-                $href2 = explode('&', $href1[1]);
-                $fields_value = $href2[0];
-                switch ($type) {
-                    case 1:
-                        $biz_addonfields .= '<p>';
-                        $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? '<a href="'.str_replace("&".$ctag->GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-outline-success btn-sm">全部</a>' : '<a href="'.str_replace("&".$ctag->GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-success btn-sm">全部</a>');
-                        $addonfields_items = explode(",",$ctag->GetAtt('default'));
-                        for ($i=0; $i<count($addonfields_items); $i++)
-                        {
-                            $href = stripos($filterarr,$ctag->GetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]);
-                            $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? '<a title="'.$addonfields_items[$i].'" href="'.$href.'" class="btn btn-outline-success btn-sm">'.$addonfields_items[$i].'</a>' : '<a href="'.$href.'" class="btn btn-success btn-sm">'.$addonfields_items[$i].'</a>');
-                        }
-                        $biz_addonfields .= '</p>';
-                    break;
-                    case 2:
-                        $biz_addonfields .= '<select name="filter'.$ctag->GetName().'" onchange="window.location=this.options[this.selectedIndex].value" class="form-control w-25 mr-3">
-                            '.'<option value="'.str_replace("&".$ctag->GetName()."=".$fields_value,"",$filterarr).'">全部</option>';
-                        $addonfields_items = explode(",",$ctag->GetAtt('default'));
-                        for ($i=0; $i<count($addonfields_items); $i++)
-                        {
-                            $href = stripos($filterarr,$ctag->GetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]);
-                            $biz_addonfields .= '<option value="'.$href.'"'.($fields_value==urlencode($addonfields_items[$i]) ? ' selected="selected"' : '').'>'.$addonfields_items[$i].'</option>
-                            ';
-                        }
-                        $biz_addonfields .= '</select>';
-                    break;
-                    case 3:
-                        $biz_addonfields .= '<p>';
-                        $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? '<a href="'.str_replace("&".$ctag->GetName()."=".$fields_value,"",$filterarr).'"><input type="radio" name="filter'.$ctag->GetName().'" value="'.str_replace("&".$ctag->GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部</a>' : '<span><input type="radio" name="filter'.$ctag->GetName().'" checked>全部</span>');
-                        $addonfields_items = explode(",",$ctag->GetAtt('default'));
-                        for ($i=0; $i<count($addonfields_items); $i++)
-                        {
-                            $href = stripos($filterarr,$ctag->GetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]);
-                            $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? '<a title="'.$addonfields_items[$i].'" href="'.$href.'"><input type="radio" name="filter'.$ctag->GetName().'" value="'.$href.'" onclick="window.location=this.value">'.$addonfields_items[$i].'</a>' : '<span><input type="radio" name="filter'.$ctag->GetName().'" checked>'.$addonfields_items[$i].'</span>');
-                        }
-                        $biz_addonfields .= '</p>';
-                    break;
-                }
-            }
-        }
-    }
-    echo $biz_addonfields;
-}
-//联动单筛选获取附加表
-function litimgurls($imgid = 0)
-{
-    global  $dsql, $lit_imglist;
-    $row = $dsql->GetOne("SELECT c.addtable FROM `#@__archives` AS a LEFT JOIN `#@__channeltype` AS c ON a.channel=c.id WHERE a.id='$imgid'");
-    $addtable = trim($row['addtable']);
-    $row = $dsql->GetOne("SELECT imgurls FROM `$addtable` WHERE aid='$imgid'");
-    $ChannelUnit = new ChannelUnit(2, $imgid);
-    $lit_imglist = $ChannelUnit->GetlitImgLinks($row['imgurls']);
-    return $lit_imglist;
-}
+// 当前文件用于用户进行自定义扩展函数，官方开发不要动这个文件
+
+
 ?>

src/system/typelink/typeunit.class.admin.php

@@ -70,7 +70,7 @@ class TypeUnit
      * @access    public
      * @param     int   $channel  栏目id
      * @param     int   $nowdir  当前操作ID
-     * @return    string
+     * @return    void
      */
     function ListAllType($channel = 0, $nowdir = 0)
     {

src/system/typelink/typeunit.class.menu.php

@@ -52,7 +52,7 @@ class TypeUnit
      * @access    public
      * @param     int   $channel  栏目id
      * @param     int   $nowdir  当前操作ID
-     * @return    string
+     * @return    void
      */
     function ListAllType($channel = 0, $nowdir = 0)
     {
@@ -115,7 +115,7 @@ class TypeUnit
      * @param     int  $id  栏目id
      * @param     string  $step  层级标志
      * @param     bool  $needcheck  权限
-     * @return    string
+     * @return    void
      */
     function LogicListAllSunType($id, $step, $needcheck = true)
     {

src/theme/apps/download_links.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -24,6 +24,6 @@
 				</tr>
 			</table>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/flink_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -72,6 +72,6 @@
 				</table>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/flink_list.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -41,6 +41,6 @@
 			?>
 			</ul>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/heightsearch.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<form name="form1" action="<?php echo $cfg_phpurl?>/search.php" method="get">
 				<table class="table mb-0">
@@ -98,6 +98,6 @@
 				</table>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/list_diyform.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -38,6 +38,6 @@
 			{/dede:datalist}
 			{dede:pagelist listsize='2'/}
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/post_diyform.htm

@@ -10,7 +10,7 @@
 		<link rel="stylesheet" href="/static/web/css/daterangepicker.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -42,7 +42,7 @@
 				</table>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/moment.min.js"></script>
 		<script src="/static/web/js/daterangepicker.js"></script>
 		<script src="/static/web/js/diy.js"></script>

src/theme/apps/recommend.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -36,6 +36,6 @@
 				</table>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/showphoto.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -25,6 +25,6 @@
 				</tr>
 			</table>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/view_diyform.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -33,6 +33,6 @@
 				?>
 			</table>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/view_msg.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -33,6 +33,6 @@
 				</tr>
 			</table>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/view_msg_catalog.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -29,6 +29,6 @@
 				</tr>
 			</table>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/theme/apps/vote.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="/">首页</a></li>
@@ -21,6 +21,6 @@
 			<p><?php echo $rsmsg;?></p>
 			<p><?php echo $votelist;?></p>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/inc/inc_archives_functions.php

@@ -206,7 +206,7 @@ function PrintAutoFieldsAdd($fieldset, $loadtype = 'all', $isprint = TRUE)
  * @param     string  $fieldset
  * @param     string  $fieldValues
  * @param     string  $loadtype
- * @return    string
+ * @return    void
  */
 function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all')
 {

src/user/inc/inc_catalog_options.php

@@ -54,7 +54,7 @@ function GetOptionList($selid = 0, $channeltype = 0)
  * @param     string  $step
  * @param     string  $channeltype
  * @param     int  $selid
- * @return    string
+ * @return    void
  */
 function LogicGetOptionArray($id, $step, $channeltype, $selid = 0)
 {

src/user/inc/inc_pwd_functions.php

@@ -67,7 +67,7 @@ function sendmail($email, $mailtitle, $mailbody, $headers)
  * @param     string  $mailto  发送到
  * @param     string  $type  类型
  * @param     string  $send  发送到
- * @return    string
+ * @return    void
  */
 function newmail($mid, $userid, $mailto, $type, $send)
 {
@@ -75,7 +75,6 @@ function newmail($mid, $userid, $mailto, $type, $send)
     $mailtime = time();
     $randval = random(8);
     $mailtitle = $cfg_webname.":密码修改";
-    $mailto = $mailto;
     $headers = "From:".$cfg_adminemail."\r\nReply-To:$cfg_adminemail";
     $mailbody = "尊敬的".$userid."会员，临时验证码：".$randval."\r\n请在3天内修改登录密码：".$cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid;
     if ($type == 'INSERT') {
@@ -133,7 +132,7 @@ function member($mail, $userid)
  * @param     string  $userid  账号
  * @param     string  $mailto  发送邮件地址
  * @param     string  $send  邮件默认为Y，Y发送，N不发送
- * @return    string
+ * @return    void
  */
 function sn($mid, $userid, $mailto, $send = 'Y')
 {
@@ -152,7 +151,7 @@ function sn($mid, $userid, $mailto, $send = 'Y')
     }
     //重新发送新的验证码确认邮件
     else {
-        return ShowMsg('请10分钟后再重新申请', 'login.php');
+        ShowMsg('请10分钟后再重新申请', 'login.php');
     }
 }
 ?>

src/user/templets/album_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/album_add.php" method="post" enctype="multipart/form-data">
@@ -86,7 +86,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<script src="/static/web/js/user.album.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>

src/user/templets/album_edit.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/album_edit.php" method="post" enctype="multipart/form-data">
@@ -113,10 +113,10 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<script src="/static/web/js/user.album.js"></script>
-		<script>startNum = <?php echo $j;?>;</script>
+		<script>startNum = parseInt('<?php echo $j;?>');</script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>
 </html>

src/user/templets/archives_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -61,7 +61,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/archives_edit.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -60,7 +60,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/archives_sg_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_sg_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -57,7 +57,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/archives_sg_edit.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_sg_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -56,7 +56,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/article_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/article_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -65,7 +65,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/article_edit.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/article_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
@@ -68,7 +68,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>

src/user/templets/buy.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
@@ -102,6 +102,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/buy_action_payment.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
@@ -65,6 +65,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/content_list.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -67,7 +67,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			function viewArc(aid) {
 				window.open("{dede:global.cfg_phpurl/}/view.php?aid=" + aid);

src/user/templets/content_sg_list.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -65,7 +65,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			function viewArc(aid) {
 				window.open("{dede:global.cfg_phpurl/}/view.php?aid=" + aid);

src/user/templets/edit_baseinfo.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -77,7 +77,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			function checkSubmit() {
 				if (document.form2.oldpwd.value == '') {

src/user/templets/index.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -95,6 +95,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/login.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container">
 			<div class="login-from">
 				<div class="login-box shadow-sm rounded">
@@ -41,7 +41,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/login.js"></script>
 	</body>
 </html>

src/user/templets/mypay.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -57,7 +57,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			//获得选中文件的文件名
 			function GetCheckfolderItem() {

src/user/templets/mystow.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -50,6 +50,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/operation.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -61,7 +61,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			//获得选中文件的文件名
 			function GetCheckfolderItem() {

src/user/templets/pm-main.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<?php
@@ -84,7 +84,7 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/style.js"></script>
 		<script>
 			//阅读消息

src/user/templets/reg-new.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container">
 			<div class="login-from">
 				<div class="login-box shadow-sm rounded">
@@ -48,6 +48,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/resetpassword.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<h2>找回密码第一步</h2>
 			<p><a href="index_do.php?fmdo=user&dopost=regnew">还没注册？</a></p>
@@ -43,7 +43,7 @@
 				<div><button type="submit" class="btn btn-success btn-block">下一步</button></div>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script>
 			$(document).ready(function() {
 				$("#selType").on("change", function() {

src/user/templets/resetpassword2.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<h2>找回密码第二步</h2>
 			<p><a href="index_do.php?fmdo=user&dopost=regnew">还没注册？</a></p>
@@ -42,6 +42,6 @@
 				<div><button type="submit" class="btn btn-success btn-block">下一步</button></div>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/resetpassword3.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<h2>找回密码第三步</h2>
 			<p><a href="index_do.php?fmdo=user&dopost=regnew">还没注册？</a></p>
@@ -34,6 +34,6 @@
 				<div><button type="submit" class="btn btn-success btn-block">下一步</button></div>
 			</form>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>

src/user/templets/soft_add.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/soft_add.php" method="post" enctype="multipart/form-data">
@@ -171,7 +171,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<script>
 			var startNum = 2;

src/user/templets/soft_edit.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/soft_edit.php" method="post" enctype="multipart/form-data">
@@ -168,7 +168,7 @@
 				</form>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 		<script src="/static/web/js/user.main.js"></script>
 		<script>
 			var startNum = parseInt('<?php echo $newRowStart;?>');

src/user/templets/space.htm

@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="/static/web/css/style.css">
 	</head>
 	<body>
-		<?php obtaintheme('top.htm');?>
+		<?php ThemeInclude('top.htm');?>
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-3 pb-m-3">
@@ -55,6 +55,6 @@
 				</div>
 			</div>
 		</main>
-		<?php obtaintheme('foot.htm');?>
+		<?php ThemeInclude('foot.htm');?>
 	</body>
 </html>