diff --git a/upload/source/admincp/admincp_admingroup.php b/upload/source/admincp/admincp_admingroup.php index e3beb816..bfaec9ad 100644 --- a/upload/source/admincp/admincp_admingroup.php +++ b/upload/source/admincp/admincp_admingroup.php @@ -59,7 +59,7 @@ $group['type'] == 'system' ? cplang('inbuilt') : cplang('custom'), $group['type'] == 'system' ? $lang['usergroups_system_'.$group['radminid']] : $adminidselect, "", - "", + "", "$lang[admingroup_setting_user]", "$lang[admingroup_setting_admin]" )); diff --git a/upload/source/admincp/admincp_cloudaddons.php b/upload/source/admincp/admincp_cloudaddons.php index 83df144f..e5726a6e 100644 --- a/upload/source/admincp/admincp_cloudaddons.php +++ b/upload/source/admincp/admincp_cloudaddons.php @@ -182,24 +182,106 @@ $addoni++; cpmsg('cloudaddons_downloading', "action=cloudaddons&operation=download&addonids=$_GET[addonids]&i=$addoni&step=1&md5hash=".$_GET['md5hash'].'×tamp='.$_GET['timestamp'], 'loading', array('addonid' => $_GET['key'].'.'.$_GET['type']), FALSE); } - list($_GET['key'], $_GET['type'], $_GET['rid']) = explode('.', $addonids[0]); - cloudaddons_downloadlog($_GET['key'].'.'.$_GET['type']); - if($_GET['type'] == 'plugin') { - $plugin = C::t('common_plugin')->fetch_by_identifier($_GET['key']); - if(!$plugin['pluginid']) { - dheader('location: '.ADMINSCRIPT.'?action=plugins&operation=import&dir='.$_GET['key']); - } else { - dheader('location: '.ADMINSCRIPT.'?action=plugins&operation=upgrade&pluginid='.$plugin['pluginid']); + + $extra = currentlang(); + $extra = $extra ? '_'.$extra : ''; + $batch = array(); + foreach ($addonids as $addonid) { + list($key, $type, $rid) = explode('.', $addonid); + cloudaddons_downloadlog($key.'.'.$type); + if(empty($batch[$key.'.'.$type][1])) { + if($type == 'plugin') { + $entrytitle = $importtxt = ''; + $plugindir = DISCUZ_ROOT.'./source/plugin/'.$key; + if(file_exists($plugindir.'/discuz_plugin_'.$key.$extra.'.xml')) { + $importtxt = @implode('', file($plugindir.'/discuz_plugin_'.$key.$extra.'.xml')); + } elseif(file_exists($plugindir.'/discuz_plugin_'.$key.'.xml')) { + $importtxt = @implode('', file($plugindir.'/discuz_plugin_'.$key.'.xml')); + } + if(!empty($importtxt)) { + $pluginarray = getimportdata('Discuz! Plugin', 0, 1); + if(!empty($pluginarray['plugin']['name'])) { + $entrytitle = dhtmlspecialchars($pluginarray['plugin']['name'].' '.$pluginarray['plugin']['version']); + } + } + $plugin = C::t('common_plugin')->fetch_by_identifier($key); + if(!$plugin['pluginid']) { + $batch[$key.'.'.$type] = array( + ADMINSCRIPT.'?action=plugins&operation=import&dir='.$key, + $lang['plugins_config_install'].' '.$entrytitle, + ); + } else { + if ($pluginarray['plugin']['version'] != $plugin['version']) { + $batch[$key.'.'.$type] = array( + ADMINSCRIPT.'?action=plugins&operation=upgrade&pluginid='.$plugin['pluginid'], + $lang['plugins_config_upgrade'].' '.$entrytitle, + ); + } + } + } elseif($type == 'template') { + $pluginarray = array(); + $entrytitle = $importtxt = ''; + $templatedir = DISCUZ_ROOT.'./template/'.$key; + $searchdir = dir($templatedir); + while($searchentry = $searchdir->read()) { + if(substr($searchentry, 0, 13) == 'discuz_style_' && fileext($searchentry) == 'xml') { + $importtxt = @implode('', file($templatedir.'/'.$searchentry)); + if(!empty($importtxt)) { + break; + } + } + } + if(!empty($importtxt)) { + $stylearray = getimportdata('Discuz! Style'); + if(!empty($stylearray['tplname'])) { + $entrytitle = dhtmlspecialchars($stylearray['tplname']); + } + } + $batch[$key.'.'.$type] = array( + ADMINSCRIPT.'?action=styles&operation=import&dir='.$key, + $entrytitle, + ); + } else { + cloudaddons_validator($key.'.pack'); + cloudaddons_installlog($key.'.pack'); + if(file_exists(DISCUZ_ROOT.'./data/addonpack/'.$key.'.php')) { + $batch[$key.'.'.$type] = array( + $_G['siteurl'].'data/addonpack/'.$key.'.php', + $key.'.'.$type, + ); + } + } + } + } + + if(count($batch) > 1) { + $message = ''; + foreach ($batch as $k => $v) { + $message .= '

'.($v[1] ? $v[1] : $k).'

'; + } + echo '

'.cplang('cloudaddons_batch_succeed').'

'.$message.'

+ + '; + exit; + } elseif(count($batch) == 1) { + $v = reset($batch); + dheader('location: '.$v[0]); } else { - cloudaddons_validator($_GET['key'].'.pack'); - cloudaddons_installlog($_GET['key'].'.pack'); - if(file_exists(DISCUZ_ROOT.'./data/addonpack/'.$_GET['key'].'.php')) { - dheader('location: '.$_G['siteurl'].'data/addonpack/'.$_GET['key'].'.php'); + list($_GET['key'], $_GET['type'], $_GET['rid']) = explode('.', $addonids[0]); + if($_GET['type'] == 'plugin') { + dheader('location: '.ADMINSCRIPT.'?action=plugins&operation=upgrade&pluginid='.$plugin['pluginid']); + } else { + cpmsg('cloudaddons_pack_installed', '', 'succeed'); } - cpmsg('cloudaddons_pack_installed', '', 'succeed'); } } } diff --git a/upload/source/admincp/admincp_members.php b/upload/source/admincp/admincp_members.php index 3965eded..df04942e 100644 --- a/upload/source/admincp/admincp_members.php +++ b/upload/source/admincp/admincp_members.php @@ -1510,7 +1510,18 @@ function getcrimerecord() { $_GET['banexpirynew'] = !empty($_GET['banexpirynew']) ? TIMESTAMP + $_GET['banexpirynew'] * 86400 : 0; $_GET['banexpirynew'] = $_GET['banexpirynew'] > TIMESTAMP ? $_GET['banexpirynew'] : 0; if($_GET['banexpirynew']) { - $member['groupterms']['main'] = array('time' => $_GET['banexpirynew'], 'adminid' => $member['adminid'], 'groupid' => $member['groupid']); + if($member['groupid'] == 4 || $member['groupid'] == 5) { + $member['groupterms']['main']['time'] = $_GET['banexpirynew']; + if (empty($member['groupterms']['main']['groupid'])) { + $groupnew = C::t('common_usergroup')->fetch_by_credits($member['credits']); + $member['groupterms']['main']['groupid'] = $groupnew['groupid']; + } + if (!isset($member['groupterms']['main']['adminid'])) { + $member['groupterms']['main']['adminid'] = $member['adminid']; + } + }else{ + $member['groupterms']['main'] = array('time' => $_GET['banexpirynew'], 'adminid' => $member['adminid'], 'groupid' => $member['groupid']); + } $member['groupterms']['ext'][$groupidnew] = $_GET['banexpirynew']; $setarr['groupexpiry'] = groupexpiry($member['groupterms']); } else { diff --git a/upload/source/admincp/admincp_plugins.php b/upload/source/admincp/admincp_plugins.php index 71a28971..eb53f910 100644 --- a/upload/source/admincp/admincp_plugins.php +++ b/upload/source/admincp/admincp_plugins.php @@ -1077,7 +1077,7 @@ ''. ''. ''. - ''. + ''. ''. ''. ''. diff --git a/upload/source/admincp/admincp_usergroups.php b/upload/source/admincp/admincp_usergroups.php index 491c90a9..c96efb79 100644 --- a/upload/source/admincp/admincp_usergroups.php +++ b/upload/source/admincp/admincp_usergroups.php @@ -32,7 +32,7 @@ "(groupid:$group[groupid])", " ~ ", "", - "", + "", "$lang[edit]". "$lang[usergroups_copy]". "$lang[usergroups_merge_link]" @@ -43,7 +43,7 @@ "(groupid:$group[groupid])", $lang['usergroups_system_'.$group['groupid']], "", - "", + "", "$lang[edit]". "$lang[usergroups_copy]" ), TRUE); @@ -72,7 +72,7 @@ "", "(groupid:$group[groupid])", "", - "", + "", "$lang[edit]". "$lang[usergroups_copy]". "$lang[usergroups_merge_link]". diff --git a/upload/source/admincp/discuzfiles.md5 b/upload/source/admincp/discuzfiles.md5 index 084fde98..bd7d7071 100644 --- a/upload/source/admincp/discuzfiles.md5 +++ b/upload/source/admincp/discuzfiles.md5 @@ -67,7 +67,7 @@ b4bc857369759e98d5a1243d4400f2c8 *template/default/common/header_common.htm 30e8ae1dc35bc51162e84b1f12b44e88 *template/default/common/header_diy.htm 1ae0483740c9e37416bd07c068bdda1e *template/default/common/header_diynav.htm 19c62212d41889dca71ee8239cdbb654 *template/default/common/header_qmenu.htm -317c2a47f474617d456eaf49e0c37643 *template/default/common/header_userstatus.htm +da97c14dd0bf7499fd2eb3334ad200df *template/default/common/header_userstatus.htm d41d8cd98f00b204e9800998ecf8427e *template/default/common/index.htm a3fa81ef3ad7b3aa6599a423d3f68c49 *template/default/common/invite.htm 8d18332c488ef29b14efb05a9565496d *template/default/common/ipnotice.htm @@ -82,11 +82,11 @@ f987de58cd8a82032394b239c16726f3 *template/default/common/preview.htm c956793b272feb6c0d7b2c71a43f02b7 *template/default/common/sendmail.htm 196d51d94145aa76fcbf5026fbba50d9 *template/default/common/showmessage.htm 31214716dd4c3f47bdee4169a120827f *template/default/common/stat.htm -0c14a0de8dd6eb2a1a340825ae33bff5 *template/default/common/upload.htm +9d7d26e0ff7892ee0a2973bde15c207e *template/default/common/upload.htm fde427b09522cee417c37ddec65af441 *template/default/common/userabout.htm cea84eba65d990d7dce5ad76a9a0bf9e *template/default/common/widthauto.css 57697d555402cff54aa4c03315b6e85f *template/default/common/wysiwyg.css -dd18c3531ed42b5800810ff2705a336c *template/default/discuz_style_default.xml +44546576a94f7ce6a7bfc36cbfb1d809 *template/default/discuz_style_default.xml 176f33f992cd1f1f2107aac16c1ec060 *template/default/forum/activity_applist_more.htm 7b0c83a6298c11a3dac98ae9273d8b81 *template/default/forum/activity_applylist.htm ba31d31a54eab7c21f693af4fb175981 *template/default/forum/activity_export.htm @@ -120,8 +120,8 @@ f62503edf12f2e2dc55a5c8fa88575c2 *template/default/forum/collection_view.htm 4a60181a938977264a4622cda680edd0 *template/default/forum/darkroom.htm 41b08a5816dcc4680fa07ae103cf6c61 *template/default/forum/debate_umpire.htm e3c16c258c373dd765e705c94235018e *template/default/forum/discuz.htm -d308e01628cb218b97b0dd036a6858bc *template/default/forum/discuzcode.htm -75c9cafa056518d8ec7f43066ebeed75 *template/default/forum/editor_menu_forum.htm +fcf7f502186c99c803cc48a2f641ce55 *template/default/forum/discuzcode.htm +ed1de8a0cf489f9a969d4c21a3d6fa36 *template/default/forum/editor_menu_forum.htm aaf4e500dede81ea68286da2061b2c42 *template/default/forum/forumdisplay.htm da788356bc3bf1d33c263dcbb492b1ff *template/default/forum/forumdisplay_fastpost.htm 9a9e5a216e5f68bde63379ec7b7f4f08 *template/default/forum/forumdisplay_leftside.htm @@ -130,7 +130,7 @@ ad5195dd386431de066cdc097e239395 *template/default/forum/forumdisplay_list.htm 8e3a24898257c4afac88594c8f411e1a *template/default/forum/forumdisplay_pay.htm bd55f788f5954a153a69497971d0e841 *template/default/forum/forumdisplay_sort.htm 6b226a0197b30d5ea628f7df57b2b182 *template/default/forum/forumdisplay_subforum.htm -7a8f007849f40485b13a5225f1c68cd1 *template/default/forum/guide.htm +5c940667f2b7afad49b0a4feb9a4b5d5 *template/default/forum/guide.htm 8f34f90145510799afa84a65df057ebc *template/default/forum/guide_list_row.htm 5fc89c347d01826e27850867948bf2c8 *template/default/forum/hiderecover.htm 7215ee9c7d9dc229d2921a40e899ec5f *template/default/forum/index.htm @@ -159,7 +159,7 @@ b2330bde173fc5469a976f824d64a485 *template/default/forum/postappend.htm 2a47aaff27a4658c8fa940db36716733 *template/default/forum/post_debate.htm abc172735278ea16833ba4a83a4440cc *template/default/forum/post_editor_attribute.htm 4bfed8ceb0f5c65438d5cb87dbee8dfe *template/default/forum/post_editor_body.htm -93dcdb958381eccb6553c1bb269ac78a *template/default/forum/post_editor_extra.htm +119ac691e2e861787c6ec30fc77f0eb3 *template/default/forum/post_editor_extra.htm 6fa6533634a774c091a70c58400721e1 *template/default/forum/post_forumselect.htm 04a0cbc06d986e32cd908f999babe7c5 *template/default/forum/post_infloat.htm 5c5c181407b9cfaccce394bf5292c907 *template/default/forum/post_poll.htm @@ -170,7 +170,7 @@ abc172735278ea16833ba4a83a4440cc *template/default/forum/post_editor_attribute.h d30d13a5888169dbb380dfd672b48959 *template/default/forum/rate_view.htm 2771847e158b929c014823b4d63dc91c *template/default/forum/recommend.htm a7bb311ff41a6454269683330f215bbe *template/default/forum/relatekw.htm -272913c8f987b680f361dd85960caf7b *template/default/forum/search_sortoption.htm +7a3df0657808e80f114ac92e980b1a83 *template/default/forum/search_sortoption.htm 3441971790ebe9cad4ff407f8c6dd4e5 *template/default/forum/seccheck_post.htm 555a09a7923ebf140db17e57d0314c8b *template/default/forum/stat_main.htm 385452e0e072db85f0a99b9a4884317d *template/default/forum/stat_memberlist.htm @@ -189,7 +189,7 @@ d3d572254d3972ae7e0b4eee19f41cd9 *template/default/forum/trade_info.htm 0207cbfc45722c410b6f20c9823e2338 *template/default/forum/trade_view.htm 10fc853e548f1e3ed3ea7f350716cf83 *template/default/forum/upload.htm 80f17147dff1f144b6ccea422c7b3f2a *template/default/forum/usertag.htm -f666ef139ac63654dfefa4e3ff0a0193 *template/default/forum/viewthread.htm +691cba5d04e0ce10cc210585d392e2ce *template/default/forum/viewthread.htm a965c5bc0a221e19a471c878b78cb6b5 *template/default/forum/viewthread_activity.htm 5bd7c6408041fe5b90baf3dfd97a439b *template/default/forum/viewthread_album.htm 8715e7faf2fafecc5972cc8e06a3c962 *template/default/forum/viewthread_debate.htm @@ -317,7 +317,7 @@ f889751eb9e455fed31d782272af3003 *template/default/home/space_magic_mybox_opreat 4490e2e9d7a55f691662916ba6de7a56 *template/default/home/space_menu.htm 7e7138f1b3c22bd6b8671ae0b7988a20 *template/default/home/space_notice.htm f29ffdea85f26b61e694574ed7f633e1 *template/default/home/space_plugin.htm -3e17716045cb7e2ad2718d881550eab1 *template/default/home/space_pm.htm +8323be2bfdfafa9e0668f10d29836992 *template/default/home/space_pm.htm c1f3ed0d23e80ed3cfd33afda9433625 *template/default/home/space_pm_node.htm cbfb462a1269283ac208c9c8fcd83bdc *template/default/home/space_poll.htm 9d05a9fbfc5dccf9615267a2a147b61c *template/default/home/space_privacy.htm @@ -334,7 +334,7 @@ f11705f9f30d402dc14dca5d908a6198 *template/default/home/space_status.htm db9b21c491b406291b33f5ec399b5955 *template/default/home/space_task_detail.htm 78a25ca9f00dfce67c545e1c543d35bc *template/default/home/space_task_list.htm 9ce3c04869aca7db916acd472ddbe2af *template/default/home/space_task_parter.htm -4eea24462f9581526a2286f7f33f6983 *template/default/home/space_thread.htm +9cf549b5d4c62ce459102661b249a72f *template/default/home/space_thread.htm d3e91d7bc001f3ee7f0c48ad0fc45333 *template/default/home/space_thread_nav.htm 5d13b24f6ee528a83c8a4f4cdd839ed2 *template/default/home/space_trade.htm cbbdfc99b13b78bb124c58c93ccf6b94 *template/default/home/space_userabout.htm @@ -422,7 +422,7 @@ e0e7faa16d30211d95a40e54ccdc4e79 *template/default/m/js/quickreply.js d11385e5681d7c4d9bf378965d90581f *template/default/m/js/showactivity.js 3154341648d675ec06e77148451b41f7 *template/default/m/js/template.min.js 5daa9dcc63d95f9c89adf2345551df91 *template/default/m/js/topicadmin.js -2cce8b129d8f044f35a73e433aea783a *template/default/m/js/viewcomment.js +fb3eb4940079b1e245cae18cbf8396f0 *template/default/m/js/viewcomment.js c7bf1f6552697bf25846e7966b173085 *template/default/m/js/viewthread.js 0f9dbb57da943a0c6f4f0c42617791ed *template/default/m/js/viewthread_activity.js f75ec3147fefd099f4cc720650a2d409 *template/default/m/js/viewthread_poll.js @@ -438,8 +438,8 @@ e6434b175bc7d818cbe8d3db4313d602 *template/default/m/newthread.htm 762d00a6695c37c91cdba6958f03b684 *template/default/m/tmpl/error.htm 82c47cfbbde3291422ad7f61b31e43e5 *template/default/m/tmpl/forumdisplay.htm 7d7c36ba8525beafd5538c731c7ff5d6 *template/default/m/tmpl/forumdisplay_picbox.htm -30bce639a3f486e307f0a11cd37a977a *template/default/m/tmpl/forumdisplay_showactivity.htm -68d58c6a91ff7cbfa44cd90535220aee *template/default/m/tmpl/forumdisplay_wsq.htm +7c6630e20baf49daf8022ec093c3ea2e *template/default/m/tmpl/forumdisplay_showactivity.htm +1cf29047e9ab605bb8e7ace359cd50cb *template/default/m/tmpl/forumdisplay_wsq.htm bff04db64f098e0dd329264d5c7f56ef *template/default/m/tmpl/forumlist.htm d41d8cd98f00b204e9800998ecf8427e *template/default/m/tmpl/index.htm 11e26a1c9e48a5c2e44fd2bd1aa44d8b *template/default/m/tmpl/infocenter.htm @@ -465,7 +465,7 @@ b9af3dbef3d995c8c274ee15f54e10e2 *template/default/m/tmpl/viewcomment.htm 276453fad5adc1bdb54b10a2ebea3217 *template/default/m/tmpl/viewthread_picbox.htm 43db9ef13ded5b95f7587d5fbb220230 *template/default/m/tmpl/viewthread_poll.htm 8138a8c631ce426be9dedad0ef9ac9aa *template/default/m/tmpl/viewthread_reward.htm -a6f897b6d74613f18e04515c547e4aea *template/default/m/tmpl/viewthread_thread.htm +d5463167337af7907ce1b07e2ceabb4a *template/default/m/tmpl/viewthread_thread.htm bccc22258e6fdf3b6125191a2ed4aca1 *template/default/m/toplist.htm 02517fe63c75c86c30832297922170fe *template/default/m/viewcomment.htm 862bb1118eb253f637a3a69d7cdc77da *template/default/m/viewthread.htm @@ -574,14 +574,14 @@ bdc1f59506fecae78d67657440d8c584 *template/default/search/blog_list.htm 7a3f2b9b081024dd91b057ae04d117f2 *template/default/search/collection_list.htm 7eeaee22204feb007672b441848806ae *template/default/search/footer.htm 42d00bb003a4fbd453310f211f3b24a8 *template/default/search/forum.htm -1154a6a14c79f4fd1acd64e8080b7a0b *template/default/search/forum_adv.htm +d964ac113980645942e8f96527d830f3 *template/default/search/forum_adv.htm 8db5061665b5a887258dc9c42dd17afe *template/default/search/group.htm 38404dd2b5f39005af8a1066b48529c6 *template/default/search/group_list.htm c1ce418721f70cbb1ba665a0db7187cd *template/default/search/header.htm d41d8cd98f00b204e9800998ecf8427e *template/default/search/index.htm fcef6aa02e8f0691b8f5da715e9c81c2 *template/default/search/portal.htm 8d68ce30fe23628b79d94f79a01f22a7 *template/default/search/portal_list.htm -3cabc424673171a7aeb2fd80fb9f8dbe *template/default/search/pubsearch.htm +46713784821ee6b8835be737329d54c0 *template/default/search/pubsearch.htm 51e6de6f0783d769894c22b93f8a094f *template/default/search/sortoption.htm 6fc65c7a6115f88b87e2812e76c993b2 *template/default/search/thread_list.htm d41d8cd98f00b204e9800998ecf8427e *template/default/style/index.htm @@ -763,9 +763,9 @@ aab6115d6da094789d9fab9920c0848d *api/trade/notify_credit.php a014963f4ea09d3a9389b9100f9512e8 *api/trade/notify_trade.php 2ae72f0466958345897318ac063bae84 *api/uc.php fa24c93c4e4751d52e3e8b9e8e2e6fea *m/index.php -b0db854adf1ca9dc7fa10f278fd010d4 *source/discuz_version.php +3d9ae22de6267a349ecbeb155b650818 *source/discuz_version.php 7215ee9c7d9dc229d2921a40e899ec5f *source/index.htm -0a7896849dd83bbf64a31ccf11e58a17 *source/admincp/admincp_admingroup.php +ae6fe4d8612740669c1361b888b238c9 *source/admincp/admincp_admingroup.php d4644aa3ec2ad361b9cd1d2e1ca544e5 *source/admincp/admincp_adv.php b3d8f1df09c1490a9859d83c2d2385be *source/admincp/admincp_album.php ef610689497ab25a07c3d74737e8dccb *source/admincp/admincp_albumcategory.php @@ -781,7 +781,7 @@ dda34ea9edc3f37fb7f3c8bae9d587e0 *source/admincp/admincp_blogcategory.php ac14d324de325ee9485caca992f796c1 *source/admincp/admincp_card.php 597c42c5802116e83ed3bc51fcfce4d6 *source/admincp/admincp_checktools.php b40bc52669c410d5fbedaaf37550fb01 *source/admincp/admincp_click.php -808a228842cd1b97e42deaf23d8e864f *source/admincp/admincp_cloudaddons.php +af73d9eaa3ff32fe1eeab71c8423043c *source/admincp/admincp_cloudaddons.php d18aad8908273cdaa7a76cc318aa74af *source/admincp/admincp_collection.php 93c0cd010c921640c9bc5c06aa6c9394 *source/admincp/admincp_comment.php be84f1b321231cc06f60bc3ec35318b4 *source/admincp/admincp_counter.php @@ -805,7 +805,7 @@ a64eeaeaa34175599ea1266d2f3eb4fc *source/admincp/admincp_login.php 54483c3ed9b0f7bf8c388e339a188b8d *source/admincp/admincp_main.php dcf3344e1ff26051c51fb5b913b3c64a *source/admincp/admincp_makehtml.php 0528e6f9eef3db49afc2f6bcaee55548 *source/admincp/admincp_medals.php -8ef08b4d59385426f849b94190f8186d *source/admincp/admincp_members.php +7fd4427da1b74d2f2540e5c702a1ad2b *source/admincp/admincp_members.php d84ce153a40a5d5a23791a759f12369a *source/admincp/admincp_membersplit.php 9e10be63a8863d4b02e2f24df28d3154 *source/admincp/admincp_menu.php 434c58c867539395ce7e42245df4421c *source/admincp/admincp_misc.php @@ -814,7 +814,7 @@ d84ce153a40a5d5a23791a759f12369a *source/admincp/admincp_membersplit.php a0ee6af6e5f6d28f04667b50dee1418f *source/admincp/admincp_optimizer.php 1f3c59f706eb00a835546445e535836b *source/admincp/admincp_perm.php bd23c59350b74e3443721d34fd8d0b59 *source/admincp/admincp_pic.php -d8b8a5b91f2598ab8bb676333f2bb282 *source/admincp/admincp_plugins.php +b5136feb394de017940bf98245dc9fbd *source/admincp/admincp_plugins.php c86e3f25f9abb4293d0f6588b564691d *source/admincp/admincp_portalcategory.php 969afc1130dccb5d8ff826e4206b6d2a *source/admincp/admincp_portalpermission.php 917a2d1d146988b21834f13e8aaae898 *source/admincp/admincp_postcomment.php @@ -840,7 +840,7 @@ dae99ec3f19c1577d17d10ef599a49fa *source/admincp/admincp_threadtypes.php 53ae77c613cd401a01e37cf24397438a *source/admincp/admincp_tools.php cb659766c1ca2ad229ed094a7b4a2187 *source/admincp/admincp_topic.php d44745dad9ecd4a464394605476ad4f2 *source/admincp/admincp_tradelog.php -9af8dd9ead43f4d9deda57729ffd2e02 *source/admincp/admincp_usergroups.php +ce700bdec06c78ab9b8e61a7f141a9a5 *source/admincp/admincp_usergroups.php fbf03d461e9ba987c58da873bf8ba7ba *source/admincp/admincp_usertag.php 3803e3f68cb5479362264c8bbe5ac561 *source/admincp/admincp_verify.php 6b669f9aae2c0f1b89812482fa36d645 *source/admincp/discuzdb.md5 @@ -851,12 +851,12 @@ d41d8cd98f00b204e9800998ecf8427e *source/admincp/moderate/index.htm 1163da172483fa357f7e32e594dbb6f1 *source/admincp/moderate/moderate_blog.php 0ddc624ef640faabad880993e1dd1cdc *source/admincp/moderate/moderate_comment.php 8d2aff0a87e04b2ac44ecda66fb4028a *source/admincp/moderate/moderate_doing.php -39f0afd6d4fbcd8903c4dfa45cbb93ea *source/admincp/moderate/moderate_member.php +f894484f4a2845d10b189d3447d5583c *source/admincp/moderate/moderate_member.php 6962b4e3aeea6be675e737ab48aff64a *source/admincp/moderate/moderate_picture.php b9a7cbe8c910ba822646fb1e04063538 *source/admincp/moderate/moderate_portalcomment.php -9efacbb68d20f4c9e5d7f69950308191 *source/admincp/moderate/moderate_reply.php +d9ef63571da0a75a8922fe6215365c85 *source/admincp/moderate/moderate_reply.php 80a918eda876b0ac2b28f93d897d9e9d *source/admincp/moderate/moderate_share.php -c07c4b20d08cbd15394e6c3936a88e38 *source/admincp/moderate/moderate_thread.php +d2ff8e21664cfc4a02f68dc0cd04bbe8 *source/admincp/moderate/moderate_thread.php c7d5031d22889c680af8f87028787484 *source/admincp/robots.txt f134cd176dc876fbc23a395f4772c115 *source/archiver/common/footer.php 9b17399dce8be4a59de9d1b68a06940c *source/archiver/common/header.php @@ -978,7 +978,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/block/space/index.htm 672e712057e3b4c4192050a2cb4a1444 *source/class/block/xml/blockclass.php f422dbf6df91fc8e84dea740eb615562 *source/class/block/xml/block_xml.php d41d8cd98f00b204e9800998ecf8427e *source/class/block/xml/index.htm -dea737896159e74a9fc20f06445f591f *source/class/cache/cache_file.php +6e8b818cfcc66056923aabf4bf61b06a *source/class/cache/cache_file.php 29c4a259a9c0fffaa1e8452eae22b047 *source/class/cache/cache_sql.php d41d8cd98f00b204e9800998ecf8427e *source/class/cache/index.htm 53ec676bfaf1d2168e28660b595ebb08 *source/class/class_bbcode.php @@ -1032,19 +1032,19 @@ bc5940c2be4338f2288f0cb179ecb685 *source/class/discuz/discuz_table_archive.php 438fc0d5ef8f04cdb24c96be52bac04a *source/class/discuz/discuz_upload.php d41d8cd98f00b204e9800998ecf8427e *source/class/discuz/index.htm bca8d6b270c0e9383383afe95dcfefe5 *source/class/extend/extend_thread_activity.php -ca7a561187dc9f012ac92a40faa4fdc2 *source/class/extend/extend_thread_allowat.php +44b896c111863a8b0a973bfa0c1ee00a *source/class/extend/extend_thread_allowat.php 530631c6051a3180d732df9ba06e8951 *source/class/extend/extend_thread_base.php 4c3bdc3ea27640ea7c8dc7e7491bb949 *source/class/extend/extend_thread_comment.php 244e38fd27b2ff8181128c6c2cbc0e14 *source/class/extend/extend_thread_debate.php 1c1b57af36824f831e3af9cb7a59aece *source/class/extend/extend_thread_filter.php 6dffc4cbecc6a990069faf257410ca4e *source/class/extend/extend_thread_follow.php -c3a93d216b782304490537a191073562 *source/class/extend/extend_thread_image.php -9f9f40d592ef8f571f77a800fbb41176 *source/class/extend/extend_thread_poll.php +a55d60eec8a296ba61ecfaed8da39fe5 *source/class/extend/extend_thread_image.php +afa19fafe4072e71f251692f3aa7eb3f *source/class/extend/extend_thread_poll.php 0317ddde00e5a2dc025ea9347d36a621 *source/class/extend/extend_thread_replycredit.php d87591fb9482bc2d9271a5b8fff61da9 *source/class/extend/extend_thread_reward.php 8ef6276349f810a76e29d82f953fa41d *source/class/extend/extend_thread_rushreply.php -20edf28f09b2dd87b928fac6e884c9a9 *source/class/extend/extend_thread_sort.php -831bb966aec558cf52bd4b939d33b392 *source/class/extend/extend_thread_trade.php +79c868ea7516f9d3234a992833201bfa *source/class/extend/extend_thread_sort.php +d151244f6a0a3298ddc711c69f3f4de6 *source/class/extend/extend_thread_trade.php d41d8cd98f00b204e9800998ecf8427e *source/class/extend/index.htm b2c852e657aff4691b6901b924a53da8 *source/class/forum/forum_upload.php d41d8cd98f00b204e9800998ecf8427e *source/class/forum/index.htm @@ -1099,7 +1099,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/memory/index.htm 1e35072da7b92ac96d403679d76543fa *source/class/memory/memory_driver_apc.php 364805654ff2af0fbce42811e9fbd2e6 *source/class/memory/memory_driver_apcu.php 9c96bd705b9fd5cf3ea2bef7fe6ca5df *source/class/memory/memory_driver_eaccelerator.php -662c2b4a2b8b9b3d26a439e085fbbb71 *source/class/memory/memory_driver_file.php +152137fc63577d03c94c1fe012bd9d43 *source/class/memory/memory_driver_file.php 93c2f54e9eb576ba438ca171d57f7869 *source/class/memory/memory_driver_memcache.php d4257eb12b23c177b2fbdb71f86c6b0f *source/class/memory/memory_driver_memcached.php ba3c58a9e3151dbe2da3b90f227062b4 *source/class/memory/memory_driver_redis.php @@ -1107,8 +1107,8 @@ ba3c58a9e3151dbe2da3b90f227062b4 *source/class/memory/memory_driver_redis.php 717cfdbae201aa8a248d75ae5722d1c5 *source/class/memory/memory_driver_xcache.php 56f6173531e5ed99ea1152ae8e3a1ae9 *source/class/memory/memory_driver_yac.php d41d8cd98f00b204e9800998ecf8427e *source/class/model/index.htm -ac7a6319f00ecdd86f2b4588997d84e4 *source/class/model/model_forum_post.php -601b69562c7c1e18893256d08d498fa7 *source/class/model/model_forum_thread.php +f5fa9d10c47adf2c95e663eebeb059a6 *source/class/model/model_forum_post.php +6de7703678c5cf3aec4bcbc3ed576ac8 *source/class/model/model_forum_thread.php 7215ee9c7d9dc229d2921a40e899ec5f *source/class/optimizer/index.htm bbb7b9348becfc1bda0b510faf533948 *source/class/optimizer/optimizer_aggid.php 5ad13cc3f45bbf2f660603be28bb999a *source/class/optimizer/optimizer_attachexpire.php @@ -1239,14 +1239,14 @@ c1e9d7cd77b68ae55e85c9419cfa19a4 *source/class/table/table_common_smiley.php 000f6cfb13bf07c389a1cf89cfd07023 *source/class/table/table_common_sphinxcounter.php 0af9027d0a7ff91259ac307fee18c469 *source/class/table/table_common_stat.php b24101ac31fb996e17f97aed925ce64d *source/class/table/table_common_statuser.php -661706b93046a2ebc58d603bf973943f *source/class/table/table_common_style.php +4b6f58382ca87a89daf8f1f04f75d3d8 *source/class/table/table_common_style.php 0a96afc880e698fb39760e1a8a6aef0b *source/class/table/table_common_stylevar.php -f3695d5c1d13eb6fee367a48ab582495 *source/class/table/table_common_syscache.php +698067e61287dd27785f5c1524546cd0 *source/class/table/table_common_syscache.php 208445d9a8b3458753cb5c7b434e6fb2 *source/class/table/table_common_tag.php fc447f7c2e48d3b20e33e65b476574d0 *source/class/table/table_common_tagitem.php a02e005b81aa1d0c1524e037052446b9 *source/class/table/table_common_task.php b36f3aa41966c4681b523617512b0247 *source/class/table/table_common_taskvar.php -e4fd5484f4ce0610e557c34ab96d00e4 *source/class/table/table_common_template.php +3aa5612df966284ef284c00debf821f0 *source/class/table/table_common_template.php 60fa85d70a34cfd2708f310c4647ab45 *source/class/table/table_common_template_block.php ba050bbefa6f34d367f41a8d27f7f265 *source/class/table/table_common_template_permission.php 37f4c233b56aeb64bdf68e345684f0b0 *source/class/table/table_common_uin_black.php @@ -1258,7 +1258,7 @@ ab8f0b145db03a5968e80d9d94c8586b *source/class/table/table_common_word_type.php 041c0dde68b4eebfc69c7e41b17a84ae *source/class/table/table_forum_access.php 304a3d667dc25bafa3bbbb7d05adc3f1 *source/class/table/table_forum_activity.php 084e5708dd66fab5297985ce18d1069a *source/class/table/table_forum_activityapply.php -b37bb440a39599a0302133c9d4de52f8 *source/class/table/table_forum_announcement.php +3b37abe181636b3ae50d02ca23f6526a *source/class/table/table_forum_announcement.php b6c606008cd0be757fcd72b1b07ebfac *source/class/table/table_forum_attachment.php b6731446f7d8514eaa780d7bc1be77dc *source/class/table/table_forum_attachment_exif.php e5683f1c08b8370bcf15ccec97812e6b *source/class/table/table_forum_attachment_n.php @@ -1317,7 +1317,7 @@ ecbb04bb9a88340e7154d020a41fd8d7 *source/class/table/table_forum_replycredit.php cd142f7d9d56f6f5cdf20ba8bcb80841 *source/class/table/table_forum_sofa.php 292ba4a8221d934d4069e1e82d0bbb9c *source/class/table/table_forum_spacecache.php 40059149d0a0675213c0b0ac29b99fa4 *source/class/table/table_forum_statlog.php -f5449272d0baaeca1bfbfc6bf0e2c580 *source/class/table/table_forum_thread.php +ef4254b19b2d8773eb3546d198c0e958 *source/class/table/table_forum_thread.php 162b9dc329cba0cc0e4a3c75525f3e1e *source/class/table/table_forum_threadaddviews.php 588140e7c65c8722818cb1150222c795 *source/class/table/table_forum_threadcalendar.php 2923528d736502648736bf1cad609fa7 *source/class/table/table_forum_threadclass.php @@ -1457,11 +1457,11 @@ b69da5813be10a3e16ae6bdd91f406a2 *source/function/function_admincp.php ada3c706e823b368f3a444590f78fc01 *source/function/function_attachment.php 579f4ce43abe7a920ba173fbcdf7bbf4 *source/function/function_block.php 6273f76afcac3b3ec06cfd03eaf6d644 *source/function/function_blog.php -10152e216afcc2730c7961778fd2d36a *source/function/function_cache.php +bebf182768886ee2cf2aa320b89ca87d *source/function/function_cache.php dbdc0c95f85c3132c8a14bf036f052ea *source/function/function_cloudaddons.php 77f06f33b827d1155c5c3c2f28bc7909 *source/function/function_collection.php c7085897146b34fa0c94d3c08f77f2a9 *source/function/function_comment.php -12be1f7164c412558e06ae596b7e6904 *source/function/function_core.php +fcc028da57d3dd712a7ee03315cf88ea *source/function/function_core.php 9bc78bc4596f7711cd5d338a791bc9be *source/function/function_credit.php 2ed08c1bd7126db70dd6059ec43dffb4 *source/function/function_delete.php c9be13688c9c6d218b422459c7814fe9 *source/function/function_discuzcode.php @@ -1472,19 +1472,19 @@ ed60f1ffa5730c849ff679cf8fd5efcb *source/function/function_exif.php d487c20fb68db6b9948a3e3396b4ab05 *source/function/function_feed.php 0194bc7995bdad2cf85b572dd93b84b3 *source/function/function_filesock.php e6c6bc0b0bfdf973cde830b2020ec9e0 *source/function/function_followcode.php -fba64bced118b45e2120b75b4961ddc0 *source/function/function_forum.php +01feeee6e70c949e5c7da93c402d296b *source/function/function_forum.php 1066cc7529f9814681f905aa4f36953e *source/function/function_forumlist.php 10758d44f84170af87ed5d0a4f15d657 *source/function/function_friend.php 52fcfdabe5e9e0281b4fbed0c44ed74b *source/function/function_group.php abe3f94e960d66f15bb08ec6195c029f *source/function/function_grouplog.php c7b201f1fbbee7b2d9f3e9c06277cc61 *source/function/function_home.php -55b57ec5873e397ffb7a7cc4f5fdf5ce *source/function/function_importdata.php -9f5d7bb25602f6dce197ade22f6614ee *source/function/function_magic.php +7a7664162179d2a86d16b08933c9aa86 *source/function/function_importdata.php +1eeb2426b750809de6e66595d7da9c39 *source/function/function_magic.php ab0eb76dbff9097ab70c9460dc50ad25 *source/function/function_mail.php 8ad7c04cf85fe6a59b3917b0bf1ec3ab *source/function/function_member.php 40ee75482ffa0542df601d1e6184e940 *source/function/function_message.php 7bec80063cf1cb941651ec05059d25f6 *source/function/function_misc.php -d9d16b981b7a56b1087a84dab65196bb *source/function/function_plugin.php +f9f4b98c23e49f4e19e80f7af28eb1b0 *source/function/function_plugin.php 4a53087b86b6d059e1d3fb7c38eb279d *source/function/function_portal.php 3db7bf5c8d30e9b5f566c71d4e84ecbc *source/function/function_portalcp.php b030eec0a0920fac9d01c6cb16f9f64b *source/function/function_post.php @@ -1493,9 +1493,9 @@ da11dcd0d3d07491aca87e16effbd524 *source/function/function_preg.php 1af32e0738148efe6d6f6ef7c6fec714 *source/function/function_search.php bceebf4fa1aeb10668424fe88dcca4b8 *source/function/function_share.php 670a4498c0ccba1eeac0c3b91337558f *source/function/function_space.php -2242ac6e2d49de4a0e5b29b2eaf49e6f *source/function/function_spacecp.php +bbde4d1061fc3bc32fc92f07eeb0a9be *source/function/function_spacecp.php 8b8fc621a0f24e3fab045d20d6c23dcb *source/function/function_stat.php -3e6747e8f8140ac94263a0c8ee145390 *source/function/function_threadsort.php +bc95ffec0801a4bff86e34792760b3cd *source/function/function_threadsort.php 3956999f5ff05d86e2a3225b49795d9a *source/function/function_trade.php 742be580e914f53e900a4536ced18cfa *source/function/function_upload.php d41d8cd98f00b204e9800998ecf8427e *source/function/index.htm @@ -1557,7 +1557,7 @@ c7392f1e6d4f0aae8cf77f0d4ed73165 *source/include/misc/misc_promotion.php d09e1b7d03e908c9f0cd1b2f902b6336 *source/include/misc/misc_ranklist_picture.php 29a952d5e41b28255d01c8c1d53ffdca *source/include/misc/misc_ranklist_poll.php 6e1f87fd24fdcdf55b4fe90bee2f7afc *source/include/misc/misc_ranklist_thread.php -a12524d985f2e6e8c560002e5145d046 *source/include/misc/misc_security.php +05051d579264208f3a14aba522b476b2 *source/include/misc/misc_security.php 3f2fb687c6fa491e17bafe6df652250d *source/include/misc/misc_sendmail.php 04b60d27a4cc8fea57310fccefd1ee48 *source/include/misc/misc_stat.php 8d2f36bf8309079ea970307bf4d73691 *source/include/misc/misc_swfupload.php @@ -1568,7 +1568,7 @@ f56a1f879c2930be194bf6a9bea45386 *source/include/modcp/modcp_forum.php 4938f4a2850e1782a3637ad0f4d908c0 *source/include/modcp/modcp_home.php 6cc5d5f037c8da778f3db8fb3e88dd0a *source/include/modcp/modcp_log.php dde0eee700ab35dd90e4d34faf4be7d5 *source/include/modcp/modcp_login.php -820b9db31d7be6ccc31fceade13d0fdc *source/include/modcp/modcp_member.php +404892c0bf89fb29f46e00a8f079d1e0 *source/include/modcp/modcp_member.php ff8c2a355d8ea2fbce4b3c1ac2761a5c *source/include/modcp/modcp_moderate.php 625cb9707b0dc2cce54196d4ecd5b0e0 *source/include/modcp/modcp_noperm.php a801e5b7a9e854353a693cc9929df969 *source/include/modcp/modcp_plugin.php @@ -1592,7 +1592,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/include/post/index.htm f629df076baef2c3bce97b9fbdcb0da6 *source/include/post/post_albumphoto.php a2d20eeda78bb7dd7ce7367bc206e790 *source/include/post/post_editpost.php 13dd56bb993da5fc583c4f58307ea4bc *source/include/post/post_newreply.php -d19649e4bb1b9e66aa78ebcef01c24cf *source/include/post/post_newthread.php +2c79310a543624e9f15a3808354a1253 *source/include/post/post_newthread.php c5841c1b8c2d7ce308b860ef757b7caf *source/include/post/post_threadsorts.php d41d8cd98f00b204e9800998ecf8427e *source/include/space/index.htm c8e9a4fecc10c207f932a0b5dfb0fdbb *source/include/space/space_activity.php @@ -1671,7 +1671,7 @@ d30631e3aaebf711b44444ca5332077d *source/include/topicadmin/topicadmin_delpost.p 08f5ef647351ae049485cd5bd1ef8718 *source/include/topicadmin/topicadmin_getip.php 8789bdb4f6ca2e99bfd458f88de99858 *source/include/topicadmin/topicadmin_live.php 5e35a1340fe516d2de92331b98d5ffa0 *source/include/topicadmin/topicadmin_merge.php -ddfd53d51a153b1e6832edefe0b6f0e7 *source/include/topicadmin/topicadmin_moderate.php +0d6bd468766b1b665e2f5e40dc8e197f *source/include/topicadmin/topicadmin_moderate.php 58051bfa29151abcc386c8e48386b784 *source/include/topicadmin/topicadmin_refund.php 323a1c03557343ba8cb37c1b0ebda81a *source/include/topicadmin/topicadmin_removereward.php ac0288a9473346e1a6f279cf6b86b613 *source/include/topicadmin/topicadmin_repair.php @@ -1750,10 +1750,10 @@ d41d8cd98f00b204e9800998ecf8427e *source/language/group/index.htm 89f48d15b27c2cff9b9799667d22b3b8 *source/language/home/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/index.htm c912d218c2e9bb4c313190fc0f4a7339 *source/language/lang_action.php -ce79239191ff770d157cf812b8a0e564 *source/language/lang_admincp.php -dd472a676352e1e3791ccf5f04f0b678 *source/language/lang_admincp_login.php -9798f10344de2486f60004e6e50ce374 *source/language/lang_admincp_menu.php -0230b35ac01b709650067000fd5fd975 *source/language/lang_admincp_msg.php +1d02668acd0f1020701f6f8c9f64fc21 *source/language/lang_admincp.php +b166fea835f2faa5ca0d9e3bb2bf447a *source/language/lang_admincp_login.php +ff290415f0015a1c056db06872a62ae4 *source/language/lang_admincp_menu.php +034e6f57c5fb21a49677acbb9343a20e *source/language/lang_admincp_msg.php 2e064414a9f5383868c70e0cb661bef5 *source/language/lang_admincp_searchindex.php d54c9ce6430b24dc80880b9acfd500ee *source/language/lang_blockclass.php 4537056a99d91d0b8a67898ba575ffcb *source/language/lang_cloud_register.php @@ -1763,7 +1763,7 @@ ac434839cd9a6049134f647d2ea0d849 *source/language/lang_error.php 7eb8933eb7846b4c173df490c8a453d2 *source/language/lang_exif.php 9f9c4f8b58d1f7a1963794f2f74cc023 *source/language/lang_feed.php f1e320d5eceb22226759968178a75491 *source/language/lang_friend.php -45d9aa18937f62a2ebd87498924b6eea *source/language/lang_message.php +23245f9fefd59dd3e46514b12733838c *source/language/lang_message.php 5c40419a2194878bd43014f1e8e2ae9e *source/language/lang_notification.php c39ee46128701359ea33de0213e93d15 *source/language/lang_optimizer.php b22dda0c98c10eaec346b3c70b30059d *source/language/lang_portalcp.php @@ -1771,7 +1771,7 @@ b22dda0c98c10eaec346b3c70b30059d *source/language/lang_portalcp.php b81203d2936bc280891894a3f179ead7 *source/language/lang_security.php da864007491d29f0342ef854cdb073bf *source/language/lang_space.php 22954c10c141b75c747787782f8a715a *source/language/lang_spacecp.php -c6364a32c9c7d41d9e7df66d4509487e *source/language/lang_template.php +5a369597345b0b72488e1f5840db7fde *source/language/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/magic/index.htm ca81a92f5afa3ee3f67da6e7484a08b5 *source/language/magic/lang_anonymouspost.php 317d745f5753f25ae8ea2bc85a00c35a *source/language/magic/lang_attachsize.php @@ -1800,9 +1800,9 @@ ccc52613d036399e1375c9be81b3ffd3 *source/language/magic/lang_updateline.php 7215ee9c7d9dc229d2921a40e899ec5f *source/language/member/index.htm f64e338efbbb60976fda1451c7555436 *source/language/member/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/mobile/index.htm -6d8326eed6b84655b8a27ac041c63609 *source/language/mobile/lang_template.php +4f62e4f16413aa4f8eecfcfcfb924c65 *source/language/mobile/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/portal/index.htm -7c68bf1fcf6eee090a04e8a888616fa4 *source/language/portal/lang_template.php +d60d5335a0b022e2fdd8983e2b157fc5 *source/language/portal/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/ranklist/index.htm 795ef356e58821d54ab6e7acfda113f4 *source/language/ranklist/lang_navtitle.php f4f37c1d8353ea444615469985833d52 *source/language/ranklist/lang_template.php @@ -1838,13 +1838,13 @@ bdd5d6283fce2cb038b890f54ecc2a35 *source/module/forum/forum_announcement.php b41090f03399f98295e676bcb2a10c08 *source/module/forum/forum_index.php 32d71bd6cc6e5554aa30bf370cdd2c6f *source/module/forum/forum_misc.php 9b0d2691ae50d95fb2776f1e21635f64 *source/module/forum/forum_modcp.php -4db3a2fafd977300469b9ae6a63fed38 *source/module/forum/forum_post.php +a5c9a4492a1e84676cdcabbc0315a06c *source/module/forum/forum_post.php 856837c63d08a8920978342ebae1a39b *source/module/forum/forum_redirect.php 1580ff8a89efe77b3e88c2e4a3258a05 *source/module/forum/forum_rss.php 9eacb72a42d21156d35b2a8956cc0fdc *source/module/forum/forum_tag.php 571fc4f66dc650cdf4548ff0d8d60e40 *source/module/forum/forum_topicadmin.php e7d4e8fed8d979a928cd8960eec25f2d *source/module/forum/forum_trade.php -064f817a98be9f0e997a06835376fe23 *source/module/forum/forum_viewthread.php +4c687c35a37f6c05f066098aee96be41 *source/module/forum/forum_viewthread.php d41d8cd98f00b204e9800998ecf8427e *source/module/forum/index.htm 1e163b74a81f8120751b480e99075a3f *source/module/group/group_attentiongroup.php 7019d5c45aade201d75e2bb2a1204537 *source/module/group/group_index.php @@ -1853,8 +1853,8 @@ d41d8cd98f00b204e9800998ecf8427e *source/module/group/index.htm f2968429502566df71423fa8e651abcc *source/module/home/home_editor.php b15bac7c91424aacde4d5e0a6a574c0c *source/module/home/home_follow.php 1811ea7448bf729dfa139e217360aa8f *source/module/home/home_invite.php -bf532e04365108835658f2f5f1f54ffa *source/module/home/home_magic.php -e8b8cb4b7e8443a7d3c68f0ddc3eddbc *source/module/home/home_medal.php +e24494a9c7d8b5f8059a53ee6d1ec8ae *source/module/home/home_magic.php +c509c1ae88506c1c69e25af46e6060bb *source/module/home/home_medal.php 356360ddd68d3710e30d3a98dcd839eb *source/module/home/home_misc.php f1b870c5761d00a8631df0254912b510 *source/module/home/home_rss.php d38279e933463817cdd76b0ca2dda388 *source/module/home/home_space.php @@ -1905,7 +1905,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/module/search/index.htm 83a0de5b8bbec75f07586f1ae29fc493 *source/module/search/search_album.php fdbc28de3ddfbdcbe973558d834d4526 *source/module/search/search_blog.php d1d027932f1ea96ff120548d71dcfa06 *source/module/search/search_collection.php -32bcddbca11929666fa69c249f8c9ce5 *source/module/search/search_forum.php +30224129095595a42c417b48bb13d0cf *source/module/search/search_forum.php fc97945b1d995109318fe80ea98d35a6 *source/module/search/search_group.php fb7ea5226a204a93e5bcde2a892cac85 *source/module/search/search_portal.php 29aa3a7fc9ffac315adf350e760f1880 *source/module/search/search_user.php @@ -2825,8 +2825,8 @@ e6da72b85fa162b0a89b170900c8c639 *static/image/mobile/images/collect.png 48bb078d470384ebf3cfb29727f48b59 *static/image/mobile/images/dialog_b.png f5b424b5ee1cb6dd226c4658f164f94b *static/image/mobile/images/dialog_bg.png 0cdba7b938574a4435a7e5bf52c6264e *static/image/mobile/images/dialog_t.png -a0d8729b883e2c5b8b611e6552477264 *static/image/mobile/images/exit.png -aa211378905eff6d31406708d87afcde *static/image/mobile/images/exit_on.png +cba61443b3638935a56ebd540b9a381e *static/image/mobile/images/exit.png +3f9a9761920335345a255b90d4371931 *static/image/mobile/images/exit_on.png e843d5d4d9e21fb0d4ef1e1fcba7d37f *static/image/mobile/images/header_bg.jpg f88917369afe53d4d4b4e6272ae9456c *static/image/mobile/images/icon.png 4c865266460f1b637ee426e3638d817e *static/image/mobile/images/icon_arrow.gif @@ -2836,7 +2836,7 @@ f88917369afe53d4d4b4e6272ae9456c *static/image/mobile/images/icon.png 4aa0abc546ac0242fe351e6ed7c70670 *static/image/mobile/images/icon_close.png 8459b0df5e5a7052601d85b5d4abba11 *static/image/mobile/images/icon_close_g.png 5e18a57ffae45116de35f3cb3e012eaa *static/image/mobile/images/icon_del.png -7f7c00e8576d056779a84edd449309f4 *static/image/mobile/images/icon_digest.png +99a7cb131746847ddae6149f9a7907cf *static/image/mobile/images/icon_digest.png ebd715b1437dfdcce392808cac73a71c *static/image/mobile/images/icon_img.png fe041c8fde52f7429839c24f022609f7 *static/image/mobile/images/icon_load.gif 85e1fc5b17245e4dbb896b69e6cac94c *static/image/mobile/images/icon_more.png @@ -2844,21 +2844,21 @@ fe041c8fde52f7429839c24f022609f7 *static/image/mobile/images/icon_load.gif 716cc45727a8cc5f013192b3341cae49 *static/image/mobile/images/icon_num.png 28293d04ad7dd7ecb25df543840aa67a *static/image/mobile/images/icon_photo.png 73ba58f85b4da73b537490453d97f0dd *static/image/mobile/images/icon_reply.png -ae49a05c0d765d7c212f7a37d9b9898a *static/image/mobile/images/icon_top.png -23266a21d274cabd223e592dbe2cecf7 *static/image/mobile/images/icon_tu.png +be07265bae73dc24b22b734b06ab08ee *static/image/mobile/images/icon_top.png +02ee6cd00b88dde5f5075095adc084fa *static/image/mobile/images/icon_tu.png aadf13a830af9d293e350b6c5297fdce *static/image/mobile/images/img_loader.gif d41d8cd98f00b204e9800998ecf8427e *static/image/mobile/images/index.htm fddbe361c66d61ee2bc0b1f5a1728dc3 *static/image/mobile/images/login.png 7eb25924aee0213f70da9dbca87a9e51 *static/image/mobile/images/login_on.png -3a7d3aa44b14c2cc6862e94e52209f29 *static/image/mobile/images/logo.png +544d34288aa53aabed307972febd6bea *static/image/mobile/images/logo.png a33d81f1500cec17289c5a919346e24e *static/image/mobile/images/my_subject_bg.png beef1674ed7474d9d8f1c5bbc0278dbd *static/image/mobile/images/my_subject_bg151.png 76395bd5e03ebb3dc8884773ae7267e7 *static/image/mobile/images/nav_b_line.png 7c0c89523903addcad9d3197950d5979 *static/image/mobile/images/pic_bg.jpg 6a02c2787d51386a16e22f464cf6d5ca *static/image/mobile/images/pic_select.png -6d8b59289d429601c787f5fa872875b7 *static/image/mobile/images/qqlogin.png -15da1c769088e226aef68ad2ca7f3b58 *static/image/mobile/images/qqlogintext.png -a228bc738f68101154309a397f2b3aa9 *static/image/mobile/images/qqlogin_on.png +97eb7269310c2b227aac96d0703ebc65 *static/image/mobile/images/qqlogin.png +e085ade90af0a54c0c5f101cd5d14d79 *static/image/mobile/images/qqlogintext.png +35c000533e9605d2e59ab438a1687829 *static/image/mobile/images/qqlogin_on.png 61ae14b51740b69ace7414f2a4c2e60a *static/image/mobile/images/reply.png c10372783b0b76cfbccc215c7192c296 *static/image/mobile/images/titlebg.png d41d8cd98f00b204e9800998ecf8427e *static/image/mobile/index.htm @@ -3219,9 +3219,9 @@ d41d8cd98f00b204e9800998ecf8427e *static/js/echarts/index.htm acb49f3a33a469c6b8bfaf3760d6c71b *static/js/fileprogress.js 9d76dfd7539cdbf0a4e46a43e576427b *static/js/forum.js 5aee4c7ec15aabbd43740d6e820ed72f *static/js/forum_moderate.js -7cbcfb0069a4ab041346a663f913bc08 *static/js/forum_post.js +80f39d8ef9d307d3cb52971876450e85 *static/js/forum_post.js 1aeb752a8520cda30ff548af24a035d8 *static/js/forum_slide.js -68a88aff20096c1138b71b59dbd38072 *static/js/forum_viewthread.js +ff17209e4a75959e1209fd3fe47535f4 *static/js/forum_viewthread.js 20aee0898556697d56e037ba761ceb43 *static/js/google.js 2f1a9096c97a60108d4faf907cb9f545 *static/js/handlers.js 5321ab2760f06625be6ee25071bf112e *static/js/home.js @@ -3272,14 +3272,14 @@ d41d8cd98f00b204e9800998ecf8427e *static/js/webuploader/index.htm 10d57044c2894969e68235057ff812eb *static/js/webuploader/Uploader.swf 83d2bd49f87c3615b4d458e6ec16bd9d *static/js/webuploader/webuploader.css d11856811f60dfbd01566a4e67d864b6 *static/js/webuploader/webuploader.min.js -1a4f5aae57b29f4e041e97c27ae07a74 *static/js/webuploader.js +89a6ab830e070fd96520437f78221a3f *static/js/webuploader.js d41d8cd98f00b204e9800998ecf8427e *static/space/index.htm f98fce0a9306b4d0778354c5043b06b7 *static/space/t1/images/header.jpg d41d8cd98f00b204e9800998ecf8427e *static/space/t1/images/index.htm 8484249af537ff37993750ebb7a5d4fc *static/space/t1/images/title.png d41d8cd98f00b204e9800998ecf8427e *static/space/t1/index.htm 4a74f161b6b4e1fa2a62ea8796ff86a6 *static/space/t1/preview.jpg -99ed8dcb8f572b947cb2bed9510e11e5 *static/space/t1/style.css +1b1b0291130ff8fad66e91b418f36180 *static/space/t1/style.css 2cf1ab8036f9d141945ea8334d7ad26e *static/space/t2/images/body_bg.png 9ae9155f49d80012ee2208316ebe0c10 *static/space/t2/images/ct-bottom.png d5255c7514efb829e7c8c6da8dd1a5f0 *static/space/t2/images/ct-top.png @@ -3288,7 +3288,7 @@ d41d8cd98f00b204e9800998ecf8427e *static/space/t2/images/index.htm 8bfa5c2ac542d8dcc4515ad83b8819c4 *static/space/t2/images/title.png d41d8cd98f00b204e9800998ecf8427e *static/space/t2/index.htm f764e860c71a9361657dbe4572afb01f *static/space/t2/preview.jpg -2659d9019430f020359bde9bec84a1b7 *static/space/t2/style.css +97d70010635d2b56366bb4f4ae70da99 *static/space/t2/style.css 67d28d89686a705f31dfa47e5e09d240 *static/space/t3/images/body_bg.png 4612efd1476fa729142ed4912db3b18a *static/space/t3/images/ct-bottom.png adf8df7415816ae45eceef5cf0c6e9b2 *static/space/t3/images/ct-top.png @@ -3296,25 +3296,25 @@ cb101da028458b4af61836bdd8a34b7b *static/space/t3/images/header.jpg d41d8cd98f00b204e9800998ecf8427e *static/space/t3/images/index.htm d41d8cd98f00b204e9800998ecf8427e *static/space/t3/index.htm e8185b48ca5477e4dccff523fd352452 *static/space/t3/preview.jpg -968f7dbdb9337234baf329ab403284ec *static/space/t3/style.css +44bab004ab03ae7d84c0cc46450d7d97 *static/space/t3/style.css f0f2c9315011cfb7e691cc6e9e92282f *static/space/t4/images/bg.png 92a3d39eb2b82edb40e0b432a5449a24 *static/space/t4/images/header.png d41d8cd98f00b204e9800998ecf8427e *static/space/t4/images/index.htm d41d8cd98f00b204e9800998ecf8427e *static/space/t4/index.htm b1fff369d61dc8bbb622dbfee08cecc0 *static/space/t4/preview.jpg -85540cedbc32c5349049e68f9c707b70 *static/space/t4/style.css +680718c10debac769704b8ac7b189464 *static/space/t4/style.css f303c328e49857480f07eb42d58f5e8d *static/space/t5/images/bg.png d41d8cd98f00b204e9800998ecf8427e *static/space/t5/images/index.htm d41d8cd98f00b204e9800998ecf8427e *static/space/t5/index.htm 0083a1357745c5599d5d47b0d1bdfcc0 *static/space/t5/preview.jpg -c3767d27ea5562d4fead8570a92dabc0 *static/space/t5/style.css +18396ba7822becba98ced3ccec246324 *static/space/t5/style.css 0ba422566ada9a5aed368d68cbdfe104 *static/space/t6/images/bg.png 72b569557218aa12ce02808ef74d1d22 *static/space/t6/images/ct-top.png 3a7974ea43d724188d0f114a7cd756be *static/space/t6/images/footer.png d41d8cd98f00b204e9800998ecf8427e *static/space/t6/images/index.htm d41d8cd98f00b204e9800998ecf8427e *static/space/t6/index.htm 568642fed1e063a39faec652263e090e *static/space/t6/preview.jpg -482099e5785f2890492de482f0f9121a *static/space/t6/style.css +1b0bf8f20e4455c161ca8fa4959b3649 *static/space/t6/style.css 393c2bddfcd755f2a0d45ad33de94654 *static/space/t7/images/bg.png f11fe58c4fc9a2e298bc4ad1f36b4e59 *static/space/t7/images/ct.png 6a0a00717dfa62499b72c790ca0acf33 *static/space/t7/images/header.png @@ -3322,7 +3322,7 @@ d41d8cd98f00b204e9800998ecf8427e *static/space/t7/images/index.htm 3d34feb46e6b8a4c00e47e6945907144 *static/space/t7/images/title.png d41d8cd98f00b204e9800998ecf8427e *static/space/t7/index.htm adb6e7ed31a65eabd00bc9d3a2281dd1 *static/space/t7/preview.jpg -e9edc4006633d77018560ea74d89119a *static/space/t7/style.css +4cc3aebbbd613fb4a016e7e75466e16d *static/space/t7/style.css c02728faf11014fc0ad56e80d8b8b71e *static/space/t8/images/bg.png 5f8cc2a9963f92ed8ecc5017a8c69c25 *static/space/t8/images/ct-top.png 0150d1c1e3434b1c28a3a60942dc2a62 *static/space/t8/images/footer.png @@ -3330,7 +3330,7 @@ a2e278544298ccb5b03ae115620e540c *static/space/t8/images/header.png d41d8cd98f00b204e9800998ecf8427e *static/space/t8/images/index.htm d41d8cd98f00b204e9800998ecf8427e *static/space/t8/index.htm c6dc15a9e88413a367089a4910d255c9 *static/space/t8/preview.jpg -94592219d766afebd5e12c56e970e1d8 *static/space/t8/style.css +5f0237dd9165750c201c66613bf596e8 *static/space/t8/style.css d41d8cd98f00b204e9800998ecf8427e *static/topic/index.htm 11774e4d505e5bd996053c949371eb09 *static/topic/t1/images/blue/banner.jpg 38d0e94e61c31f1467ffc052b6268eca *static/topic/t1/images/blue/btn.png @@ -3340,7 +3340,7 @@ d41d8cd98f00b204e9800998ecf8427e *static/topic/index.htm ff2cf61a7bd892dd66423796c8dea2ec *static/topic/t1/images/blue/dot_4.png d41d8cd98f00b204e9800998ecf8427e *static/topic/t1/images/blue/index.htm 5ae45121f8b1938e50b501eff3fe4a5a *static/topic/t1/images/blue/nav.png -628d603c927111f722f15404b6a53634 *static/topic/t1/images/blue/style.css +ea07c2637b0e10d8e77311a467671474 *static/topic/t1/images/blue/style.css eaa45d3c5ede9ac3a0169a4dc7935c94 *static/topic/t1/images/blue/title_1.png 7fd588656695763f6cfbdf00bfe1a5a2 *static/topic/t1/images/blue/title_2.png 6e3a544c5ecc8aab749ff04d5f797798 *static/topic/t1/images/blue/title_3.png @@ -3356,7 +3356,7 @@ b4f8b70b4bd0805e3863c36fd655a289 *static/topic/t1/images/green/dot_4.png 3b84b965969e20797e2a823ef3e876e5 *static/topic/t1/images/green/dot_5.png d41d8cd98f00b204e9800998ecf8427e *static/topic/t1/images/green/index.htm 626cd51e8a8e76dec7e3fd3bd62d3169 *static/topic/t1/images/green/nav.png -ae7848997156349efcf942374a9ef628 *static/topic/t1/images/green/style.css +2fb8c8f4cd4c3174c1653ea95f0a9f09 *static/topic/t1/images/green/style.css 49d00dc3e96285e585aeff52171e0ad8 *static/topic/t1/images/green/title_1.png 7fd588656695763f6cfbdf00bfe1a5a2 *static/topic/t1/images/green/title_2.png 6fceb1594986bfaa393f6c751ccd3388 *static/topic/t1/images/green/title_3.png @@ -3371,7 +3371,7 @@ ccc689d7c4995e2656686356e5d2593b *static/topic/t1/images/grey/dot_3.png 5fb95befd98cd6e95161ed088a90e66c *static/topic/t1/images/grey/dot_4.png d41d8cd98f00b204e9800998ecf8427e *static/topic/t1/images/grey/index.htm a7537400f37367057f1c931a4eddd8f7 *static/topic/t1/images/grey/nav.png -11537bd8e776d2cabef6742aac5ffa6f *static/topic/t1/images/grey/style.css +b6ce3c61346647d6d10874790eabc7a0 *static/topic/t1/images/grey/style.css 878512f4114bb51a20d61b75278c22ce *static/topic/t1/images/grey/title_1.png 7fd588656695763f6cfbdf00bfe1a5a2 *static/topic/t1/images/grey/title_2.png 6e3a544c5ecc8aab749ff04d5f797798 *static/topic/t1/images/grey/title_3.png @@ -3389,7 +3389,7 @@ be9ff303c12eb3a35cf5b94ce79830b1 *static/topic/t1/images/red/dot_4.png 2a26a34889a96c45869f97fec380e4e6 *static/topic/t1/images/red/dot_5.png d41d8cd98f00b204e9800998ecf8427e *static/topic/t1/images/red/index.htm 1a3f95d2138588329a8773f4174a9524 *static/topic/t1/images/red/nav.png -e79c5829a10dbb558a854d06215e2d02 *static/topic/t1/images/red/style.css +487e4c1dd354a1aa5a4c4fc9afdeb65d *static/topic/t1/images/red/style.css 50208008b409d522ddb41e3e6ee6be53 *static/topic/t1/images/red/title_1.png 7fd588656695763f6cfbdf00bfe1a5a2 *static/topic/t1/images/red/title_2.png 6e3a544c5ecc8aab749ff04d5f797798 *static/topic/t1/images/red/title_3.png @@ -3649,7 +3649,7 @@ d76bda70ef15b7bfc3956868c87be639 *uc_server/view/default/header_client.htm 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/view/default/index.htm 9c946066e1ce02aff43ef7997e486e1f *uc_server/view/default/main.lang.php 998b620c83be4e7caff9311f767327ae *uc_server/view/default/message.htm -ca19ef0d04054fa55c96f7d31d84a49f *uc_server/view/default/messages.lang.php +574ef2f69462355a8c609f89f5f449fa *uc_server/view/default/messages.lang.php 7819252a557b50879b0e80396013683d *uc_server/view/default/message_client.htm 21d15220756918b854defbd846c8aaa9 *uc_server/view/default/plugin_footer.htm 095dca5a72759647bedd89afde4ac738 *uc_server/view/default/plugin_header.htm @@ -3660,6 +3660,6 @@ cfcf3bb6aeff9a878f5bf8061f19a707 *uc_server/view/default/pm_blackls.htm 78cfbfb3fadc76e11e449f2a0ffbf8c0 *uc_server/view/default/pm_nav.htm 2c71a1f8a58da016cb293ef68ce5a4c0 *uc_server/view/default/pm_send.htm 1dcfb1c220e5381901fa44b300b234bd *uc_server/view/default/pm_view.htm -4ddbfc24ea89e04b91ccaf8f003f8073 *uc_server/view/default/templates.lang.php +7bc66e46b81b8a7f0892b3713cc5e800 *uc_server/view/default/templates.lang.php 42fa0f40e601b24e3dbdd91ac05ce696 *uc_server/view/default/user_avatar.htm 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/view/index.htm diff --git a/upload/source/admincp/moderate/moderate_member.php b/upload/source/admincp/moderate/moderate_member.php index 03862f6e..23d21427 100644 --- a/upload/source/admincp/moderate/moderate_member.php +++ b/upload/source/admincp/moderate/moderate_member.php @@ -67,6 +67,9 @@ "$lang[moderate_members_submit_times]: $member[submittimes]
$lang[moderate_members_submit_time]: $member[submitdate]
$lang[moderate_members_admin]: $member[admin]
\n". "$lang[moderate_members_mod_time]: $member[moddate]\n"; } + if(!empty($vuids)) { + C::t('common_member_validate')->delete($vuids); + } } shownav('user', 'nav_modmembers'); showsubmenu('nav_moderate_users', array( diff --git a/upload/source/admincp/moderate/moderate_reply.php b/upload/source/admincp/moderate/moderate_reply.php index e9f9b3ed..451c1c96 100644 --- a/upload/source/admincp/moderate/moderate_reply.php +++ b/upload/source/admincp/moderate/moderate_reply.php @@ -260,12 +260,16 @@ $postlist[] = $post; } $threadlist = C::t('forum_thread')->fetch_all($tids); - + $firsttime_validatepost = array(); + $uids = array(); foreach($postlist as $post) { $post['lastpost'] = $threadlist[$post['tid']]['lastpost']; $pidarray[] = $post['pid']; if(getstatus($post['status'], 3) == 0) { + $post['subject'] = $threadlist[$post['tid']]['subject']; + $firsttime_validatepost[] = $post; + $uids[] = $post['authorid']; updatepostcredits('+', $post['authorid'], 'reply', $post['fid']); $attachcount = C::t('forum_attachment_n')->count_by_id('tid:'.$post['tid'], 'pid', $post['pid']); updatecreditbyaction('postattach', $post['authorid'], array(), '', $attachcount, 1, $post['fid']); @@ -293,6 +297,36 @@ } } unset($postlist, $tids, $threadlist); + if($firsttime_validatepost) { + require_once libfile('function/post'); + require_once libfile('function/feed'); + $forumsinfo = C::t('forum_forum')->fetch_all_info_by_fids($forums); + $users = array(); + foreach ($uids as $uid) { + $space = array('uid'=>$uid); + space_merge($space, 'field_home'); + $users[$uid] = $space; + } + foreach ($firsttime_validatepost as $post) { + if($forumsinfo[$post['fid']] && $forumsinfo[$post['fid']]['allowfeed'] && $users[$post['authorid']]['privacy']['feed']['newreply'] && !$post['anonymous']) { + $feed = array( + 'icon' => 'post', + 'title_template' => 'feed_reply_title', + 'title_data' => array(), + 'images' => array() + ); + $post_url = "forum.php?mod=redirect&goto=findpost&pid=".$post['pid']."&ptid=".$post['tid']; + $feed['title_data'] = array( + 'subject' => "".$post['subject']."", + 'author' => "".$post['author']."" + ); + $feed['title_data']['hash_data'] = 'tid'.$post['tid']; + $feed['id'] = $post['pid']; + $feed['idtype'] = 'pid'; + feed_add($feed['icon'], $feed['title_template'], $feed['title_data'], $feed['body_template'], $feed['body_data'], '', $feed['images'], $feed['image_links'], '', '', '', 0, $feed['id'], $feed['idtype'],$post['authorid'], $post['author']); + } + } + } foreach($threads as $tid => $thread) { C::t('forum_thread')->increase($tid, $thread); diff --git a/upload/source/admincp/moderate/moderate_thread.php b/upload/source/admincp/moderate/moderate_thread.php index ef066599..6d669291 100644 --- a/upload/source/admincp/moderate/moderate_thread.php +++ b/upload/source/admincp/moderate/moderate_thread.php @@ -240,15 +240,21 @@ $forums = array(); $tids = $authoridarray = $moderatedthread = array(); + $firsttime_validatethread = array(); + $uids = array(); foreach(C::t('forum_thread')->fetch_all_by_tid_fid($moderation['validate'], $fidadd['fids']) as $thread) { if($thread['displayorder'] != -2 && $thread['displayorder']!= -3) { continue; } $poststatus = C::t('forum_post')->fetch_threadpost_by_tid_invisible($thread['tid']); + $thread['anonymous'] = $poststatus['anonymous']; + $thread['message'] = $poststatus['message']; $poststatus = $poststatus['status']; $tids[] = $thread['tid']; if(getstatus($poststatus, 3) == 0) { + $firsttime_validatethread[] = $thread; + $uids[] = $thread['authorid']; updatepostcredits('+', $thread['authorid'], 'post', $thread['fid']); $attachcount = C::t('forum_attachment_n')->count_by_id('tid:'.$thread['tid'], 'tid', $thread['tid']); updatecreditbyaction('postattach', $thread['authorid'], array(), '', $attachcount, 1, $thread['fid']); @@ -266,7 +272,41 @@ ); } } - + if($firsttime_validatethread) { + require_once libfile('function/post'); + require_once libfile('function/feed'); + $forumsinfo = C::t('forum_forum')->fetch_all_info_by_fids($forums); + $users = array(); + foreach ($uids as $uid) { + $space = array('uid'=>$uid); + space_merge($space, 'field_home'); + $users[$uid] = $space; + } + foreach ($firsttime_validatethread as $thread) { + if($forumsinfo[$thread['fid']] && $forumsinfo[$thread['fid']]['allowfeed'] && $users[$thread['authorid']]['privacy']['feed']['newthread'] && !$thread['anonymous']) { + $feed = array( + 'icon' => 'thread', + 'title_template' => 'feed_thread_title', + 'title_data' => array(), + 'body_template' => 'feed_thread_message', + 'body_data' => array(), + 'title_data' => array(), + 'images' => array() + ); + + $message = !$thread['price'] && !$thread['readperm'] ? $thread['message'] : ''; + $message = messagesafeclear($message); + $feed['body_data'] = array( + 'subject' => "{$thread['subject']}", + 'message' => messagecutstr($message, 150) + ); + $feed['title_data']['hash_data'] = 'tid'.$thread['tid']; + $feed['id'] = $thread['tid']; + $feed['idtype'] = 'tid'; + feed_add($feed['icon'], $feed['title_template'], $feed['title_data'], $feed['body_template'], $feed['body_data'], '', $feed['images'], $feed['image_links'], '', '', '', 0, $feed['id'], $feed['idtype'],$thread['authorid'], $thread['author']); + } + } + } if($tids) { $tidstr = dimplode($tids); diff --git a/upload/source/class/cache/cache_file.php b/upload/source/class/cache/cache_file.php index 212fa629..eb174ee5 100644 --- a/upload/source/class/cache/cache_file.php +++ b/upload/source/class/cache/cache_file.php @@ -32,12 +32,14 @@ function set_cache($key, $value, $life) { $cache_file = $this->get_cache_file_path($key); dmkdir(dirname($cache_file)); $cachedata = "\$data = ".arrayeval($data).";\n"; - if($fp = @fopen($cache_file, 'wb')) { - fwrite($fp, ""); + $cachedata_save = ""; + $fp = fopen($cache_file, 'cb'); + if(!($fp && flock($fp, LOCK_EX) && ftruncate($fp, 0) && fwrite($fp, $cachedata_save) && fflush($fp) && flock($fp, LOCK_UN) && fclose($fp))) { + flock($fp, LOCK_UN); fclose($fp); - } else { + unlink($cache_file); exit('Can not write to cache files, please check directory ./data/ and ./data/ultraxcache/ .'); } return true; diff --git a/upload/source/class/extend/extend_thread_allowat.php b/upload/source/class/extend/extend_thread_allowat.php index 71fff696..fde284d4 100644 --- a/upload/source/class/extend/extend_thread_allowat.php +++ b/upload/source/class/extend/extend_thread_allowat.php @@ -84,7 +84,7 @@ public function before_newreply($parameters) { if(count($this->atlist) < $maxselect) { $query = C::t('home_friend')->fetch_all_by_uid_username($this->member['uid'], $atlist_tmp); foreach($query as $row) { - if(!in_array($row['followuid'], $ateduids)) { + if(!in_array($row['fuid'], $ateduids)) { $this->atlist[$row[fuid]] = $row['fusername']; } } @@ -144,7 +144,7 @@ public function before_editpost($parameters) { if(count($this->atlist) < $maxselect) { $query = C::t('home_friend')->fetch_all_by_uid_username($this->member['uid'], $atlist_tmp); foreach($query as $row) { - if(!in_array($row['followuid'], $ateduids)) { + if(!in_array($row['fuid'], $ateduids)) { $this->atlist[$row[fuid]] = $row['fusername']; } } @@ -164,8 +164,8 @@ public function before_editpost($parameters) { $atsearch[] = "/@$atusername /i"; $atreplace[] = "[url=home.php?mod=space&uid=$atuid]@{$atusername}[/url] "; } - $parameters['message'] = preg_replace($atsearch, $atreplace, $parameters['message'].' ', 1); - $parameters['message'] = substr($parameters['message'], 0, strlen($parameters['message']) - 1); + $this->param['message'] = preg_replace($atsearch, $atreplace, $parameters['message'].' ', 1); + $this->param['message'] = substr($this->param['message'], 0, strlen($this->param['message']) - 1); } } } diff --git a/upload/source/class/extend/extend_thread_image.php b/upload/source/class/extend/extend_thread_image.php index d3c232fd..3e630467 100644 --- a/upload/source/class/extend/extend_thread_image.php +++ b/upload/source/class/extend/extend_thread_image.php @@ -55,6 +55,7 @@ public function after_newthread() { $this->param['param'] = array_merge((array)$this->param['param'], $param); } private function mobile_upload() { + global $_G; if($_GET['mobile'] == 'yes' && !empty($_FILES['Filedata'])) { $forumattachextensions = ''; if($_G['forum']) { @@ -130,7 +131,12 @@ public function before_deletepost($parameters) { } dunlink($attach); } else { - $thread_attachment = 1; + if($attach['isimage']) { + $thread_attachment = 2; + } + if($thread_attachment == 0) { + $thread_attachment = 1; + } } } diff --git a/upload/source/class/extend/extend_thread_poll.php b/upload/source/class/extend/extend_thread_poll.php index 6c57cc29..032c2c49 100644 --- a/upload/source/class/extend/extend_thread_poll.php +++ b/upload/source/class/extend/extend_thread_poll.php @@ -74,7 +74,7 @@ public function after_newthread() { $this->polloptionpreview = daddslashes($this->polloptionpreview); - $data = array('tid' => $this->tid, 'multiple' => $this->pollarray['multiple'], 'visible' => $this->pollarray['visible'], 'maxchoices' => $this->pollarray['maxchoices'], 'expiration' => $this->pollarray['expiration'], 'overt' => $this->pollarray['overt'], 'pollpreview' => $polloptionpreview, 'isimage' => $this->pollarray['isimage']); + $data = array('tid' => $this->tid, 'multiple' => $this->pollarray['multiple'], 'visible' => $this->pollarray['visible'], 'maxchoices' => $this->pollarray['maxchoices'], 'expiration' => $this->pollarray['expiration'], 'overt' => $this->pollarray['overt'], 'pollpreview' => $this->polloptionpreview, 'isimage' => $this->pollarray['isimage']); C::t('forum_poll')->insert($data); } @@ -137,7 +137,7 @@ public function before_editpost($parameters) { } } $expiration = intval($_GET['expiration']); - if($close) { + if($this->thread['close']) { $pollarray['expiration'] = TIMESTAMP; } elseif($expiration) { if(empty($pollarray['expiration'])) { diff --git a/upload/source/class/extend/extend_thread_sort.php b/upload/source/class/extend/extend_thread_sort.php index 1c605d08..f83bc8e8 100644 --- a/upload/source/class/extend/extend_thread_sort.php +++ b/upload/source/class/extend/extend_thread_sort.php @@ -45,14 +45,15 @@ public function after_newthread() { $identifier = $_G['forum_optionlist'][$optionid]['identifier']; $sortaids[] = intval($_GET['typeoption'][$identifier]['aid']); } + $typeexpiration = intval($_GET['typeexpiration']); C::t('forum_typeoptionvar')->insert(array( 'sortid' => $sortid, 'tid' => $tid, 'fid' => $fid, 'optionid' => $optionid, - 'value' => censor($value), - 'expiration' => ($typeexpiration ? $publishdate + $typeexpiration : 0), + 'value' => $value, + 'expiration' => ($typeexpiration ? $this->param['publishdate'] + $typeexpiration : 0), )); } diff --git a/upload/source/class/extend/extend_thread_trade.php b/upload/source/class/extend/extend_thread_trade.php index 26db416a..82a263ca 100644 --- a/upload/source/class/extend/extend_thread_trade.php +++ b/upload/source/class/extend/extend_thread_trade.php @@ -79,6 +79,9 @@ public function after_newthread() { 'tags' => $this->param['tagstr'], 'status' => (defined('IN_MOBILE') ? 8 : 0) )); + if(!empty($_GET['tradeaid'])) { + convertunusedattach($_GET['tradeaid'], $this->tid, $pid); + } ($this->group['allowpostattach'] || $this->group['allowpostimage']) && ($_GET['attachnew'] || $_GET['tradeaid']) && updateattach($this->param['displayorder'] == -4 || $this->param['modnewthreads'], $this->tid, $pid, $_GET['attachnew']); require_once libfile('function/trade'); @@ -107,10 +110,9 @@ public function after_newthread() { 'item_credit' => $_GET['item_credit'], 'item_costcredit' => $_GET['item_costcredit'] )); + $this->param['tradepid'] = $pid; + - if(!empty($_GET['tradeaid'])) { - convertunusedattach($_GET['tradeaid'], $this->tid, $pid); - } } public function before_feed() { @@ -126,6 +128,7 @@ public function before_feed() { } else { $this->feed['body_template'] = 'feed_thread_goods_message_3'; } + $pid = $this->param['tradepid']; $this->feed['body_data'] = array( 'itemname'=> "tid."&pid=$pid\">$_GET[item_name]", 'itemprice'=> $_GET['item_price'], diff --git a/upload/source/class/memory/memory_driver_file.php b/upload/source/class/memory/memory_driver_file.php index cf7694de..e5e9dfb5 100644 --- a/upload/source/class/memory/memory_driver_file.php +++ b/upload/source/class/memory/memory_driver_file.php @@ -62,8 +62,7 @@ public function set($key, $value, $ttl = 0) { 'exp' => $ttl ? TIMESTAMP + $ttl : 0, 'data' => $value, ); - file_put_contents($file, "param['readperm'] = $this->group['allowsetreadperm'] ? intval($this->param['readperm']) : ($isorigauthor ? 0 : 'ignore'); + $this->param['readperm'] = $this->group['allowsetreadperm'] ? intval($this->param['readperm']) : ($isorigauthor ? $this->thread['readperm'] : 'ignore'); if($this->thread['special'] != 3) { $this->param['price'] = intval($this->param['price']); $this->param['price'] = $this->thread['price'] < 0 && !$this->thread['special'] @@ -410,6 +410,8 @@ public function editpost($parameters) { $this->thread['status'] = setstatus(6, $this->param['allownoticeauthor'] ? 1 : 0, $this->thread['status']); $displayorder = (empty($this->param['save']) || $this->thread['displayorder'] != -4 ) ? ($this->thread['displayorder'] == -4 ? -4 : $this->thread['displayorder']) : -4; + $this->param['typeid'] = isset($this->param['typeid']) && isset($this->forum['threadtypes']['types'][$this->param['typeid']]) && (!$this->forum['threadtypes']['moderators'][$this->param['typeid']] || $this->forum['ismoderator']) ? $this->param['typeid'] : 0; + $this->param['sortid'] = $this->param['special'] || !$this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid']; $this->param['threadupdatearr']['typeid'] = $this->param['typeid']; @@ -432,7 +434,7 @@ public function editpost($parameters) { if($this->thread['closed'] > 1) { C::t('forum_thread')->update($this->thread['closed'], array('subject' => $this->param['subject']), true); } elseif(empty($this->thread['isgroup'])) { - $threadclosed = C::t('forum_threadclosed')->fetch($thread['tid']); + $threadclosed = C::t('forum_threadclosed')->fetch($this->thread['tid']); if($threadclosed['redirect']) { C::t('forum_thread')->update($threadclosed['redirect'], array('subject' => $this->param['subject']), true); } @@ -463,8 +465,13 @@ public function editpost($parameters) { if(getglobal('forum_auditstatuson') && $this->param['audit'] == 1) { - C::t('forum_post')->update($this->thread['posttableid'], $this->post['pid'], array('status' => 4), false, false, null, -2, null, 0); - updatepostcredits('+', $this->post['authorid'], ($isfirstpost ? 'post' : 'reply'), $this->forum['fid']); + if(getstatus($this->post['status'], 3) == 0) { + C::t('forum_post')->update($this->thread['posttableid'], $this->post['pid'], array('status' => 4), false, false, null, -2, null, 0); + updatepostcredits('+', $this->post['authorid'], ($isfirstpost ? 'post' : 'reply'), $this->forum['fid']); + } + if(!$isfirstpost) { + C::t('forum_thread')->increase($this->thread['tid'], array('replies' => 1)); + } updatemodworks('MOD', 1); updatemodlog($this->thread['tid'], 'MOD'); } diff --git a/upload/source/class/model/model_forum_thread.php b/upload/source/class/model/model_forum_thread.php index 4167ac41..833a6241 100644 --- a/upload/source/class/model/model_forum_thread.php +++ b/upload/source/class/model/model_forum_thread.php @@ -89,7 +89,7 @@ public function newthread($parameters) { } - $this->param['sortid'] = $this->param['special'] && $this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid']; + $this->param['sortid'] = $this->param['special'] || !$this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid']; $this->param['typeexpiration'] = intval($this->param['typeexpiration']); if($this->forum['threadsorts']['expiration'][$this->param['typeid']] && !$this->param['typeexpiration']) { @@ -160,8 +160,14 @@ public function newthread($parameters) { } if($this->param['moderated']) { - updatemodlog($this->tid, ($this->param['displayorder'] > 0 ? 'STK' : 'DIG')); - updatemodworks(($this->param['displayorder'] > 0 ? 'STK' : 'DIG'), 1); + if($this->param['displayorder'] > 0) { + updatemodlog($this->tid, 'STK'); + updatemodworks('STK', 1); + } + if($this->param['digest']) { + updatemodlog($this->tid, 'DIG'); + updatemodworks('DIG', 1); + } } $this->param['bbcodeoff'] = checkbbcodes($this->param['message'], !empty($this->param['bbcodeoff'])); diff --git a/upload/source/class/table/table_common_style.php b/upload/source/class/table/table_common_style.php index 6050492f..2f9007f5 100644 --- a/upload/source/class/table/table_common_style.php +++ b/upload/source/class/table/table_common_style.php @@ -39,6 +39,14 @@ public function check_stylename($stylename) { return DB::result_first("SELECT COUNT(*) FROM %t WHERE name=%s", array($this->_table, $stylename)); } + public function fetch_by_stylename_templateid($stylename, $templateid = 0) { + if($templateid) { + return DB::fetch_first("SELECT * FROM %t WHERE name=%s AND templateid=%d ORDER BY styleid ASC LIMIT 1", array($this->_table, $stylename, $templateid)); + }else{ + return DB::fetch_first("SELECT * FROM %t WHERE name=%s ORDER BY styleid ASC LIMIT 1", array($this->_table, $stylename)); + } + } + } ?> \ No newline at end of file diff --git a/upload/source/class/table/table_common_syscache.php b/upload/source/class/table/table_common_syscache.php index 4a23b12e..ddaddef1 100644 --- a/upload/source/class/table/table_common_syscache.php +++ b/upload/source/class/table/table_common_syscache.php @@ -66,9 +66,12 @@ public function fetch_all($cachenames) { $this->_allowmem && (memory('set', $syscache['cname'], $data[$syscache['cname']])); if($this->_isfilecache) { $cachedata = '$data[\''.$syscache['cname'].'\'] = '.var_export($data[$syscache['cname']], true).";\n\n"; - if(($fp = @fopen(DISCUZ_ROOT.'./data/cache/cache_'.$syscache['cname'].'.php', 'wb'))) { - fwrite($fp, ""); + $cachedata_save = ""; + $fp = fopen(DISCUZ_ROOT.'./data/cache/cache_'.$syscache['cname'].'.php', 'cb'); + if(!($fp && flock($fp, LOCK_EX) && ftruncate($fp, 0) && fwrite($fp, $cachedata_save) && fflush($fp) && flock($fp, LOCK_UN) && fclose($fp))) { + flock($fp, LOCK_UN); fclose($fp); + unlink(DISCUZ_ROOT.'./data/cache/cache_'.$syscache['cname'].'.php'); } } } diff --git a/upload/source/class/table/table_common_template.php b/upload/source/class/table/table_common_template.php index f643479a..44493bdb 100644 --- a/upload/source/class/table/table_common_template.php +++ b/upload/source/class/table/table_common_template.php @@ -36,6 +36,14 @@ public function get_templateid($name) { return DB::result_first("SELECT templateid FROM %t WHERE name=%s", array($this->_table, $name)); } + public function get_templateid_by_directory($directory) { + return DB::result_first("SELECT templateid FROM %t WHERE directory=%s", array($this->_table, $directory)); + } + + public function fetch_by_templateid($templateid) { + return DB::fetch_first("SELECT * FROM %t WHERE templateid=%s", array($this->_table, $templateid)); + } + } ?> \ No newline at end of file diff --git a/upload/source/class/table/table_forum_announcement.php b/upload/source/class/table/table_forum_announcement.php index 17c57f65..6e083b71 100644 --- a/upload/source/class/table/table_forum_announcement.php +++ b/upload/source/class/table/table_forum_announcement.php @@ -44,7 +44,7 @@ public function fetch_all_by_time($time, $type, $bannedids, $startrow, $items) { } public function fetch_by_id_username($id, $username, $adminid = 1) { - return DB::fetch_first('SELECT * FROM %t WHERE id=%d AND (%d=1 AND author=%s)', array($this->_table, $id, $adminid, $username)); + return DB::fetch_first('SELECT * FROM %t WHERE id=%d AND (%d=1 OR author=%s)', array($this->_table, $id, $adminid, $username)); } public function delete_by_id_username($ids, $username, $adminid = 1) { diff --git a/upload/source/class/table/table_forum_thread.php b/upload/source/class/table/table_forum_thread.php index 8c96347f..593d8dee 100644 --- a/upload/source/class/table/table_forum_thread.php +++ b/upload/source/class/table/table_forum_thread.php @@ -915,7 +915,7 @@ public function increase($tids, $fieldarr, $low_priority = false, $tableid = 0, $tids = dintval((array)$tids, true); $sql = array(); $num = 0; - $allowkey = array('views', 'replies', 'recommends', 'recommend_add', 'recommend_sub', 'favtimes', 'sharetimes', 'moderated', 'heats', 'lastposter', 'lastpost'); + $allowkey = array('views', 'replies', 'recommends', 'recommend_add', 'recommend_sub', 'favtimes', 'sharetimes', 'moderated', 'heats', 'lastposter', 'lastpost', 'attachment'); foreach($fieldarr as $key => $value) { if(in_array($key, $allowkey)) { if(is_array($value)) { diff --git a/upload/source/discuz_version.php b/upload/source/discuz_version.php index 37b545b1..e4b349c1 100644 --- a/upload/source/discuz_version.php +++ b/upload/source/discuz_version.php @@ -13,9 +13,9 @@ if(!defined('DISCUZ_VERSION')) { define('DISCUZ_VERSION', 'X3.4'); - define('DISCUZ_RELEASE', '20220518'); + define('DISCUZ_RELEASE', '20220811'); define('DISCUZ_FIXBUG', '34000000'); - define('DISCUZ_TH_REVISION', '74'); /*jaideejung007*/ + define('DISCUZ_TH_REVISION', '75'); /*jaideejung007*/ } ?> \ No newline at end of file diff --git a/upload/source/function/function_cache.php b/upload/source/function/function_cache.php index fcf89db8..1fd89196 100644 --- a/upload/source/function/function_cache.php +++ b/upload/source/function/function_cache.php @@ -61,10 +61,14 @@ function writetocache($script, $cachedata, $prefix = 'cache_') { if(!is_dir($dir)) { dmkdir($dir, 0777); } - if($fp = @fopen("$dir$prefix$script.php", 'wb')) { - fwrite($fp, ""); + + $s = ""; + + $fp = fopen("$dir$prefix$script.php", 'cb'); + if(!($fp && flock($fp, LOCK_EX) && ftruncate($fp, 0) && fwrite($fp, $s) && fflush($fp) && flock($fp, LOCK_UN) && fclose($fp))) { + flock($fp, LOCK_UN); fclose($fp); - } else { + unlink("$dir$prefix$script.php"); exit('Can not write to cache files, please check directory ./data/ and ./data/sysdata/ .'); } } diff --git a/upload/source/function/function_core.php b/upload/source/function/function_core.php index edbd31e1..ec654a38 100644 --- a/upload/source/function/function_core.php +++ b/upload/source/function/function_core.php @@ -1376,9 +1376,7 @@ function adshow($parameter) { if($_G['inajax'] || $_G['group']['closead']) { return; } - if(isset($_G['config']['plugindeveloper']) && $_G['config']['plugindeveloper'] == 2) { - return '[ad '.$parameter.']'; - } + $return = (isset($_G['config']['plugindeveloper']) && $_G['config']['plugindeveloper'] == 2) ? '[ad '.$parameter.']' : ''; $params = explode('/', $parameter); $customid = 0; $customc = explode('_', $params[0]); @@ -1422,7 +1420,7 @@ function adshow($parameter) { if(!$_G['setting']['hookscript']['global']['ad']['funcs'][$adfunc]) { hookscript('ad', $_G['basescript'], 'funcs', array('params' => $params, 'content' => $adcontent, 'customid' => $customid), $adfunc); } - return $_G['setting']['pluginhooks'][$adfunc] === null ? $adcontent : $_G['setting']['pluginhooks'][$adfunc]; + return $return.($_G['setting']['pluginhooks'][$adfunc] === null ? $adcontent : $_G['setting']['pluginhooks'][$adfunc]); } function showmessage($message, $url_forward = '', $values = array(), $extraparam = array(), $custom = 0) { diff --git a/upload/source/function/function_forum.php b/upload/source/function/function_forum.php index 85050d7a..17e591fb 100644 --- a/upload/source/function/function_forum.php +++ b/upload/source/function/function_forum.php @@ -731,7 +731,7 @@ function upload_icon_banner(&$data, $file, $type) { if($data['status'] == 3 && $type == 'icon') { require_once libfile('class/image'); $img = new image; - $img->Thumb($upload->attach['target'], './'.$uploadtype.'/'.$upload->attach['attachment'], 48, 48, 'fixwr'); + $img->Thumb($upload->attach['target'], './'.$uploadtype.'/'.$upload->attach['attachment'], 200, 200, 'fixwr'); } return $upload->attach['attachment']; } diff --git a/upload/source/function/function_importdata.php b/upload/source/function/function_importdata.php index 27e727e1..eb442cae 100644 --- a/upload/source/function/function_importdata.php +++ b/upload/source/function/function_importdata.php @@ -70,7 +70,7 @@ function import_styles($ignoreversion = 1, $dir = '', $restoreid = 0, $updatecac if(empty($ignoreversion) && !versioncompatible($stylearray['version'])) { cpmsg('styles_import_version_invalid', 'action=styles', 'error', array('cur_version' => $stylearray['version'], 'set_version' => $_G['setting']['version'])); } - + $styleidnew = 0; if(!$restoreid) { $renamed = 0; if($stylearray['templateid'] != 1) { @@ -81,8 +81,11 @@ function import_styles($ignoreversion = 1, $dir = '', $restoreid = 0, $updatecac cpmsg('styles_import_directory_invalid', 'action=styles', 'error', array('basedir' => $basedir, 'directory' => $stylearray['directory'])); } } - - if(!($templateid = C::t('common_template')->get_templateid($stylearray['tplname']))) { + $templateid = C::t('common_template')->get_templateid_by_directory($stylearray['directory']); + if (!$templateid) { + $templateid = C::t('common_template')->get_templateid($stylearray['tplname']); + } + if(!$templateid) { $templateid = C::t('common_template')->insert(array( 'name' => $stylearray['tplname'], 'directory' => $stylearray['directory'], @@ -95,6 +98,25 @@ function import_styles($ignoreversion = 1, $dir = '', $restoreid = 0, $updatecac if(C::t('common_style')->check_stylename($stylearray['name'])) { $renamed = 1; + $styleinfo = C::t('common_style')->fetch_by_stylename_templateid($stylearray['name']); + if(!empty($styleinfo['styleid'])) { + if($styleinfo['templateid'] != $templateid) { + $template = C::t('common_template')->fetch_by_templateid($styleinfo['templateid']); + if (empty($template)) { + C::t('common_style')->update($styleinfo['styleid'], array('templateid' => $templateid), true); + $styleidnew = $styleinfo['styleid']; + }else{ + $styleinfo = C::t('common_style')->fetch_by_stylename_templateid($stylearray['name'], $templateid); + if(!empty($styleinfo['styleid'])) { + $styleidnew = $styleinfo['styleid']; + }else{ + $styleidnew = C::t('common_style')->insert(array('name' => $stylearray['name'], 'templateid' => $templateid), true); + } + } + }else{ + $styleidnew = $styleinfo['styleid']; + } + } } else { $styleidnew = C::t('common_style')->insert(array('name' => $stylearray['name'], 'templateid' => $templateid), true); } @@ -103,9 +125,20 @@ function import_styles($ignoreversion = 1, $dir = '', $restoreid = 0, $updatecac C::t('common_stylevar')->delete_by_styleid($styleidnew); } - foreach($stylearray['style'] as $variable => $substitute) { - $substitute = @dhtmlspecialchars($substitute); - C::t('common_stylevar')->insert(array('styleid' => $styleidnew, 'variable' => $variable, 'substitute' => $substitute)); + if($styleidnew) { + $stylevars = array(); + $result = C::t('common_stylevar')->fetch_all_by_styleid($styleidnew); + if(is_array($result) && !empty($result)) { + foreach($result as $style) { + $stylevars[$style['variable']] = $style['substitute']; + } + } + foreach($stylearray['style'] as $variable => $substitute) { + if(!isset($stylevars[$variable])) { + $substitute = @dhtmlspecialchars($substitute); + C::t('common_stylevar')->insert(array('styleid' => $styleidnew, 'variable' => $variable, 'substitute' => $substitute)); + } + } } } @@ -153,6 +186,7 @@ function import_block($xmlurl, $clientid, $xmlkey = '', $signtype = '', $ignorev if(empty($blockarrays['name']) || empty($blockarrays['fields']) || empty($blockarrays['getsetting'])) { cpmsg(cplang('import_data_typeinvalid').cplang($importtxt), '', 'error'); } + require_once libfile('function/cloudaddons'); if(empty($ignoreversion) && !versioncompatible($blockarrays['version'])) { cpmsg(cplang('blockxml_import_version_invalid'), '', 'error', array('cur_version' => $blockarrays['version'], 'set_version' => $_G['setting']['version'])); } diff --git a/upload/source/function/function_magic.php b/upload/source/function/function_magic.php index b7938216..5b77c789 100644 --- a/upload/source/function/function_magic.php +++ b/upload/source/function/function_magic.php @@ -44,17 +44,7 @@ function getmagicweight($uid, $magicarray) { function getpostinfo($id, $type, $colsarray = '') { global $_G; - $sql = $comma = ''; $type = in_array($type, array('tid', 'pid', 'blogid')) && !empty($type) ? $type : 'tid'; - $cols = '*'; - - if(!empty($colsarray) && is_array($colsarray)) { - $cols = ''; - foreach($colsarray as $val) { - $cols .= $comma.$val; - $comma = ', '; - } - } switch($type) { case 'tid': @@ -67,11 +57,8 @@ function getpostinfo($id, $type, $colsarray = '') { $thread['thread_author'] = $thread['author']; $thread['thread_authorid'] = $thread['authorid']; $thread['thread_status'] = $thread['status']; - unset($thread['author']); - unset($thread['authorid']); - unset($thread['dateline']); - unset($thread['status']); - $info = array_merge($info, $thread); + $thread['thread_replycredit'] = $thread['replycredit']; + $info = array_merge($thread, $info); } else { $info = array(); } @@ -84,7 +71,7 @@ function getpostinfo($id, $type, $colsarray = '') { break; } - if(!$info) { + if(empty($info)) { showmessage('magics_target_nonexistence'); } else { return daddslashes($info, 1); @@ -242,7 +229,7 @@ function magic_peroid($magic, $uid) { if($magic['useperoid']) { $dateline = 0; if($magic['useperoid'] == 1) { - $dateline = TIMESTAMP - (TIMESTAMP + $_G['setting']['timeoffset'] * 3600) % 86400 + $_G['setting']['timeoffset'] * 3600; + $dateline = TIMESTAMP - (TIMESTAMP + $_G['setting']['timeoffset'] * 3600) % 86400; } elseif($magic['useperoid'] == 4) { $dateline = TIMESTAMP - 86400; } elseif($magic['useperoid'] == 2) { diff --git a/upload/source/function/function_plugin.php b/upload/source/function/function_plugin.php index 104c9ae7..c6f56e9d 100644 --- a/upload/source/function/function_plugin.php +++ b/upload/source/function/function_plugin.php @@ -434,7 +434,7 @@ function cron_create($pluginid, $filename = null, $name = null, $weekday = null, $filename = $pluginid.':'.$filename; $cronid = C::t('common_cron')->get_cronid_by_filename($filename); if(!$cronid) { - return C::t('common_cron')->insert(array( + C::t('common_cron')->insert(array( 'available' => 1, 'type' => 'plugin', 'name' => $name, @@ -452,10 +452,10 @@ function cron_create($pluginid, $filename = null, $name = null, $weekday = null, 'hour' => $hour, 'minute' => $minutenew, )); - return $cronid; } } } + return true; } function cron_delete($pluginid) { diff --git a/upload/source/function/function_spacecp.php b/upload/source/function/function_spacecp.php index 757f743d..946be86f 100644 --- a/upload/source/function/function_spacecp.php +++ b/upload/source/function/function_spacecp.php @@ -75,7 +75,7 @@ function album_update_pic($albumid, $picid=0) { } require_once libfile('class/image'); $image = new image(); - if($image->Thumb($picsource, 'album/'.$picdir.$albumid.'.jpg', 120, 120, 2)) { + if($image->Thumb($picsource, 'album/'.$picdir.$albumid.'.jpg', 300, 300, 2)) { $setarr['pic'] = $picdir.$albumid.'.jpg'; $setarr['picflag'] = 1; if(getglobal('setting/ftp/on')) { diff --git a/upload/source/function/function_threadsort.php b/upload/source/function/function_threadsort.php index c814570b..9be71151 100644 --- a/upload/source/function/function_threadsort.php +++ b/upload/source/function/function_threadsort.php @@ -244,7 +244,7 @@ function showsorttemplate($sortid, $fid, $sortoptionarray, $templatearray, $thre } else { $sortthread['value'] = ''; if($imgoptiondata['aid']) { - $sortthread['value'] = getforumimg($imgoptiondata['aid'], 0, 120, 120); + $sortthread['value'] = getforumimg($imgoptiondata['aid'], 0, 300, 300); } elseif($imgoptiondata['url']) { $sortthread['value'] = $imgoptiondata['url']; } @@ -454,7 +454,7 @@ function threadsortshow($sortid, $tid) { } } - $threadsortshow['optionlist'] = !$optionexpiration ? $_G['forum_option'] : 'expire'; + $threadsortshow['optionlist'] = !$sortdataexpiration || $sortdataexpiration >= $_G['timestamp'] ? $_G['forum_option'] : 'expire'; $threadsortshow['typetemplate'] = $typetemplate; $threadsortshow['expiration'] = dgmdate($sortdataexpiration, 'd'); @@ -679,7 +679,7 @@ function threadsort_validator($sortoption, $pid) { showmessage('threadtype_toolong_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title'])); } elseif($sortoption[$var] && (($_G['forum_checkoption'][$var]['maxnum'] && $sortoption[$var] > $_G['forum_checkoption'][$var]['maxnum']) || ($_G['forum_checkoption'][$var]['minnum'] && $sortoption[$var] < $_G['forum_checkoption'][$var]['minnum']))) { showmessage('threadtype_num_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title'])); - } elseif($sortoption[$var] && $_G['forum_checkoption'][$var]['unchangeable'] && !($_G['tid'] && $pid)) { + } elseif($sortoption[$var] && $_G['forum_checkoption'][$var]['unchangeable'] && ($_G['tid'] && $pid)) { showmessage('threadtype_unchangeable_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title'])); } elseif($sortoption[$var] && ($_G['forum_checkoption'][$var]['type'] == 'select')) { if($_G['forum_optionlist'][$_G['forum_checkoption'][$var]['optionid']]['choices'][$sortoption[$var]]['level'] != 1) { diff --git a/upload/source/include/misc/misc_security.php b/upload/source/include/misc/misc_security.php index 6c0b15ff..68c6d752 100644 --- a/upload/source/include/misc/misc_security.php +++ b/upload/source/include/misc/misc_security.php @@ -87,6 +87,8 @@ function securitymessage($subject, $message, $reload = TRUE, $form = FALSE) { echo '
'.$subject.'

'.$message.'
'; security_ajaxshowfooter(); } else { + $charset = getglobal('config/output/charset'); + @header('Content-Type: text/html; charset='.$charset); echo ''; echo ''; echo ''.$subject.''; @@ -134,7 +136,7 @@ function security_ajaxshowheader() { @header("Expires: -1"); @header("Cache-Control: no-store, private, post-check=0, pre-check=0, max-age=0", FALSE); @header("Pragma: no-cache"); - header("Content-type: application/xml"); + @header("Content-type: application/xml; charset=".$charset); echo "\n TIMESTAMP ? $banexpirynew : 0; if($banexpirynew) { $member['groupterms'] = $member['groupterms'] && is_array($member['groupterms']) ? $member['groupterms'] : array(); - $member['groupterms']['main'] = array('time' => $banexpirynew, 'adminid' => $member['adminid'], 'groupid' => $member['groupid']); + if($member['groupid'] == 4 || $member['groupid'] == 5) { + $member['groupterms']['main']['time'] = $banexpirynew; + if (empty($member['groupterms']['main']['groupid'])) { + $groupnew = C::t('common_usergroup')->fetch_by_credits($member['credits']); + $member['groupterms']['main']['groupid'] = $groupnew['groupid']; + } + if (!isset($member['groupterms']['main']['adminid'])) { + $member['groupterms']['main']['adminid'] = $member['adminid']; + } + }else{ + $member['groupterms']['main'] = array('time' => $banexpirynew, 'adminid' => $member['adminid'], 'groupid' => $member['groupid']); + } $member['groupterms']['ext'][$groupidnew] = $banexpirynew; $setarr['groupexpiry'] = groupexpiry($member['groupterms']); } else { diff --git a/upload/source/include/post/post_newthread.php b/upload/source/include/post/post_newthread.php index a237c341..d5ee8c10 100644 --- a/upload/source/include/post/post_newthread.php +++ b/upload/source/include/post/post_newthread.php @@ -199,9 +199,6 @@ if(!empty($_GET['addfeed'])) { $modthread->attach_before_method('feed', array('class' => $specials[$special], 'method' => 'before_feed')); - if($special == 2) { - $modthread->attach_before_method('feed', array('class' => $specials[$special], 'method' => 'before_replyfeed')); - } } } diff --git a/upload/source/include/topicadmin/topicadmin_moderate.php b/upload/source/include/topicadmin/topicadmin_moderate.php index 43ce7751..310f1a9f 100644 --- a/upload/source/include/topicadmin/topicadmin_moderate.php +++ b/upload/source/include/topicadmin/topicadmin_moderate.php @@ -104,6 +104,7 @@ $stylecheck[$i] = $stylestr[$i - 1] ? 1 : 0; } $colorcheck = $string[1]; + $highlight_bgcolor = $threadlist[$_G['tid']]['bgcolor']; $_G['forum']['modrecommend'] = is_array($_G['forum']['modrecommend']) ? $_G['forum']['modrecommend'] : array(); $expirationstick = get_expiration($_G['tid'], 'EST'); $expirationdigest = get_expiration($_G['tid'], 'EDI'); @@ -134,9 +135,10 @@ $selectposition[$oldthread['position']] = ' selected="selected"'; $selectattach = $oldthread['aid']; } else { - $selectattach = $imgattach[0]['aid']; + $selectattach = $imgattach[array_keys($imgattach)[0]]['aid']; $selectposition[0] = ' selected="selected"'; } + $expirationrecommend = get_expiration($_G['tid'], 'REC'); } include template('forum/topicadmin'); @@ -271,6 +273,7 @@ $modaction = $isrecommend ? 'REC' : 'URE'; $thread = daddslashes($thread, 1); $selectattach = $_GET['selectattach']; + $position = $_GET['position']; C::t('forum_threadmod')->update_by_tid_action($tidsarr, array('REC'), array('status' => 0)); if($isrecommend) { @@ -356,7 +359,7 @@ C::t('forum_thread')->update($tidsarr, array('lastpost'=>$expiration, 'moderated'=>1), true); C::t('forum_forum')->update($_G['fid'], array('lastpost' => "$thread[tid]\t$thread[subject]\t$expiration\t$thread[lastposter]")); - $_G['forum']['threadcaches'] && deletethreadcaches($thread['tid']); + $_G['forum']['threadcaches'] && deletethreadcaches($moderatetids); } elseif($operation == 'down') { if(!$_G['group']['allowbumpthread']) { showmessage('no_privilege_downthread'); @@ -365,7 +368,7 @@ $downtime = TIMESTAMP - 86400 * 730; C::t('forum_thread')->update($tidsarr, array('lastpost'=>$downtime, 'moderated'=>1), true); - $_G['forum']['threadcaches'] && deletethreadcaches($thread['tid']); + $_G['forum']['threadcaches'] && deletethreadcaches($moderatetids); } elseif($operation == 'delete') { if(!$_G['group']['allowdelpost']) { showmessage('no_privilege_delpost'); @@ -703,7 +706,6 @@ set_stamp($stampstatus, $stampaction, $threadlist, $expiration); } - // 当进行管理操作后, 更新相关板块的板块缓存 $fidarr = array(); foreach ($threadlist as $thread) { $fidarr[] = $thread['fid']; diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php index 44ff5198..0d1034ae 100644 --- a/upload/source/language/lang_admincp.php +++ b/upload/source/language/lang_admincp.php @@ -571,7 +571,7 @@ 'founder_upgrade_diff' => 'เปลี่ยนแปลง', 'founder_upgrade_normal' => 'ปกติ', 'founder_upgrade_new' => 'ใหม่', - 'founder_upgrade_download_file' => 'ไฟล์อัพเดตถูกดาวน์โหลดแล้ว และตอนนี้ได้อยู่บนเซิร์ฟเวอร์ โฟลเดอร์นี้: ', + 'founder_upgrade_download_file' => 'ไฟล์อัปเดตถูกดาวน์โหลดแล้ว และตอนนี้ได้อยู่บนเซิร์ฟเวอร์ โฟลเดอร์นี้: ', 'founder_upgrade_backup_file' => 'เมื่อดำเนินการอัปเดต ไฟล์เก่าทั้งหมดจะถูกสำรองไว้ที่: ', 'founder_upgrade_backup_file2' => ', และไฟล์ใหม่จะถูกเขียนทับทันที', 'founder_upgrade_force' => 'บังคับให้อัปเดต', @@ -2620,10 +2620,10 @@ 'setting_mobile_mobileforward_comment' => 'เมื่อผู้ใช้งานเข้าชมเว็บผ่านทางอุปกรณ์พกพาระบบจะแสดงผลรูปแบบอุปกรณ์พกพาให้โดยอัตโนมัติ', 'setting_mobile_otherindex' => 'อนุญาตให้หน้า ที่ไม่ใช่ฟอรัมเป็นหน้าแรกได้', 'setting_mobile_otherindex_comment' => 'หลังจากเปิดใช้งานเวอร์ชันอุปกรณ์พกพา คุณสามารถตั้งค่าปลั๊กอิน, พอร์ทัลและหน้าอื่น ๆ เป็นโฮมเพจได้', - 'setting_mobile_preview' => 'แสดงตัวอย่างการเข้าชมผ่านอุปกรณ์พกพา บนคอมพิวเตอร์', + 'setting_mobile_preview' => 'แสดงตัวอย่างการเข้าชมผ่านอุปกรณ์พกพา บนพีซี', 'setting_mobile_preview_comment' => 'When a user accessed the standard computer version by mobile browser, guide the user to preview a mobile phone login page, users can preview in the PC version of Mobile Home', 'setting_mobile_register' => 'อนุญาตให้ลงทะเบียนบนอุปกรณ์พกพา', - 'setting_mobile_register_comment' => 'ถ้าเปิดฟังก์ชั่นการลงทะเบียนผ่านทางอุปกรณ์พกพา การลงทะเบียนผ่านทางอุปกรณ์พกพาข้อมูลบางอย่างจะไม่ถูกตรวจสอบระบบการลงทะเบียนจะด้อยกว่าการสมัครผ่านทางคอมพิวเตอร์
ไม่จำเป็นก็ไม่ต้องเปิดดีกว่า', + 'setting_mobile_register_comment' => 'ถ้าเปิดฟังก์ชั่นการลงทะเบียนผ่านทางอุปกรณ์พกพา การลงทะเบียนผ่านทางอุปกรณ์พกพาข้อมูลบางอย่างจะไม่ถูกตรวจสอบระบบการลงทะเบียนจะด้อยกว่าการสมัครผ่านทางพีซี
ไม่จำเป็นก็ไม่ต้องเปิดดีกว่า', 'setting_mobile_hotthread' => 'Show hot threads', 'setting_mobile_hotthread_comment' => 'If enabled then hot threads displayed at the Home page', 'setting_mobile_displayorder3' => 'Show sticky threads', @@ -4462,7 +4462,7 @@ 'groups_manage_postcount' => 'กระทู้', 'groups_manage_replycount' => 'ตอบกลับ', 'groups_manage_createtime' => 'สร้างเมื่อ', - 'groups_manage_updatetime' => 'อัพเดทล่าสุด', + 'groups_manage_updatetime' => 'อัปเดตล่าสุด', 'groups_manage_threadcount' => 'หัวข้อ', 'groups_manage_membercount' => 'จำนวนสมาชิก', 'groups_manage_founder' => 'ผู้สร้าง', @@ -5956,7 +5956,7 @@ 'tools' => 'เครื่องมือ', 'tools_updatecache' => 'อัปเดตไฟล์แคช', - 'tools_updatecache_tips' => '
  • เมื่อกู้คืนข้อมูลเว็บไซต์ อัพเกรดหรือการทำงานเมื่อผิดปกติ คุณสามารถใช้ฟังก์ชันนี้เพื่อสร้างไฟล์แคชใหม่ เมื่ออัปเดตแคช การโหลดของเซิร์ฟเวอร์จะสูงและใช้ทรัพยากรณ์มากขึ้น โปรดพยายามหลีกเลี่ยงการอัปเดตแคชในช่วงเวลาที่มีสมาชิกหรือผู้ใช้งานเว็บไซต์จำนวนมาก
    • + 'tools_updatecache_tips' => '
  • เมื่อกู้คืนข้อมูลเว็บไซต์ อัปเกรดหรือการทำงานเมื่อผิดปกติ คุณสามารถใช้ฟังก์ชันนี้เพื่อสร้างไฟล์แคชใหม่ เมื่ออัปเดตแคช การโหลดของเซิร์ฟเวอร์จะสูงและใช้ทรัพยากรณ์มากขึ้น โปรดพยายามหลีกเลี่ยงการอัปเดตแคชในช่วงเวลาที่มีสมาชิกหรือผู้ใช้งานเว็บไซต์จำนวนมาก
  • แคชข้อมูล: อัปเดตแคชข้อมูลของเว็บไซต์ทั้งหมด
  • แคชเทมเพลต: อัปเดตแคชเทมเพลตของเว็บไซต์ ไฟล์แคชของรูปแบบสไตล์ เมื่อคุณปรับเปลี่ยนเทมเพลตหรือรูปแบบสไตล์ อาจจะยังไม่เห็นผลทันทีจนกว่าจะอัปเดตไฟล์แคช
  • แคชหมวดหมู่โมดูล DIY: อัปเดตแคชหมวดหมู่โมดูล DIY เมื่อคุณติดตั้งหรือปรับเปลี่ยนหมวดหมู่ในโมดูล DIY อาจจะยังไม่เห็นผลทันทีจนกว่าจะอัปเดตไฟล์แคช
    • @@ -5976,12 +5976,12 @@ 'filecheck_start' => 'เริ่ม', 'filecheck_verifying' => 'กำลังประมวลผลไฟล์ โปรดอดทนรอ...', 'filecheck_tips_step1' => 'การตรวจสอบความถูกต้องของไฟล์ (checksum) จะเทียบกับไฟล์ที่ถูกปล่อยออกมาจาก Discuz! Official คลิกที่ปุ่มด้านล่างเพื่อเริ่มทำการตรวจสอบ', - 'filecheck_tips' => '
  • เมื่อเว็บไซต์ของคุณทำงานไม่ถูกต้องหรือสงสัยว่าจะถูกแฮก ฟีเจอร์นี้จะช่วยตรวจสอบไฟล์ทั้งหมดในระบบดิสคัสของคุณ เพื่อทำให้มั่นใจว่า ไฟล์มีการทำงานอย่างถูกต้อง
  • “ไฟล์ที่หายไป” คุณควรอัพโหลดไฟล์ดังกล่าวผ่าน FTP ทันทีถ้าหากเว็บไซต์ของคุณทำงานไม่ถูกต้อง
  • “ไฟล์ที่ถูกแก้ไข”, “ไฟล์ที่ไม่รู้จัก” เป็นไฟล์คุณอาจจะปรับเปลี่ยน/แก้ไขด้วยตนเอง หรือถูกสร้างขึ้นด้วยปลั๊กอินดิสคัส หรือเป็นไฟล์สำหรับการกู้คืนระบบ เป็นต้น
    • ', + 'filecheck_tips' => '
  • เมื่อเว็บไซต์ของคุณทำงานไม่ถูกต้องหรือสงสัยว่าจะถูกแฮก ฟีเจอร์นี้จะช่วยตรวจสอบไฟล์ทั้งหมดในระบบดิสคัสของคุณ เพื่อทำให้มั่นใจว่า ไฟล์มีการทำงานอย่างถูกต้อง
  • “ไฟล์ที่หายไป” คุณควรอัปโหลดไฟล์ดังกล่าวผ่าน FTP ทันทีถ้าหากเว็บไซต์ของคุณทำงานไม่ถูกต้อง
  • “ไฟล์ที่ถูกแก้ไข”, “ไฟล์ที่ไม่รู้จัก” เป็นไฟล์คุณอาจจะปรับเปลี่ยน/แก้ไขด้วยตนเอง หรือถูกสร้างขึ้นด้วยปลั๊กอินดิสคัส หรือเป็นไฟล์สำหรับการกู้คืนระบบ เป็นต้น
    • ', 'filecheck_completed' => 'ผลการตรวจสอบ', 'filecheck_unknown' => 'ไฟล์ที่ไม่รู้จัก', 'filecheck_modify' => 'ไฟล์ที่ถูกแก้ไข', 'filecheck_delete' => 'ไฟล์ที่หายไป', - 'filecheck_doubt' => 'ไฟล์ที่อัพเดตในสัปดาห์นี้', + 'filecheck_doubt' => 'ไฟล์ที่อัปเดตในสัปดาห์นี้', 'filecheck_check_ok' => 'ถูกต้อง', 'filecheck_status' => 'สถานะ', 'filecheck_check_now' => 'Check now', diff --git a/upload/source/language/lang_admincp_login.php b/upload/source/language/lang_admincp_login.php index f7b9edab..f47b1503 100644 --- a/upload/source/language/lang_admincp_login.php +++ b/upload/source/language/lang_admincp_login.php @@ -30,12 +30,12 @@ 'security_question_6' => 'อาหารจานโปรดของฉัน', 'security_question_7' => 'เลขบัตรประชาชน', - 'login_tips' => 'Discuz! ใช้ภาษา PHP และ MySQL รวมไปถึงโซลูชันอื่นๆ ในการพัฒนา เพื่อให้ระบบคอมมูนิวตี้ของคุณทรงประสิทธิภาพ พร้อมเป็นตัวเลือกอันดับแรกในการสร้างแบรนด์ให้กับเว็บไซต์ของคุณได้', + 'login_tips' => 'Discuz! คือแพลตฟอร์มชุมชนสร้างเว็บไซต์ระดับมืออาชีพ เปิดตัวโดย Tencent Cloud และแปลภาษาไทยโดย Discuz! Thai เพื่อช่วยให้เว็บไซต์ได้รับบริการแบบครบ จบ ในที่เดียว', 'login_nosecques' => 'คุณยังไม่ได้ตั้งค่าคำถามความปลอดภัยในการลงชื่อเข้าใช้ คุณสามารถตั้งค่าคำถามความปลอดภัยได้ที่ข้อมูลส่วนตัวหรือเมนูสมาชิก หรือ คลิกที่นี่เพื่อ เพื่อตั้งค่าคำถามความปลอดภัยของคุณ', - 'login_cp_guest' => 'คำขอนี้ถูกปฏิเสธเนื่องจากคุณไม่ได้เข้าสู่ระบบ

    กรุณาเข้าสู่ระบบและลองอีกครั้ง', - 'login_cplock' => 'การลงชื่อเข้าใช้การจัดการของคุณถูกล็อก!
    กรุณารอ อีก {ltime} วินาที แล้วค่อยลองใหม่อีกครั้ง', - 'login_user_lock' => 'คุณใส่รหัสผ่านผิดหลายครั้งเกินไป การร้องขอการลงชื่อเข้าใช้นี้ถูกปฏิเสธ กรุณาลองอีกครั้งหลังจาก 15 นาที', + 'login_cp_guest' => 'คำขอนี้ถูกปฏิเสธเนื่องจากคุณไม่ได้เข้าสู่ระบบ

    กรุณาเข้าสู่ระบบและลองอีกครั้ง

    เมื่อผู้ดูแลระบบต้องการบังคับให้เข้าสู่ระบบ ให้แก้ไข config/config_global.php เพื่อปิดใช้งานฟังก์ชันนี้', + 'login_cplock' => 'ระบบการจัดการเว็บไซต์ของคุณถูกล็อก!
    กรุณารออีก {ltime} วินาที แล้วค่อยลองใหม่อีกครั้ง', + 'login_user_lock' => 'คำขอเข้าสู่ระบบนี้ถูกปฏิเสธเนื่องจากเข้าสู่ระบบไม่ถูกต้องมากเกินไป กรุณาลองอีกครั้งในอีก 15 นาที', 'login_cp_noaccess' => 'คุณไม่ได้รับอนุญาตให้เข้าใช้งาน

    ระบบได้บันทึกการกระทำของคุณไว้แล้ว ดังนั้นอย่าพยายามทำผิดกฎ', 'noaccess' => 'คุณไม่ได้รับอนุญาตให้เข้าถึงการตั้งค่าระบบ กรุณาติดต่อผู้ดูแลเว็บไซต์', diff --git a/upload/source/language/lang_admincp_menu.php b/upload/source/language/lang_admincp_menu.php index 21fcdff5..f520c115 100644 --- a/upload/source/language/lang_admincp_menu.php +++ b/upload/source/language/lang_admincp_menu.php @@ -37,7 +37,7 @@ 'header_cloudaddons' => 'แอปฯ', - 'menu_home' => 'หน้าแรกของศูนย์กลางจัดการ', + 'menu_home' => 'หน้าแรก AdminCP', 'menu_home_clearhistorymenus' => 'ล้างประวัติเมนู', 'menu_setting_basic' => 'ข้อมูลเว็บไซต์', @@ -76,7 +76,7 @@ 'menu_members_add' => 'เพิ่มสมาชิกใหม่', 'menu_members_edit' => 'จัดการสมาชิก', 'menu_members_newsletter' => 'จัดการข่าวประกาศ', - 'menu_members_mobile' => 'จัดการแจ้งเตือนอุปกรณ์พกพา', + 'menu_members_mobile' => 'แจ้งเตือนผ่านมือถือ', 'menu_usertag' => 'จัดการแท็กผู้ใช้งาน', 'menu_members_edit_ban_user' => 'แบนสมาชิก', 'menu_members_ipban' => 'แบน IP', @@ -135,7 +135,7 @@ 'menu_patch' => 'แพทช์ความปลอดภัย', 'menu_upgrade' => 'จัดการอัปเกรด', - 'menu_optimizer' => 'ประเมินประสิทธิภาพระบบ', + 'menu_optimizer' => 'ประเมินระบบ', 'menu_security' => 'ตั้งค่าตรวจสอบระบบ', 'menu_serversec' => 'ตรวจสอบความปลอดภัย', diff --git a/upload/source/language/lang_admincp_msg.php b/upload/source/language/lang_admincp_msg.php index e4e432e3..bf27dddd 100644 --- a/upload/source/language/lang_admincp_msg.php +++ b/upload/source/language/lang_admincp_msg.php @@ -194,6 +194,7 @@ 'cloudaddons_installing' => 'กำลังติดตั้งแอปพลิเคชัน {addonid} โปรดรอสักครู่...', 'cloudaddons_install_files_changed' => 'ไฟล์ต่อไปนี้มีการแก้ไขก่อนหน้านี้แล้ว คุณต้องการเขียนทับต่อหรือไม่

    {files}', 'cloudaddons_pack_installed' => 'ติดตั้งส่วนขยายแล้ว', + 'cloudaddons_batch_succeed' => 'กรุณาคลิกลิงก์ด้านล่างเพื่อติดตั้งและอัปเกรด', 'counter_forum_succeed' => 'จำนวนโพสต์ถูกสร้างขึ้นใหม่แล้ว', 'counter_digest_succeed' => 'จำนวนกระทู้สำคัญถูกสร้างขึ้นใหม่แล้ว', @@ -359,11 +360,11 @@ 'members_ipban_invalid' => 'IP ที่พึ่งเพิ่มนั้นมีอยู่แล้วในรายการ IP ที่ถูกแบน, กรุณากลับไป', 'members_ipban_succeed' => 'รายการ IP ที่ถูกแบนได้รับการอัปเดตเรียบร้อยแล้ว ', 'members_profile_edit_title_empty_error' => 'Profile title cannot be empty', - 'members_stat_do_stepstat' => 'กำลังอัปเดตสถิติ ({i} / {t}), กรุณารอสักครู่...', + 'members_stat_do_stepstat' => 'กำลังอัปเดตสถิติ ({i} / {t}) กรุณารอสักครู่...', 'members_stat_bad_fieldid' => 'ข้อมูลฟิลด์ที่ระบุไม่ถูกต้อง', - 'members_stat_update_option_succeed' => 'Statistics have been successfully updated.', - 'members_stat_do_stepstat_prepared' => 'Prepared to update the statistics, total keys: {t}. This process will be done automatically, please wait', - 'members_stat_null_operation' => 'เลือกการกระทำ', + 'members_stat_update_option_succeed' => 'อัปเดตสถิติสำเร็จ', + 'members_stat_do_stepstat_prepared' => 'พร้อมอัปเดตสถิติ ทั้งหมด {t} รายการ กระบวนการนี้จะเสร็จสิ้นโดยอัตโนมัติ กรุณารอสักครู่', + 'members_stat_null_operation' => 'กรุณาเลือกการดำเนินการ', 'members_newsletter_sm_invalid' => 'คุณยังไม่ได้กรอกหัวข้อหรือเนื้อหาของการประกาศ กรุณากลับไปปรับเปลี่ยนค่า', 'members_reward_invalid' => 'คุณไม่มีเครดิตในการมอบเครดิต กรุณากลับไปปรับเปลี่ยนค่า', 'members_confermedal_succeed' => 'มอบเหรียญรางวัลเรียบร้อยแล้ว ', diff --git a/upload/source/language/lang_message.php b/upload/source/language/lang_message.php index 0c1e50c8..0e01af5b 100644 --- a/upload/source/language/lang_message.php +++ b/upload/source/language/lang_message.php @@ -245,7 +245,7 @@ 'magicuse_object_once_limit' => 'ขออภัย! ไอเท็มถูกใช้กับข้อมูลนี้อยู่แล้ว คุณไม่สามารถนำมาใช้ใหม่ได้', 'magicuse_bad_object' => 'คุณยังไม่ได้เลือกไอเท็มที่เหมาะสม', 'magicuse_has_no_valid_friend' => 'ขออภัย! ใช้ไอเท็มล้มเหลว ชื่อเพื่อนไม่ถูกต้อง', - 'mobile_template_no_found' => 'หน้าเว็บที่คุณเยี่ยมชมยังไม่พร้อมใช้งานบนมือถือ คุณต้องการเยี่ยมชมเวอร์ชันคอมพิวเตอร์ต่อไปหรือไม่

    ดำเนินการต่อ

    ', + 'mobile_template_no_found' => 'หน้าเว็บที่คุณเยี่ยมชมยังไม่พร้อมใช้งานบนมือถือ คุณต้องการเยี่ยมชมเวอร์ชันพีซีต่อไปหรือไม่

    ดำเนินการต่อ

    ', 'portal_status_off' => 'ขออภัย! หน้าพอร์ทัลยังไม่เปิดใช้งาน', @@ -1062,7 +1062,7 @@ 'submit_secqaa_invalid' => 'ขออภัย! ตอบคำถามผิด', 'post_url_nopermission' => 'ขออภัย! คุณไม่ได้รับอนุญาตให้โพสต์ลิงก์ URL', - 'not_in_mobile' => 'หน้าที่คุณเยี่ยมชมไม่มีหน้าสำหรับมือถือ คุณต้องการเยี่ยมชมเวอร์ชันคอมพิวเตอร์เพิ่มเติมหรือไม่', + 'not_in_mobile' => 'หน้าที่คุณเยี่ยมชมไม่มีหน้าสำหรับมือถือ คุณต้องการเยี่ยมชมเวอร์ชันพีซีเพิ่มเติมหรือไม่', 'magics_operation_nopermission' => 'ขออภัย! ไอเท็มนี้สามารถใช้งานได้กับกระทู้และโพสต์ของตัวเองเท่านั้น', diff --git a/upload/source/language/lang_template.php b/upload/source/language/lang_template.php index 86c7496d..c6d36f92 100644 --- a/upload/source/language/lang_template.php +++ b/upload/source/language/lang_template.php @@ -88,7 +88,7 @@ 'switch_wide' => 'ขนาดจอกว้าง', 'switch_blind' => 'โหมดผู้บกพร่องทางสายตา', 'task_doing' => 'กำลังดำเนินการ', - 'to_be_continue' => 'แสดงผลรูปแบบคอมพิวเตอร์', + 'to_be_continue' => 'แสดงผลโหมดพีซี', 'usergroup' => 'กลุ่มสมาชิก', 'visit_my_space' => 'เยี่ยมชมโปรไฟล์', 'your_mobile_browser' => 'กรุณาเลือก ', diff --git a/upload/source/language/mobile/lang_template.php b/upload/source/language/mobile/lang_template.php index 50b11a95..3637a17d 100644 --- a/upload/source/language/mobile/lang_template.php +++ b/upload/source/language/mobile/lang_template.php @@ -14,10 +14,10 @@ } $lang = array ( - 'no_simplemobiletype' => 'รูปแบบทั่วไป', - 'nomobiletype' => 'รูปแบบคอมพิวเตอร์', - 'simplemobiletype' => 'รูปแบบพื้นฐานอย่างง่าย', - 'extremelysimplemobiletype' => 'รูปแบบ WML', + 'no_simplemobiletype' => 'โหมดทั่วไป', + 'nomobiletype' => 'โหมดพีซี', + 'simplemobiletype' => 'โหมดพื้นฐาน', + 'extremelysimplemobiletype' => 'โหมด WML', 'favorite' => 'บุ๊คมาร์ก', 'my_posts' => 'โพสต์ของฉัน', 'new_pm' => 'ข้อความส่วนตัวใหม่', @@ -54,13 +54,13 @@ 'viewnewthread' => 'กระทู้ใหม่', 'admin_threadtopicadmin_error' => 'ไม่สามารถดำเนินการจัดการผ่านการแสดงผลบนอุปกรณ์พกพา', 'expiry' => 'กำหนดเวลา(0 คือตลอดไป/1 คือหนึ่งวัน)', - 'mod_message_goto_admincp' => 'ไม่สามารถดำเนินการผ่านการแสดงผลบนอุปกรณ์พกพา กรุณาใช้การแสดงผลบนคอมพิวเตอร์', + 'mod_message_goto_admincp' => 'ไม่สามารถดำเนินการผ่านการแสดงผลบนอุปกรณ์พกพา กรุณาใช้การแสดงผลโหมดพีซี', 'result' => 'ผลลัพธ์การค้นหา', 'join_thread' => 'ตอบกระทู้', 'required' => 'ต้องระบุ', 'send_special_activity_error' => 'ไม่สามารถจัดกิจกรรมผ่านการแสดงผลบนอุปกรณ์พกพา', 'send_special_trade_error' => 'ไม่สามารถขายสินค้าผ่านการแสดงผลบนอุปกรณ์พกพา', - 'threadsort_error' => 'ไม่สามารถดำเนินการผ่านการแสดงผลบนอุปกรณ์พกพา กรุณาใช้การแสดงผลบนคอมพิวเตอร์', + 'threadsort_error' => 'ไม่สามารถดำเนินการผ่านการแสดงผลบนอุปกรณ์พกพา กรุณาใช้การแสดงผลโหมดพีซี', 'threadsort_calendar' => 'รูปแบบวันที่: 2010-12-01', 'post_poll_options' => 'ตัวเลือกโพล', 'admin_close_expire_comment' => 'เลือกรูปแบบวันที่: 2010-12-01 10:50', @@ -101,7 +101,7 @@ 'empty' => 'ยังไม่มี', 'mobilehome' => 'หน้าแรก', 'register' => 'สมัครสมาชิก', - 'mobile2version' => 'รูปแบบโมเดิร์น', + 'mobile2version' => 'โหมดโมเดิร์น', 'clientversion' => 'แอพพลิเคชั่นสำหรับอุปกรณ์พกพา', 'forum_list' => 'รายชื่อบอร์ด', 'user_info' => 'ข้อมูลสมาชิก', diff --git a/upload/source/language/portal/lang_template.php b/upload/source/language/portal/lang_template.php index 37029c25..56857b23 100644 --- a/upload/source/language/portal/lang_template.php +++ b/upload/source/language/portal/lang_template.php @@ -180,7 +180,7 @@ 'update_mod' => 'อัปเดตโมดูล', 'update_mod_now' => 'อัปเดตข้อมูลโมดูล', 'verify_message' => 'ข้อมูลของคุณจะถูกอัปเดตในฐานข้อมูลที่ต้องตรวจสอบ', - 'cut' => '裁切', + 'cut' => 'ตัด', 'remote' => 'ระยะไกล', 'block_link_target_blank' => 'เปิดในน้าต่างใหม่', 'block_link_target_self' => 'เปิดในหน้านี้', diff --git a/upload/source/module/forum/forum_post.php b/upload/source/module/forum/forum_post.php index ab70af61..2d28ddcb 100644 --- a/upload/source/module/forum/forum_post.php +++ b/upload/source/module/forum/forum_post.php @@ -302,6 +302,21 @@ } else { $policykey = ''; } +$policykeys = array('postattach', $policykey); +loadcache('creditrule'); +foreach ($policykeys as $key) { + if($key && is_array($_G['cache']['creditrule'][$key])) { + $data = array(); + $creditrule = $_G['cache']['creditrule'][$key]; + for($i = 1; $i <= 8; $i++) { + if($creditrule['extcredits'.$i]) { + $data[$i] = $creditrule['extcredits'.$i]; + } + } + $_G['setting']['creditspolicy'][$key] = $data; + } +} +$postattachcredits = !empty($_G['forum']['postattachcredits']) ? $_G['forum']['postattachcredits'] : $_G['setting']['creditspolicy']['postattach']; if($policykey) { $postcredits = $_G['forum'][$policykey.'credits'] ? $_G['forum'][$policykey.'credits'] : $_G['setting']['creditspolicy'][$policykey]; } @@ -322,8 +337,8 @@ (!empty($special) ? "&special=$special" : ''). (!empty($sortid) ? "&sortid=$sortid" : ''). (!empty($typeid) ? "&typeid=$typeid" : ''). - (!empty($_GET['firstpid']) ? "&firstpid=$firstpid" : ''). - (!empty($_GET['addtrade']) ? "&addtrade=$addtrade" : ''); + (!empty($_GET['firstpid']) ? "&firstpid=".$_GET['firstpid'] : ''). + (!empty($_GET['addtrade']) ? "&addtrade=".$_GET['addtrade'] : ''); if($_GET['action'] == 'reply') { check_allow_action('allowreply'); @@ -338,6 +353,7 @@ require_once libfile('function/portalcp'); } $navtitle = lang('core', 'title_'.$_GET['action'].'_post'); +list($modnewthreads, $modnewreplies) = threadmodstatus(''); if($_GET['action'] == 'newthread' || $_GET['action'] == 'newtrade') { loadcache('groupreadaccess'); diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php index dcae00de..95f65778 100644 --- a/upload/source/module/forum/forum_viewthread.php +++ b/upload/source/module/forum/forum_viewthread.php @@ -490,7 +490,7 @@ $_G['forum_numpost'] = ($page - 1) * $_G['ppp']; if($ordertype != 1) { } else { - $_G['forum_numpost'] = $_G['forum_thread']['replies'] + 2 - $_G['forum_numpost'] + ($page > 1 ? 1 : 0); + $_G['forum_numpost'] = $_G['forum_thread']['replies'] + 2 - $_G['forum_numpost'] + ($page == $totalpage ? 1 : 0); } } else { $start_limit = $_G['forum_numpost'] = max(0, ($page - 1) * $_G['ppp']); @@ -500,7 +500,7 @@ } if($ordertype != 1) { } else { - $_G['forum_numpost'] = $_G['forum_thread']['replies'] + 2 - $_G['forum_numpost'] + ($page > 1 ? 1 : 0); + $_G['forum_numpost'] = $_G['forum_thread']['replies'] + 2 - $_G['forum_numpost']; } } $multipageparam = ($_G['forum_thread']['is_archived'] ? '&archive='.$_G['forum_thread']['archiveid'] : ''). @@ -624,6 +624,10 @@ $ordertype != 1 ? ksort($postarr) : krsort($postarr); } $summary = ''; +$curpagepids = array(); +foreach($postarr as $post) { + $curpagepids[] = $post['pid']; +} if($page == 1 && $ordertype == 1) { $firstpost = C::t('forum_post')->fetch_threadpost_by_tid_invisible($_G['tid']); if($firstpost['invisible'] == 0 || $visibleallflag == 1) { @@ -668,6 +672,7 @@ $post['existinfirstpage'] = true; } + $post['incurpage'] = in_array($post['pid'],$curpagepids); $postusers[$post['authorid']] = array(); if($post['first']) { if($ordertype == 1 && $page != 1) { @@ -1079,12 +1084,12 @@ function viewthread_procpost($post, $lastvisit, $ordertype, $maxposition = 0) { $post['lastpostanchor'] = ($ordertype != 1 && $_G['forum_numpost'] == $_G['forum_thread']['replies']) || ($ordertype == 1 && $_G['forum_numpost'] == $_G['forum_thread']['replies'] + 2) ? '' : ''; - if(!$post['hotrecommended']) { + if(!$post['hotrecommended'] && $post['incurpage']) { if($_G['forum_pagebydesc']) { if($ordertype != 1) { $post['number'] = $_G['forum_numpost'] + $_G['forum_ppp2']--; } else { - $post['number'] = $post['first'] == 1 ? 1 : ($_G['forum_numpost'] - 1) - $_G['forum_ppp2']--; + $post['number'] = $post['first'] == 1 ? 1 : $_G['forum_numpost'] - $_G['forum_ppp2']--; } } else { if($ordertype != 1) { @@ -1095,7 +1100,7 @@ function viewthread_procpost($post, $lastvisit, $ordertype, $maxposition = 0) { } } - if($post['existinfirstpage']) { + if($post['existinfirstpage'] && $post['incurpage']) { if($_G['forum_pagebydesc']) { $_G['forum_ppp2']--; } else { diff --git a/upload/source/module/home/home_magic.php b/upload/source/module/home/home_magic.php index 3acdac91..acb8397f 100644 --- a/upload/source/module/home/home_magic.php +++ b/upload/source/module/home/home_magic.php @@ -114,6 +114,10 @@ showmessage('magics_nonexistence'); } $magicperm = dunserialize($magic['magicperm']); + $useperm = (strstr($magicperm['usergroups'], "\t$_G[groupid]\t") || empty($magicperm['usergroups'])) ? '1' : '0'; + if(!$useperm) { + showmessage('magics_use_nopermission'); + } $querystring = array(); foreach($_GET as $k => $v) { $querystring[] = rawurlencode($k).'='.rawurlencode($v); @@ -150,8 +154,6 @@ if(!submitcheck('operatesubmit')) { - $useperm = (strstr($magicperm['usergroups'], "\t$_G[groupid]\t") || !$magicperm['usergroups']) ? '1' : '0'; - if($magicperm['targetgroups']) { loadcache('usergroups'); foreach(explode("\t", $magicperm['targetgroups']) as $_G['groupid']) { diff --git a/upload/source/module/home/home_medal.php b/upload/source/module/home/home_medal.php index 5c22acac..92501e1a 100644 --- a/upload/source/module/home/home_medal.php +++ b/upload/source/module/home/home_medal.php @@ -50,7 +50,7 @@ $mymedals = array_keys($mymedals); $applylogs = C::t('forum_medallog')->fetch_all_by_type(2); foreach ($applylogs as $id => $log) { - $mymedals[$log['medalid']] = $log['medalid']; + $log['uid'] == $_G['uid'] && $mymedals[$log['medalid']] = $log['medalid']; } } elseif($_GET['action'] == 'confirm') { diff --git a/upload/source/module/search/search_forum.php b/upload/source/module/search/search_forum.php index e7eb9175..9f0aeb65 100644 --- a/upload/source/module/search/search_forum.php +++ b/upload/source/module/search/search_forum.php @@ -74,6 +74,8 @@ } else { $orderby = in_array($_GET['orderby'], array('dateline', 'replies', 'views')) ? $_GET['orderby'] : 'lastpost'; $ascdesc = isset($_GET['ascdesc']) && $_GET['ascdesc'] == 'asc' ? 'asc' : 'desc'; + $orderbyselected = array($orderby => 'selected="selected"'); + $ascchecked = array($ascdesc => 'checked="checked""'); if(!empty($searchid)) { @@ -99,6 +101,11 @@ if($keyword) { $modkeyword = str_replace(' ', ',', $keyword); $fids = explode(',', str_replace('\\\'', '', $searchstring[5])); + foreach ($fids as $srchfid) { + if(!empty($srchfid) ) { + $forumselect = str_replace('