diff --git a/upload/install/include/install_var.php b/upload/install/include/install_var.php index abd660161142a4c3d8cf75ba61906f7b4f7158bb..4067ecc5d1ec5d08938779929f192b0c07252dde 100644 --- a/upload/install/include/install_var.php +++ b/upload/install/include/install_var.php @@ -94,8 +94,14 @@ $dirfile_items = array 'threadcache' => array('type' => 'dir', 'path' => './data/threadcache'), 'attach' => array('type' => 'dir', 'path' => './data/attachment'), 'attach_album' => array('type' => 'dir', 'path' => './data/attachment/album'), + 'attach_category' => array('type' => 'dir', 'path' => './data/attachment/category'), + 'attach_common' => array('type' => 'dir', 'path' => './data/attachment/common'), 'attach_forum' => array('type' => 'dir', 'path' => './data/attachment/forum'), 'attach_group' => array('type' => 'dir', 'path' => './data/attachment/group'), + 'attach_portal' => array('type' => 'dir', 'path' => './data/attachment/portal'), + 'attach_profile' => array('type' => 'dir', 'path' => './data/attachment/profile'), + 'attach_swfupload' => array('type' => 'dir', 'path' => './data/attachment/swfupload'), + 'attach_temp' => array('type' => 'dir', 'path' => './data/attachment/temp'), 'logs' => array('type' => 'dir', 'path' => './data/log'), 'uccache' => array('type' => 'dir', 'path' => './uc_client/data/cache'), diff --git a/upload/source/admincp/admincp_plugins.php b/upload/source/admincp/admincp_plugins.php index a8ca62fa1711b2346d779c45c078c727f1eab184..3d80341b91ca913dddb27d221ebf0c0ed1c74d25 100644 --- a/upload/source/admincp/admincp_plugins.php +++ b/upload/source/admincp/admincp_plugins.php @@ -121,7 +121,7 @@ if(!$operation) { ($hookexists !== FALSE && $plugin['available'] ? $lang['display_order'].":

" : ''). (!$plugin['available'] ? "$lang[enable]  " : "$lang[closed]  "). "$lang[plugins_config_upgrade]  ". - (!$plugin['modules']['system'] ? "$lang[plugins_config_uninstall]  " : ''). + (!$plugin['modules']['system'] ? " dhtmlspecialchars($plugin['name'])))."');\">$lang[plugins_config_uninstall]  " : ''). ($isplugindeveloper && !$plugin['modules']['system'] ? "$lang[plugins_editlink]  " : ''), ), true); } diff --git a/upload/source/class/class_image.php b/upload/source/class/class_image.php index 0deff66b8d39e4a46824d61af272a6b50a2ceccc..fe76882be43751b14a30b260570a8c5777962c8f 100644 --- a/upload/source/class/class_image.php +++ b/upload/source/class/class_image.php @@ -196,6 +196,8 @@ class image { $content = fread($fp, $this->imginfo['size']); fclose($fp); $this->imginfo['animated'] = strpos($content, 'NETSCAPE2.0') === FALSE ? 0 : 1; + } else { + $this->imginfo['animated'] = 0; } return $this->imagecreatefromfunc ? 1 : -4; diff --git a/upload/source/class/discuz/discuz_application.php b/upload/source/class/discuz/discuz_application.php index 9157741ae8d70ce0c959ef10b1355aba1c70ea57..5458ddcac87644385262e92ee69b6d501f0da567 100644 --- a/upload/source/class/discuz/discuz_application.php +++ b/upload/source/class/discuz/discuz_application.php @@ -356,7 +356,13 @@ class discuz_application extends discuz_base{ static $check = array('"', '>', '<', '\'', '(', ')', 'CONTENT-TRANSFER-ENCODING'); if(isset($_GET['formhash']) && $_GET['formhash'] !== formhash()) { - system_error('request_tainting'); + if(constant('CURMODULE') == 'logging' && isset($_GET['action']) && $_GET['action'] == 'logout') { + header("HTTP/1.1 302 Found");// 修复多次点击退出时偶发“您当前的访问请求当中含有非法字符，已经被系统拒绝”的Bug + header("Location: index.php"); + exit(); + } else { + system_error('request_tainting'); + } } if($_SERVER['REQUEST_METHOD'] == 'GET' ) { @@ -473,9 +479,9 @@ class discuz_application extends discuz_base{ $memberfieldforum = C::t('common_member_field_forum')->fetch($discuz_uid); $groupterms = dunserialize($memberfieldforum['groupterms']); if(!empty($groupterms['main'])) { - C::t("common_member")->update($user['uid'], array('groupexpiry'=> 0, 'groupid' => $groupterms['main']['groupid'], 'adminid' => $groupterms['main']['adminid'])); - $user['groupid'] = $groupterms['main']['groupid']; + $user['groupid'] = $groupterms['main']['groupid'] ? $groupterms['main']['groupid'] : C::t('common_usergroup')->fetch_by_credits($user['credits'])['groupid']; $user['adminid'] = $groupterms['main']['adminid']; + C::t("common_member")->update($user['uid'], array('groupexpiry'=> 0, 'groupid' => $user['groupid'], 'adminid' => $user['adminid'])); unset($groupterms['main'], $groupterms['ext'][$this->var['member']['groupid']]); $this->var['member'] = $user; C::t('common_member_field_forum')->update($discuz_uid, array('groupterms' => serialize($groupterms))); diff --git a/upload/source/class/discuz/discuz_censor.php b/upload/source/class/discuz/discuz_censor.php index 730a3f353ea5f95ceab55b85ad674ff3ce86ba56..39c6e6ccf3b555f0b6b9de20fd881426ab10cb24 100644 --- a/upload/source/class/discuz/discuz_censor.php +++ b/upload/source/class/discuz/discuz_censor.php @@ -55,7 +55,7 @@ class discuz_censor { $bbcodes = 'b|i|color|size|font|align|list|indent|email|hide|quote|code|free|table|tr|td|img|swf|attach|payto|float'.($this->bbcodes_display ? '|'.implode('|', array_keys($this->bbcodes_display)) : ''); if(is_array($this->censor_words['banned']) && !empty($this->censor_words['banned'])) { foreach($this->censor_words['banned'] as $banned_words) { - if(preg_match_all($banned_words, @preg_replace(array("/\[($bbcodes)=?.*\]/iU", "/\[\/($bbcodes)\]/i"), '', $message), $matches)) { + if(preg_match_all($banned_words, @preg_replace(array("/\[($bbcodes)=?(.*)\]/iU", "/\[\/($bbcodes)\]/i"), array('${2}', ''), $message), $matches)) { $this->words_found = $matches[0]; $this->result = DISCUZ_CENSOR_BANNED; $this->words_found = array_unique($this->words_found); @@ -69,7 +69,7 @@ class discuz_censor { $message = preg_replace($this->censor_words['mod'], $modword, $message); } foreach($this->censor_words['mod'] as $mod_words) { - if(preg_match_all($mod_words, @preg_replace(array("/\[($bbcodes)=?.*\]/iU", "/\[\/($bbcodes)\]/i"), '', $message), $matches)) { + if(preg_match_all($mod_words, @preg_replace(array("/\[($bbcodes)=?(.*)\]/iU", "/\[\/($bbcodes)\]/i"), array('${2}', ''), $message), $matches)) { $this->words_found = $matches[0]; $this->result = DISCUZ_CENSOR_MODERATED; $message = $this->highlight($message, $mod_words); diff --git a/upload/source/class/discuz/discuz_database.php b/upload/source/class/discuz/discuz_database.php index 8a71f361befb9e3407ca528c42ae27c8d56fd7c2..afeb323aba8e2693ea250fd7a301fa3b109622be 100644 --- a/upload/source/class/discuz/discuz_database.php +++ b/upload/source/class/discuz/discuz_database.php @@ -255,6 +255,7 @@ class discuz_database { case '|': case '&': case '^': + case '&~': return $field . '=' . $field . $glue . self::quote($val); break; case '>': diff --git a/upload/source/class/table/table_common_member_verify_info.php b/upload/source/class/table/table_common_member_verify_info.php index 617f09742d17ccaa4dbe812c522200f7fea6259e..430b00e28d7e7a9bf696ce96efb0870941902ff8 100644 --- a/upload/source/class/table/table_common_member_verify_info.php +++ b/upload/source/class/table/table_common_member_verify_info.php @@ -39,7 +39,7 @@ class table_common_member_verify_info extends discuz_table $verifytype = dintval($verifytype, is_array($verifytype) ? true : false); $addsql = ' AND '.DB::field('verifytype', $verifytype); } - return DB::fetch_first('DELETE FROM %t WHERE '.(is_array($uid) ? 'uid IN(%n)' : 'uid=%d').$addsql, array($this->_table, $uid)); + return DB::query('DELETE FROM %t WHERE '.(is_array($uid) ? 'uid IN(%n)' : 'uid=%d').$addsql, array($this->_table, $uid)); } return false; } diff --git a/upload/source/function/function_core.php b/upload/source/function/function_core.php index 58d8719edf4235ab8be02d165d741e426cad3865..5de21fbe46edfbf6b93723cdb2c0446db6fd11b9 100644 --- a/upload/source/function/function_core.php +++ b/upload/source/function/function_core.php @@ -1669,7 +1669,7 @@ function g_icon($groupid, $return = 0) { if(empty($_G['cache']['usergroups'][$groupid]['icon'])) { $s = ''; } else { - if(substr($_G['cache']['usergroups'][$groupid]['icon'], 0, 5) == 'http:') { + if(preg_match('/^https?:\/\//is', $_G['cache']['usergroups'][$groupid]['icon'])) { $s = ''; } else { $s = ''; diff --git a/upload/source/function/media/media_bilibili.php b/upload/source/function/media/media_bilibili.php index 9087a0e045ce3d38a2536ae615cad757e48926a5..9866e58563bbee6cbba151f0320af00479565925 100644 --- a/upload/source/function/media/media_bilibili.php +++ b/upload/source/function/media/media_bilibili.php @@ -4,13 +4,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } -$checkurl = array('bilibili.com/video/av', 'bilibili.tv/video/av'); +$checkurl = array('bilibili.com/video/', 'bilibili.tv/video/', 'acg.tv', 'b23.tv'); function media_bilibili($url, $width, $height) { - if(preg_match("/https?:\/\/(m.|www.|)bilibili.(com|tv)\/video\/av(\d+)/i", $url, $matches)) { - $vid = $matches[3]; + if(preg_match("/https?:\/\/(m.|www.|)bilibili.(com|tv)\/video\/(a|b)v([A-Za-z0-9]+)(\/?.*?&p=|\/?\?p=)?(\d+)?/i", $url, $matches)) { + $vid = (is_numeric($matches[4]) ? 'aid='.$matches[4] : 'bvid='.$matches[4]) . (empty($matches[6]) ? '' : '&page='.intval($matches[6])); $flv = ''; - $iframe = 'https://player.bilibili.com/player.html?aid='.$vid; + $iframe = 'https://player.bilibili.com/player.html?'.$vid; + $imgurl = ''; + } else if(preg_match("/https?:\/\/(www.|)(acg|b23).tv\/(a|b)v([A-Za-z0-9]+)(\/?.*?&p=|\/?\?p=)?(\d+)?/i", $url, $matches)) { + $vid = (is_numeric($matches[4]) ? 'aid='.$matches[4] : 'bvid='.$matches[4]) . (empty($matches[6]) ? '' : '&page='.intval($matches[6])); + $flv = ''; + $iframe = 'https://player.bilibili.com/player.html?'.$vid; $imgurl = ''; } return array($flv, $iframe, $url, $imgurl); diff --git a/upload/source/include/modcp/modcp_moderate.php b/upload/source/include/modcp/modcp_moderate.php index bf39c2f620ba9f51713407c85fdcd11d71d63010..c825fc5668d557fb13f29425caad529e61502d4b 100644 --- a/upload/source/include/modcp/modcp_moderate.php +++ b/upload/source/include/modcp/modcp_moderate.php @@ -48,7 +48,7 @@ if($op == 'members') { $member_validate = C::t('common_member_validate')->fetch_all($uids); foreach(C::t('common_member')->fetch_all($uids, false, 0) as $uid => $member) { - if($member['groupid'] == 8 && $member['status'] == $filter) { + if(($member['groupid'] == 8 || (in_array($member['freeze'], array(-1, 2)) && $modact != 'delete')) && $member['status'] == $filter) { $members[$uid] = array_merge((array)$member_validate[$uid], $member); } } @@ -61,7 +61,7 @@ if($op == 'members') { } if($_GET['modact'] == 'validate') { - C::t('common_member')->update($uids, array('adminid' => '0', 'groupid' => $_G['setting']['newusergroupid'])); + C::t('common_member')->update($uids, array('adminid' => '0', 'groupid' => $_G['setting']['newusergroupid'], 'freeze' => 0)); C::t('common_member_validate')->delete($uids); } @@ -97,6 +97,8 @@ if($op == 'members') { } } } + } else { + showmessage('modcp_moduser_invalid'); } showmessage('modcp_mod_succeed', "{$cpscript}?mod=modcp&action=$_GET[action]&op=$op&filter=$filter"); @@ -123,7 +125,7 @@ if($op == 'members') { } foreach($member_validate as $uid => $member) { $member = array_merge($member, $common_member[$uid], $member_status[$uid]); - if($member['groupid'] != 8) { + if($member['groupid'] != 8 && !in_array($member['freeze'], array(-1, 2))) { $vuids[] = $member['uid']; continue; } diff --git a/upload/source/include/topicadmin/topicadmin_banpost.php b/upload/source/include/topicadmin/topicadmin_banpost.php index 87cd01d5b43edfa2c0a218649348f833dada20ed..4a5fcfa9fdf586efb167922b04607824831c1786 100644 --- a/upload/source/include/topicadmin/topicadmin_banpost.php +++ b/upload/source/include/topicadmin/topicadmin_banpost.php @@ -70,7 +70,7 @@ if(!submitcheck('modsubmit')) { crime('recordaction', $post['authorid'], 'crime_banpost', lang('forum/misc', 'crime_postreason', array('reason' => $reason, 'tid' => $_G['tid'], 'pid' => $post['pid']))); } else { - C::t('forum_post')->increase_status_by_pid('tid:'.$_G['tid'], $post['pid'], 1, '^', true); + C::t('forum_post')->increase_status_by_pid('tid:'.$_G['tid'], $post['pid'], 1, '&~', true); } $pids .= $comma.$post['pid']; $comma = ','; diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php index 58894d54cfdd6f55892fc2c82ca77280212c0a7f..f979604ea7dafbcad3b5bdd517ef3f80fdacbef5 100644 --- a/upload/source/language/lang_admincp.php +++ b/upload/source/language/lang_admincp.php @@ -784,7 +784,7 @@ $lang = array 'setting_access_register_maildomain_white' => '白名单模式', 'setting_access_register_maildomain_black' => '黑名单模式', 'setting_access_register_maildomain_list' => '限制名单', - 'setting_access_register_maildomain_list_comment' => '当邮箱的域名处于本列表中的地址时，将根据上述选项进行相应限制操作。输入要限制的邮箱域名即可，例如屏蔽 xxx@xxx.com 的域，只需输入 xxx.com。每行一个域名。', + 'setting_access_register_maildomain_list_comment' => '当邮箱的域名处于本列表中的地址时，将根据上述选项进行相应限制操作。输入要限制的邮箱域名即可，例如屏蔽 xxx@xxx.com 的域，只需输入 @xxx.com。每行一个域名。', 'setting_access_register_ctrl' => '同一 IP 注册间隔限制(小时)', 'setting_access_register_ctrl_comment' => '同一 IP 在本时间间隔内将只能注册一个帐号，0 为不限制', 'setting_access_register_floodctrl' => '同一 IP 在 24 小时允许注册的最大次数', @@ -5233,6 +5233,7 @@ $lang = array 'plugins_config_uninstall' => '卸载', 'plugins_config_upgrade' => '更新', 'plugins_config_delete' => '卸载', + 'plugins_config_uninstall_tips' => '您确定要把 {pluginname} 插件卸载并不可逆的删除由 {pluginname} 插件产生的所有数据么？', 'plugins_config_upgrade_other' => '您确定要把 {pluginname} {version} 插件更新到以下版本吗？', 'plugins_config_uninstallplugin' => '卸载此插件', 'plugins_edit' => '设计插件', diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php index 00ca992e20e78ecb434736aa4aaf041611165c42..5bff60c36516952602d9834f8408e788a056d555 100644 --- a/upload/source/module/forum/forum_viewthread.php +++ b/upload/source/module/forum/forum_viewthread.php @@ -404,6 +404,9 @@ if(empty($_GET['viewpid'])) { if($_G['page'] === 1 && $_G['forum_thread']['stickreply'] && empty($_GET['authorid'])) { $poststick = C::t('forum_poststick')->fetch_all_by_tid($_G['tid']); foreach(C::t('forum_post')->fetch_all($posttableid, array_keys($poststick)) as $post) { + if($post['invisible'] != 0) { + continue; + } $post['position'] = $poststick[$post['pid']]['position']; $post['avatar'] = avatar($post['authorid'], 'small'); $post['isstick'] = true; diff --git a/upload/source/plugin/mobile/api/4/forumindex.php b/upload/source/plugin/mobile/api/4/forumindex.php index 1f00dd4fd17f18d861fe7be77438356222ebfe54..f200c8eb05296283a0be78bbb65044c7ba73659d 100644 --- a/upload/source/plugin/mobile/api/4/forumindex.php +++ b/upload/source/plugin/mobile/api/4/forumindex.php @@ -29,7 +29,7 @@ class mobile_api { } if ($GLOBALS['forumlist'][$forum['fid']]['icon']) { $icon = preg_match('/src="(.+?)"/', $GLOBALS['forumlist'][$forum['fid']]['icon'], $r) ? $r[1] : ''; - if (!preg_match('/^http:\//', $icon)) { + if (!preg_match('/^https?:\//', $icon)) { $icon = $_G['siteurl'] . $icon; } $GLOBALS['forumlist'][$forum['fid']]['icon'] = $icon; diff --git a/upload/source/plugin/mobile/api/4/sub_threadlist.php b/upload/source/plugin/mobile/api/4/sub_threadlist.php index 91814b2f04309f0b0189045fd232a169490e6c41..9b1045f1699fca83b2ae8dced2846d27d6e0bf35 100644 --- a/upload/source/plugin/mobile/api/4/sub_threadlist.php +++ b/upload/source/plugin/mobile/api/4/sub_threadlist.php @@ -55,7 +55,7 @@ if($_G['uid']) { foreach ($GLOBALS['sublist'] as $k => $sublist) { if ($sublist['icon']) { $icon = preg_match('/src="(.+?)"/', $sublist['icon'], $r) ? $r[1] : ''; - if (!preg_match('/^http:\//', $icon)) { + if (!preg_match('/^https?:\//', $icon)) { $icon = $_G['siteurl'] . $icon; } $GLOBALS['sublist'][$k]['icon'] = $icon; diff --git a/upload/source/plugin/mobile/api/4/sublist.php b/upload/source/plugin/mobile/api/4/sublist.php index bcaf89bc04caeca64ad9c15fd292b6288dcb4bb6..be969f44ec9d57e417d17e5ad122d07b3947b6d1 100644 --- a/upload/source/plugin/mobile/api/4/sublist.php +++ b/upload/source/plugin/mobile/api/4/sublist.php @@ -26,7 +26,7 @@ class mobile_api { foreach ($GLOBALS['sublist'] as $k => $sublist) { if ($sublist['icon']) { $icon = preg_match('/src="(.+?)"/', $sublist['icon'], $r) ? $r[1] : ''; - if (!preg_match('/^http:\//', $icon)) { + if (!preg_match('/^https?:\//', $icon)) { $icon = $_G['siteurl'] . $icon; } $GLOBALS['sublist'][$k]['icon'] = $icon; diff --git a/upload/source/plugin/myrepeats/admincp.inc.php b/upload/source/plugin/myrepeats/admincp.inc.php index f63d9a38b15f103e13902f449aac862a403a4f56..b22d3cbc72c9eb1d1623d5794c35a5e2f9689e60 100644 --- a/upload/source/plugin/myrepeats/admincp.inc.php +++ b/upload/source/plugin/myrepeats/admincp.inc.php @@ -15,7 +15,7 @@ $Plang = $scriptlang['myrepeats']; if($_GET['op'] == 'lock') { $myrepeat = C::t('#myrepeats#myrepeats')->fetch_all_by_uid_username($_GET['uid'], $_GET['username']); - $lock = $myrepeat['lock']; + $lock = $myrepeat[0]['locked']; $locknew = $lock ? 0 : 1; C::t('#myrepeats#myrepeats')->update_locked_by_uid_username($_GET['uid'], $_GET['username'], $locknew); ajaxshowheader(); diff --git a/upload/source/plugin/myrepeats/switch.inc.php b/upload/source/plugin/myrepeats/switch.inc.php index 1bd6ac354e0a25478283f5a6310f7f9bb99f4694..cf1b23f97e6dacda8c4451b510637dd2c3140ad7 100644 --- a/upload/source/plugin/myrepeats/switch.inc.php +++ b/upload/source/plugin/myrepeats/switch.inc.php @@ -124,6 +124,7 @@ $_G['myrepeats_ucresult'] = $result['ucresult']; if($result['status'] > 0) { setloginstatus($result['member'], 2592000); C::t('#myrepeats#myrepeats')->update_lastswitch_by_uid_username($olddiscuz_uid, $_GET['username'], TIMESTAMP); + C::t('common_member_status')->update($_G['uid'], array('lastvisit' => TIMESTAMP), 'UNBUFFERED'); $ucsynlogin = $_G['setting']['allowsynlogin'] ? uc_user_synlogin($_G['uid']) : ''; dsetcookie('mrn', ''); dsetcookie('mrd', ''); diff --git a/upload/source/plugin/wechat/resource_setting.inc.php b/upload/source/plugin/wechat/resource_setting.inc.php index 048376755f84a53f6b0047a99223afd9b9c2f187..3b515f3f3e0e30dba4eff84993afc45b89b8626a 100644 --- a/upload/source/plugin/wechat/resource_setting.inc.php +++ b/upload/source/plugin/wechat/resource_setting.inc.php @@ -256,7 +256,7 @@ EOF; if(!getimagesize($_FILES['pic']['tmp_name']) || !$upload->init($_FILES['pic'], 'common', random(3, 1), random(8)) || !$upload->save()) { cpmsg($upload->errormessage(), '', 'error'); } - $_GET['data']['pic'] = (preg_match('/^http:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment']; + $_GET['data']['pic'] = (preg_match('/^https?:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment']; $_GET['data']['local'] = $upload->attach['attachment']; } else { $_GET['data']['pic'] = $_GET['pic']; @@ -284,7 +284,7 @@ EOF; if(!getimagesize($_FILES['pic']['tmp_name']) || !$upload->init($_FILES['pic'], 'common', random(3, 1), random(8)) || !$upload->save()) { cpmsg($upload->errormessage(), '', 'error'); } - $_GET['data']['pic'] = (preg_match('/^http:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment']; + $_GET['data']['pic'] = (preg_match('/^https?:/', $_G['setting']['attachurl']) ? '' : $_G['siteurl']).$_G['setting']['attachurl'].'common/'.$upload->attach['attachment']; $_GET['data']['local'] = $upload->attach['attachment']; @unlink($_G['setting']['attachdir'].'common/'.$resource['data']['local']); } else { diff --git a/upload/source/plugin/wechat/resourcepush.inc.php b/upload/source/plugin/wechat/resourcepush.inc.php index af951a9836871cf37db9fc9ca689082625d76762..b658314b6e402e5d005e0f053295c54b30905929 100644 --- a/upload/source/plugin/wechat/resourcepush.inc.php +++ b/upload/source/plugin/wechat/resourcepush.inc.php @@ -39,7 +39,7 @@ $data = array( 'name' => lang('plugin/wechat', 'resource_thread_push').': '.$thread['subject'], 'data' => array( 'title' => $thread['subject'], - 'pic' => $picurl ? (preg_match('/^http:/', $picurl) ? '' : $_G['siteurl']).$picurl : '', + 'pic' => $picurl ? (preg_match('/^https?:/', $picurl) ? '' : $_G['siteurl']).$picurl : '', 'desc' => messagecutstr($post['message'], 0, 120), 'content' => nl2br(messagecutstr($post['message'])), 'url' => $_G['siteurl'].'forum.php?mod=viewthread&tid='.$_GET['tid'], diff --git a/upload/source/plugin/wechat/wechat_setting.inc.php b/upload/source/plugin/wechat/wechat_setting.inc.php index 4a76ff0256ba9235a9e93a9ea7ccb07362afa6e5..6a7e7de5cfb549303e3b80ed6ecc18cdefcbcd86 100644 --- a/upload/source/plugin/wechat/wechat_setting.inc.php +++ b/upload/source/plugin/wechat/wechat_setting.inc.php @@ -121,7 +121,7 @@ if(!submitcheck('settingsubmit')) { } if($_GET['setting']['wechat_followurl']) { - $_GET['setting']['wechat_followurl'] = (!preg_match('/^http:\/\//', $_GET['setting']['wechat_followurl']) ? 'http://' : '').$_GET['setting']['wechat_followurl']; + $_GET['setting']['wechat_followurl'] = (!preg_match('/^https?:\/\//', $_GET['setting']['wechat_followurl']) ? 'http://' : '').$_GET['setting']['wechat_followurl']; $parse = parse_url($_GET['setting']['wechat_followurl']); if(!$parse['host'] || $parse['host'] != 'mp.weixin.qq.com') { cpmsg(lang('plugin/wechat', 'wsq_followurl_error'), '', 'error'); diff --git a/upload/source/plugin/wechat/wsqapi.class.php b/upload/source/plugin/wechat/wsqapi.class.php index 2d0f74040f11c468f75e8d716630edc2461b3212..46cccf4bc7ebba6e12adca1eb22a7916c57849dc 100644 --- a/upload/source/plugin/wechat/wsqapi.class.php +++ b/upload/source/plugin/wechat/wsqapi.class.php @@ -40,7 +40,7 @@ class WSQAPI { } global $_G; $variables['thread']['showactivity'] = 1; - $variables['special_activity']['thumb'] = preg_match('/^http:\//', $GLOBALS['activity']['thumb']) ? $GLOBALS['activity']['thumb'] : $_G['siteurl'].$GLOBALS['activity']['thumb']; + $variables['special_activity']['thumb'] = preg_match('/^https?:\//', $GLOBALS['activity']['thumb']) ? $GLOBALS['activity']['thumb'] : $_G['siteurl'].$GLOBALS['activity']['thumb']; unset($variables['special_activity']['attachurl']); if(empty($_GET['viewpid'])) { diff --git a/upload/static/js/webuploader.js b/upload/static/js/webuploader.js index d67e4c035ebbce0c25e56d3bd22f81d6693623e1..29567ba16975ce2314cf976916daef507a3cf9f5 100644 --- a/upload/static/js/webuploader.js +++ b/upload/static/js/webuploader.js @@ -438,7 +438,7 @@ function fileQueued(file) { } } if(createQueue && this.customSettings.filterType != undefined) { - var fileSize = this.customSettings.filterType[file.type.substr(1).toLowerCase()]; + var fileSize = this.customSettings.filterType[file.source.ext.toLowerCase()]; if(fileSize != undefined && fileSize && file.size > fileSize) { this.customSettings.alertType = 5; createQueue = false; diff --git a/upload/template/default/forum/modcp_moderate.htm b/upload/template/default/forum/modcp_moderate.htm index 7a02a2c7a8f46f108b8c7da98e8acee2f5182b64..1f9efc4095eebadc0977901081151ae80b411e68 100644 --- a/upload/template/default/forum/modcp_moderate.htm +++ b/upload/template/default/forum/modcp_moderate.htm @@ -193,7 +193,7 @@

Email: $member[email]

{lang pass}| - {lang delete}| + {lang delete}| {lang invalidate}

diff --git a/upload/template/default/style/t1/style.css b/upload/template/default/style/t1/style.css index 9ccb4b3470b9991dd13159fe1cfd41118596b7db..b10c4956729807a55da28c73c26fba574167876a 100644 --- a/upload/template/default/style/t1/style.css +++ b/upload/template/default/style/t1/style.css @@ -21,7 +21,7 @@ body { background: transparent url(bgimg.jpg) no-repeat 50% 0; } .ct2_a, .ct3_a { background-image: url(vlineb.png); } .ct3_a .bm { background-color: transparent; } .tbn li.a { background: #FAF6ED url(background.png); } - #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r { background-image: none; } + #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r, #nv_group.pg_post .ct2_a_r { background-image: none; } /* 重定义 {SPECIALBORDER} */ .bmn, .pg a, .pgb a, .pg strong, .card, .card .o, div.exfm { border-color: #FCC; } diff --git a/upload/template/default/style/t2/style.css b/upload/template/default/style/t2/style.css index bd0c072957a4f70bdcd0f87ff6fd364574cda08e..d6b74ab6a983ae4f10acb458290a4f0945c0a3de 100644 --- a/upload/template/default/style/t2/style.css +++ b/upload/template/default/style/t2/style.css @@ -17,7 +17,7 @@ body { background: #FFF url(bgimg.jpg) no-repeat 50% 0; } .ct2_a, .ct3_a { background-image: url(vlineb.png); } .tbn li.a { background: #FFF; } - #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r { background-image: none; } + #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r, #nv_group.pg_post .ct2_a_r { background-image: none; } /* 重定义 {SPECIALBORDER} */ .bmn, .pg a, .pgb.a, .pg strong, .card, .card .o, div.exfm { border-color: #C5E6DF; } diff --git a/upload/template/default/style/t3/style.css b/upload/template/default/style/t3/style.css index d0403883f1e3b952e24d0caa3079765b4808e26f..e02001840fe2a362867c168a8acc08b6743236e6 100644 --- a/upload/template/default/style/t3/style.css +++ b/upload/template/default/style/t3/style.css @@ -21,7 +21,7 @@ body { background: #FCFAF0 url(bgimg.jpg) no-repeat 50% 0; } .ct2_a, .ct3_a { background-image: url(vlineb.png); } .ct3_a .bm { background-color: transparent; } .tbn li.a { background: #FCFAF0; } - #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r { background-image: none; } + #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r, #nv_group.pg_post .ct2_a_r { background-image: none; } /* 重定义 {SPECIALBORDER} */ .bmn, .pg a, .pgb a, .pg strong, .card, .card .o, div.exfm { border-color: #FC6; } diff --git a/upload/template/default/style/t4/style.css b/upload/template/default/style/t4/style.css index fcc7c673d1390694b49f38a0419ad02df3b71b9a..abb0341c9931b2f2ee918d3e686a347e22271e8f 100644 --- a/upload/template/default/style/t4/style.css +++ b/upload/template/default/style/t4/style.css @@ -17,7 +17,7 @@ body { background: #FFF url(bgimg.jpg) no-repeat 50% 28px; } .ct2_a, .ct3_a { background-image: url(vlineb.png); } .tbn li.a { background: #FFF; } - #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r { background-image: none; } + #nv_portal.pg_portalcp .ct2_a_r, #nv_forum.pg_post .ct2_a_r, #nv_group.pg_post .ct2_a_r { background-image: none; } /* 重定义 {SPECIALBORDER} */ .bmn, .pg a, .pgb a, .pg strong, .card, .card .o, div.exfm { border-color: #DFCDDE; }