diff --git a/src/system/common.func.php b/src/system/common.func.php index 782d5786..d75b2a5b 100755 --- a/src/system/common.func.php +++ b/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'); diff --git a/src/system/extend.func.php b/src/system/extend.func.php index 27cef75b..9a804334 100755 --- a/src/system/extend.func.php +++ b/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 */ -/*会员中心调用主题模板*/ -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 == '' ? "{$row['tag']}" : "、{$row['tag']}"); - } - 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("/]*)\s*src=('|\")([^'\"]+)('|\")/", $string, $matches); - $imgsrc_arr = array_unique($matches[3]); - $i = 0; - $newimg = ''; - foreach ($imgsrc_arr as $imgsrc) - { - if ($i == $num) break; - $newimg .= ""; - $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("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 .= '

'; - $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-outline-success btn-sm">全部' : 'GetName()."=".$fields_value,"",$filterarr).'" class="btn btn-success btn-sm">全部'); - $addonfields_items = explode(",",$ctag->GetAtt('default')); - for ($i=0; $iGetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]); - $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); - } - $biz_addonfields .= '

'; - break; - case 2: - $biz_addonfields .= ''; - break; - case 3: - $biz_addonfields .= '

'; - $biz_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'">GetName()."=".$fields_value,"",$filterarr).'" onclick="window.location=this.value">全部' : '全部'); - $addonfields_items = explode(",",$ctag->GetAtt('default')); - for ($i=0; $iGetName().'=') ? str_replace("=".$fields_value,"=".urlencode($addonfields_items[$i]),$filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]); - $biz_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].''); - } - $biz_addonfields .= '

'; - 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; -} +// 当前文件用于用户进行自定义扩展函数，官方开发不要动这个文件 + + ?> \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 1e111b4e..37417ea3 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/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) { diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 423cd8db..d28cb818 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/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) { diff --git a/src/theme/apps/download_links.htm b/src/theme/apps/download_links.htm index 13bbfa15..cca1aa81 100644 --- a/src/theme/apps/download_links.htm +++ b/src/theme/apps/download_links.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -24,6 +24,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/flink_add.htm b/src/theme/apps/flink_add.htm index e54e1f1d..d66207a3 100644 --- a/src/theme/apps/flink_add.htm +++ b/src/theme/apps/flink_add.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -72,6 +72,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/flink_list.htm b/src/theme/apps/flink_list.htm index 6a08123a..f74b8a61 100644 --- a/src/theme/apps/flink_list.htm +++ b/src/theme/apps/flink_list.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -41,6 +41,6 @@ ?>
- + \ No newline at end of file diff --git a/src/theme/apps/heightsearch.htm b/src/theme/apps/heightsearch.htm index 0d4b87e1..ca6ef333 100644 --- a/src/theme/apps/heightsearch.htm +++ b/src/theme/apps/heightsearch.htm @@ -9,7 +9,7 @@ - +
@@ -98,6 +98,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/list_diyform.htm b/src/theme/apps/list_diyform.htm index 8e6113da..3eead849 100644 --- a/src/theme/apps/list_diyform.htm +++ b/src/theme/apps/list_diyform.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -38,6 +38,6 @@ {/dede:datalist} {dede:pagelist listsize='2'/}
- + \ No newline at end of file diff --git a/src/theme/apps/post_diyform.htm b/src/theme/apps/post_diyform.htm index 610dd0a5..9643d091 100644 --- a/src/theme/apps/post_diyform.htm +++ b/src/theme/apps/post_diyform.htm @@ -10,7 +10,7 @@ - +
  1. 首页
    2. @@ -42,7 +42,7 @@
- + diff --git a/src/theme/apps/recommend.htm b/src/theme/apps/recommend.htm index f57bf95f..f779703f 100644 --- a/src/theme/apps/recommend.htm +++ b/src/theme/apps/recommend.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -36,6 +36,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/showphoto.htm b/src/theme/apps/showphoto.htm index 3d10f0c6..476a9417 100644 --- a/src/theme/apps/showphoto.htm +++ b/src/theme/apps/showphoto.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -25,6 +25,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/view_diyform.htm b/src/theme/apps/view_diyform.htm index c9205adc..c454ccd7 100644 --- a/src/theme/apps/view_diyform.htm +++ b/src/theme/apps/view_diyform.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -33,6 +33,6 @@ ?>
- + \ No newline at end of file diff --git a/src/theme/apps/view_msg.htm b/src/theme/apps/view_msg.htm index 60331363..00932e8f 100644 --- a/src/theme/apps/view_msg.htm +++ b/src/theme/apps/view_msg.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -33,6 +33,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/view_msg_catalog.htm b/src/theme/apps/view_msg_catalog.htm index ca32ca85..d264f58a 100644 --- a/src/theme/apps/view_msg_catalog.htm +++ b/src/theme/apps/view_msg_catalog.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -29,6 +29,6 @@
- + \ No newline at end of file diff --git a/src/theme/apps/vote.htm b/src/theme/apps/vote.htm index 88b1051c..29aacab4 100644 --- a/src/theme/apps/vote.htm +++ b/src/theme/apps/vote.htm @@ -9,7 +9,7 @@ - +
  1. 首页
    2. @@ -21,6 +21,6 @@

- + \ No newline at end of file diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index 2149a5e9..c689f0f6 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/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') { diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php index 5ff29458..de5d8699 100755 --- a/src/user/inc/inc_catalog_options.php +++ b/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) { diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php index 8ed85f99..4546566c 100755 --- a/src/user/inc/inc_pwd_functions.php +++ b/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'); } } ?> \ No newline at end of file diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 3eea83c7..cd25b2cb 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -9,7 +9,7 @@ - +
@@ -86,7 +86,7 @@
- + diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 6966680f..ce10d223 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -9,7 +9,7 @@ - +
@@ -113,10 +113,10 @@
- + - + \ No newline at end of file diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index 30e94619..043e8c5f 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -9,7 +9,7 @@ - +
@@ -61,7 +61,7 @@
- + diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 2bfec9f3..dbeff389 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -9,7 +9,7 @@ - +
@@ -60,7 +60,7 @@
- + diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index 94be2f5d..62198884 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -9,7 +9,7 @@ - +
@@ -57,7 +57,7 @@
- + diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index fa242b51..6379acd6 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -9,7 +9,7 @@ - +
@@ -56,7 +56,7 @@
- + diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index c755a484..8fa6ca62 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -9,7 +9,7 @@ - +
@@ -65,7 +65,7 @@
- + diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index 85d2afc6..5f3de68a 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -9,7 +9,7 @@ - +
@@ -68,7 +68,7 @@
- + diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index 7932657b..afc2969a 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -9,7 +9,7 @@ - +
@@ -102,6 +102,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index 7c5b2953..ac801b2c 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -9,7 +9,7 @@ - +
@@ -65,6 +65,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index dc4a770b..50bbf102 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -9,7 +9,7 @@ - +
- + \ No newline at end of file diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm index 21fcd86c..9c493eba 100755 --- a/src/user/templets/mypay.htm +++ b/src/user/templets/mypay.htm @@ -9,7 +9,7 @@ - +
- +