From 242356980e3d3d98c0d6db16f08ba296353f7779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?= Date: Wed, 4 Dec 2019 18:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=8E=E5=90=8E=E5=8F=B0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/forum.php | 6 +- upload/group.php | 4 ++ upload/home.php | 2 +- upload/install/data/install_data.sql | 20 ++++--- upload/portal.php | 4 ++ upload/search.php | 2 + upload/source/admincp/admincp_magics.php | 5 +- upload/source/admincp/admincp_setting.php | 9 ++- upload/source/admincp/admincp_tasks.php | 7 --- upload/source/class/helper/helper_access.php | 2 +- .../source/function/cache/cache_setting.php | 1 - upload/source/function/function_space.php | 56 +++++++++++-------- upload/source/include/misc/misc_ajax.php | 32 +++++++++++ upload/source/include/misc/misc_category.php | 4 ++ .../source/include/misc/misc_forumselect.php | 4 ++ upload/source/include/misc/misc_inputpwd.php | 6 ++ .../include/misc/misc_ranklist_member.php | 8 +-- .../source/include/modcp/modcp_moderate.php | 3 + .../source/include/space/space_activity.php | 8 ++- upload/source/include/space/space_album.php | 9 ++- upload/source/include/space/space_blog.php | 7 ++- upload/source/include/space/space_debate.php | 8 ++- upload/source/include/space/space_doing.php | 8 ++- .../source/include/space/space_favorite.php | 4 ++ upload/source/include/space/space_friend.php | 7 ++- upload/source/include/space/space_home.php | 5 +- upload/source/include/space/space_poll.php | 8 ++- upload/source/include/space/space_reward.php | 4 ++ upload/source/include/space/space_share.php | 5 ++ upload/source/include/space/space_thread.php | 12 +++- upload/source/include/space/space_trade.php | 7 ++- upload/source/include/space/space_wall.php | 4 ++ .../source/include/spacecp/spacecp_album.php | 4 ++ .../source/include/spacecp/spacecp_blog.php | 4 ++ .../source/include/spacecp/spacecp_class.php | 4 ++ .../source/include/spacecp/spacecp_click.php | 9 +++ .../include/spacecp/spacecp_comment.php | 22 ++++++-- .../source/include/spacecp/spacecp_doing.php | 4 ++ .../include/spacecp/spacecp_favorite.php | 5 ++ .../source/include/spacecp/spacecp_feed.php | 4 ++ .../source/include/spacecp/spacecp_follow.php | 5 ++ .../source/include/spacecp/spacecp_friend.php | 4 ++ .../source/include/spacecp/spacecp_magic.php | 4 ++ .../source/include/spacecp/spacecp_poke.php | 4 ++ .../source/include/spacecp/spacecp_search.php | 4 ++ .../source/include/spacecp/spacecp_share.php | 4 ++ upload/source/include/spacecp/spacecp_top.php | 5 ++ .../source/include/spacecp/spacecp_upload.php | 5 ++ upload/source/language/lang_admincp.php | 12 ++++ upload/source/language/lang_message.php | 18 +++++- upload/source/language/lang_spacecp.php | 6 ++ upload/source/module/forum/forum_ajax.php | 30 ++++++++-- .../source/module/forum/forum_collection.php | 4 ++ upload/source/module/forum/forum_group.php | 4 ++ upload/source/module/forum/forum_guide.php | 4 ++ upload/source/module/forum/forum_misc.php | 4 ++ upload/source/module/forum/forum_modcp.php | 8 ++- upload/source/module/home/home_follow.php | 4 ++ upload/source/module/home/home_medal.php | 4 ++ upload/source/module/home/home_rss.php | 4 ++ upload/source/module/home/home_space.php | 2 +- upload/source/module/home/home_task.php | 2 +- upload/source/module/misc/misc_invite.php | 4 ++ upload/source/module/misc/misc_ranklist.php | 11 ++-- .../source/module/portal/portal_portalcp.php | 8 ++- upload/template/default/common/header.htm | 14 +++-- .../template/default/common/header_qmenu.htm | 2 +- .../template/default/common/pubsearchform.htm | 8 +-- upload/template/default/forum/ajax.htm | 8 ++- upload/template/default/forum/discuz.htm | 2 +- .../template/default/forum/forumdisplay.htm | 4 +- upload/template/default/forum/modcp.htm | 16 +++--- .../template/default/forum/modcp_moderate.htm | 2 +- .../default/forum/viewthread_activity.htm | 2 +- .../default/forum/viewthread_album.htm | 6 +- .../default/forum/viewthread_node.htm | 5 +- .../default/forum/viewthread_portal.htm | 6 +- upload/template/default/group/group.htm | 4 +- .../default/home/space_album_view.htm | 16 +++--- .../template/default/home/space_blog_view.htm | 4 +- upload/template/default/home/space_card.htm | 6 +- .../template/default/home/space_favorite.htm | 4 +- .../default/home/space_header_personalnv.htm | 2 +- upload/template/default/home/space_menu.htm | 10 +++- .../default/home/space_profile_body.htm | 6 +- upload/template/default/home/space_thread.htm | 4 +- .../template/default/home/space_userabout.htm | 11 +++- .../template/default/home/spacecp_privacy.htm | 3 +- .../template/default/home/spacecp_upload.htm | 2 +- .../template/default/mobile/forum/discuz.htm | 2 +- .../default/mobile/forum/forumdisplay.htm | 2 +- .../default/mobile/forum/viewthread.htm | 2 +- .../default/mobile/home/space_favorite.htm | 2 +- upload/template/default/portal/view.htm | 4 ++ upload/template/default/ranklist/member.htm | 6 ++ upload/template/default/ranklist/ranklist.htm | 6 +- .../template/default/ranklist/side_left.htm | 10 ++-- upload/template/default/search/pubsearch.htm | 8 +-- .../default/touch/forum/viewthread.htm | 2 +- .../default/touch/home/space_favorite.htm | 2 + 100 files changed, 516 insertions(+), 168 deletions(-) diff --git a/upload/forum.php b/upload/forum.php index ca44d25de..1b590be66 100644 --- a/upload/forum.php +++ b/upload/forum.php @@ -19,7 +19,7 @@ require './source/function/function_forum.php'; $modarray = array('ajax','announcement','attachment','forumdisplay', - 'group','image','index','medal','misc','modcp','notice','post','redirect', + 'group','image','index','misc','modcp','post','redirect', 'rss','topicadmin','trade','viewthread','tag','collection','guide' ); @@ -56,6 +56,10 @@ if(C::app()->var['mod'] == 'group') { C::app()->cachelist = $cachelist; C::app()->init(); +if(!$_G['setting']['forumstatus'] && !in_array($mod, array('ajax', 'misc', 'modcp'))) { + showmessage('forum_status_off'); +} + loadforum(); set_rssauth(); diff --git a/upload/group.php b/upload/group.php index 06668fa11..ac277d190 100644 --- a/upload/group.php +++ b/upload/group.php @@ -18,6 +18,10 @@ $cachelist = array('grouptype', 'groupindex', 'diytemplatenamegroup'); $discuz->cachelist = $cachelist; $discuz->init(); +if(!$_G['setting']['groupstatus']) { + showmessage('group_module_status_off'); +} + $_G['disabledwidthauto'] = 0; $modarray = array('index', 'my', 'attentiongroup'); diff --git a/upload/home.php b/upload/home.php index 5da305664..2b0512335 100644 --- a/upload/home.php +++ b/upload/home.php @@ -28,7 +28,7 @@ $space = array(); $mod = getgpc('mod'); if(!in_array($mod, array('space', 'spacecp', 'misc', 'magic', 'editor', 'invite', 'task', 'medal', 'rss', 'follow'))) { $mod = 'space'; - $_GET['do'] = 'home'; + $_GET['do'] = $_G['setting']['feedstatus'] ? 'home' : 'profile'; } if($mod == 'space' && ((empty($_GET['do']) || $_GET['do'] == 'index') && ($_G['inajax']))) { diff --git a/upload/install/data/install_data.sql b/upload/install/data/install_data.sql index 3e4b7b983..3c76fcd6e 100644 --- a/upload/install/data/install_data.sql +++ b/upload/install/data/install_data.sql @@ -167,12 +167,12 @@ INSERT INTO pre_common_nav VALUES ('', '0', '记录', '', 'home.php?mod=space&do INSERT INTO pre_common_nav VALUES ('', '0', '广播', '', 'home.php?mod=follow', 'follow', 0, 0, -1, 6, 0, 0, 0, 0, '{STATICURL}image/feed/follow.gif', '', '', 2, ''); INSERT INTO pre_common_nav VALUES ('', '0', '{hr}', '', '', '', 0, 1, 1, 8, 0, 0, 0, 0, '', '', '', 2, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '好友', '', 'home.php?mod=space&do=friend', 'friend', 0, 0, 0, 1, 0, 0, 0, 0, '{STATICURL}image/feed/friend_b.png', '', '', 3, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '帖子', '', 'forum.php?mod=guide&view=my', 'thread', 0, 0, 0, 2, 0, 0, 0, 0, '{STATICURL}image/feed/thread_b.png', '', '', 3, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '收藏', '', 'home.php?mod=space&do=favorite&view=me', 'favorite', 0, 0, 0, 3, 0, 0, 0, 0, '{STATICURL}image/feed/favorite_b.png', '', '', 3, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '道具', '', 'home.php?mod=magic', 'magic', 0, 0, 1, 4, 0, 0, 0, 0, '{STATICURL}image/feed/magic_b.png', '', '', 3, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '勋章', '', 'home.php?mod=medal', 'medal', 0, 0, 1, 5, 0, 0, 0, 0, '{STATICURL}image/feed/medal_b.png', '', '', 3, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '任务', '', 'home.php?mod=task', 'task', 0, 0, 1, 6, 0, 0, 0, 0, '{STATICURL}image/feed/task_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '好友', '', 'home.php?mod=space&do=friend', 'friend', 0, 0, -1, 1, 0, 0, 0, 0, '{STATICURL}image/feed/friend_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '帖子', '', 'home.php?mod=space&do=thread&view=me', 'thread', 0, 0, 0, 2, 0, 0, 0, 0, '{STATICURL}image/feed/thread_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '收藏', '', 'home.php?mod=space&do=favorite&view=me', 'favorite', 0, 0, -1, 3, 0, 0, 0, 0, '{STATICURL}image/feed/favorite_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '道具', '', 'home.php?mod=magic', 'magic', 0, 0, -1, 4, 0, 0, 0, 0, '{STATICURL}image/feed/magic_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '勋章', '', 'home.php?mod=medal', 'medal', 0, 0, -1, 5, 0, 0, 0, 0, '{STATICURL}image/feed/medal_b.png', '', '', 3, ''); +INSERT INTO pre_common_nav VALUES ('', '0', '任务', '', 'home.php?mod=task', 'task', 0, 0, -1, 6, 0, 0, 0, 0, '{STATICURL}image/feed/task_b.png', '', '', 3, ''); INSERT INTO pre_common_nav VALUES ('', '0', '淘帖', '', 'forum.php?mod=collection&op=my', 'collection', 0, 0, -1, 7, 0, 0, 0, 0, '{STATICURL}image/feed/collection_b.png', '', '', 3, ''); INSERT INTO pre_common_nav VALUES ('', '0', '动态', '', 'home.php', 'feed', 0, 0, -1, 8, 0, 0, 0, 0, '{STATICURL}image/feed/feed_b.png', '', '', 3, ''); INSERT INTO pre_common_nav VALUES ('', '0', '日志', '', 'home.php?mod=space&do=blog', 'blog', 0, 0, -1, 9, 0, 0, 0, 0, '{STATICURL}image/feed/blog_b.png', '', '', 3, ''); @@ -306,6 +306,8 @@ INSERT INTO pre_common_setting VALUES ('targetblank','0'); INSERT INTO pre_common_setting VALUES ('google','1'); INSERT INTO pre_common_setting VALUES ('groupstatus','0'); INSERT INTO pre_common_setting VALUES ('portalstatus','0'); +INSERT INTO pre_common_setting VALUES ('forumstatus','1'); +INSERT INTO pre_common_setting VALUES ('friendstatus','0'); INSERT INTO pre_common_setting VALUES ('followstatus','0'); INSERT INTO pre_common_setting VALUES ('collectionstatus','0'); INSERT INTO pre_common_setting VALUES ('guidestatus','0'); @@ -316,6 +318,8 @@ INSERT INTO pre_common_setting VALUES ('albumstatus','0'); INSERT INTO pre_common_setting VALUES ('sharestatus','0'); INSERT INTO pre_common_setting VALUES ('wallstatus','0'); INSERT INTO pre_common_setting VALUES ('rankliststatus','0'); +INSERT INTO pre_common_setting VALUES ('medalstatus','0'); +INSERT INTO pre_common_setting VALUES ('favoritestatus','0'); INSERT INTO pre_common_setting VALUES ('homestyle','0'); INSERT INTO pre_common_setting VALUES ('homepagestyle','0'); @@ -358,7 +362,7 @@ INSERT INTO pre_common_setting VALUES ('karmaratelimit','0'); INSERT INTO pre_common_setting VALUES ('losslessdel','365'); INSERT INTO pre_common_setting VALUES ('magicdiscount','85'); INSERT INTO pre_common_setting VALUES ('magicmarket','1'); -INSERT INTO pre_common_setting VALUES ('magicstatus','1'); +INSERT INTO pre_common_setting VALUES ('magicstatus','0'); INSERT INTO pre_common_setting VALUES ('mail','a:10:{s:8:\"mailsend\";s:1:\"1\";s:6:\"server\";s:13:\"smtp.21cn.com\";s:4:\"port\";s:2:\"25\";s:4:\"auth\";s:1:\"1\";s:4:\"from\";s:26:\"Discuz \";s:13:\"auth_username\";s:17:\"username@21cn.com\";s:13:\"auth_password\";s:8:\"password\";s:13:\"maildelimiter\";s:1:\"0\";s:12:\"mailusername\";s:1:\"1\";s:15:\"sendmail_silent\";s:1:\"1\";}'); INSERT INTO pre_common_setting VALUES ('maxavatarpixel','120'); INSERT INTO pre_common_setting VALUES ('maxavatarsize','20000'); @@ -479,7 +483,7 @@ INSERT INTO pre_common_setting VALUES ('styleid3','1'); INSERT INTO pre_common_setting VALUES ('stylejump','1'); INSERT INTO pre_common_setting VALUES ('subforumsindex','0'); INSERT INTO pre_common_setting VALUES ('tagstatus','1'); -INSERT INTO pre_common_setting VALUES ('taskon','0'); +INSERT INTO pre_common_setting VALUES ('taskstatus','0'); INSERT INTO pre_common_setting VALUES ('tasktypes',''); INSERT INTO pre_common_setting VALUES ('threadmaxpages','1000'); INSERT INTO pre_common_setting VALUES ('threadsticky','全局置顶,分类置顶,本版置顶'); diff --git a/upload/portal.php b/upload/portal.php index 4e20ff6ef..a729ca40a 100644 --- a/upload/portal.php +++ b/upload/portal.php @@ -17,6 +17,10 @@ $cachelist = array('portalcategory', 'diytemplatenameportal'); $discuz->cachelist = $cachelist; $discuz->init(); +if(!$_G['setting']['portalstatus'] && $_GET['mod'] != 'portalcp'){ + showmessage('portal_status_off'); +} + require DISCUZ_ROOT.'./source/function/function_home.php'; require DISCUZ_ROOT.'./source/function/function_portal.php'; diff --git a/upload/search.php b/upload/search.php index 5188ec8eb..ebf76254f 100644 --- a/upload/search.php +++ b/upload/search.php @@ -32,6 +32,8 @@ if(in_array($discuz->var['mod'], $modarray) || !empty($_G['setting']['search'][$ } if(empty($mod)) { showmessage('search_closed'); +} else if (!$_G['setting'][($mod == 'user' ? 'friend' : $mod).'status']) { + showmessage(($mod == 'user' ? 'friend' : ($mod == 'group' ? 'group_module' : $mod)).'_status_off'); } define('CURMODULE', $mod); diff --git a/upload/source/admincp/admincp_magics.php b/upload/source/admincp/admincp_magics.php index 522e2448b..1d2ac2f6b 100644 --- a/upload/source/admincp/admincp_magics.php +++ b/upload/source/admincp/admincp_magics.php @@ -26,10 +26,9 @@ if($operation == 'admin') { /*search={"nav_magics":"action=magics"}*/ showtips('magics_tips'); - $settings = C::t('common_setting')->fetch_all(array('magicstatus', 'magicdiscount')); + $settings = C::t('common_setting')->fetch_all(array('magicdiscount')); showformheader('magics&operation=admin'); showtableheader(); - showsetting('magics_config_open', 'settingsnew[magicstatus]', $settings['magicstatus'], 'radio'); showsetting('magics_config_discount', 'settingsnew[magicdiscount]', $settings['magicdiscount'], 'text'); showtablefooter(); /*search*/ @@ -91,7 +90,7 @@ if($operation == 'admin') { } else { if(is_array($_GET['settingsnew'])) { - C::t('common_setting')->update_batch(array('magicstatus'=> $_GET['settingsnew']['magicstatus'], 'magicdiscount' => $_GET['settingsnew']['magicdiscount'])); + C::t('common_setting')->update_batch(array('magicdiscount' => $_GET['settingsnew']['magicdiscount'])); } if($ids = dimplode($_GET['delete'])) { diff --git a/upload/source/admincp/admincp_setting.php b/upload/source/admincp/admincp_setting.php index 10db4bb02..78d127870 100644 --- a/upload/source/admincp/admincp_setting.php +++ b/upload/source/admincp/admincp_setting.php @@ -1171,13 +1171,14 @@ EOF; /*search*/ } elseif($operation == 'functions') { - $allowfuntype = array('portal', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist'); + $allowfuntype = array('portal', 'forum', 'friend', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist', 'medal', 'task', 'magic', 'favorite'); $_GET['type'] = in_array($_GET['type'], $allowfuntype) ? trim($_GET['type']) : ''; echo ""; /*search={"setting_functions":"action=setting&operation=functions","setting_functions_curscript":"action=setting&operation=functions&anchor=curscript"}*/ showtableheader('setting_functions_curscript_list', 'nobottom', 'id="curscript"'.($_GET['anchor'] != 'curscript' ? ' style="display: none"' : '')); $modulehtml = array(); + $modulehtml[] = ''.$lang['setting_functions_curscript_forum'].''.$lang['setting_functions_curscript_forum_intro'].''.($setting['forumstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_portal'].''.$lang['setting_functions_curscript_portal_intro'].''.($setting['portalstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_group'].''.$lang['setting_functions_curscript_group_intro'].''.($setting['groupstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_follow'].''.$lang['setting_functions_curscript_follow_intro'].''.($setting['followstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; @@ -1185,11 +1186,16 @@ EOF; $modulehtml[] = ''.$lang['setting_functions_curscript_guide'].''.$lang['setting_functions_curscript_guide_intro'].''.($setting['guidestatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_feed'].''.$lang['setting_functions_curscript_feed_intro'].''.($setting['feedstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_blog'].''.$lang['setting_functions_curscript_blog_intro'].''.($setting['blogstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; + $modulehtml[] = ''.$lang['setting_functions_curscript_friend'].''.$lang['setting_functions_curscript_friend_intro'].''.($setting['friendstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_album'].''.$lang['setting_functions_curscript_album_intro'].''.($setting['albumstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_share'].''.$lang['setting_functions_curscript_share_intro'].''.($setting['sharestatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_doing'].''.$lang['setting_functions_curscript_doing_intro'].''.($setting['doingstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_message'].''.$lang['setting_functions_curscript_message_intro'].''.($setting['wallstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; $modulehtml[] = ''.$lang['setting_functions_curscript_ranklist'].''.$lang['setting_functions_curscript_ranklist_intro'].''.($setting['rankliststatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; + $modulehtml[] = ''.$lang['setting_functions_curscript_task'].''.$lang['setting_functions_curscript_task_intro'].''.($setting['taskstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; + $modulehtml[] = ''.$lang['setting_functions_curscript_medal'].''.$lang['setting_functions_curscript_medal_intro'].''.($setting['medalstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; + $modulehtml[] = ''.$lang['setting_functions_curscript_magic'].''.$lang['setting_functions_curscript_magic_intro'].''.($setting['magicstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; + $modulehtml[] = ''.$lang['setting_functions_curscript_favorite'].''.$lang['setting_functions_curscript_favorite_intro'].''.($setting['favoritestatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; echo ''.implode('', $modulehtml).''; showtablefooter(); /*search*/ @@ -2409,7 +2415,6 @@ EOT; /*search={"setting_ranklist":"action=setting&operation=ranklist"}*/ $setting['ranklist'] = dunserialize($setting['ranklist']); showtableheader('', 'nobottom', 'id="all"'); - showsetting('setting_ranklist_status', 'settingnew[ranklist][status]', $setting['ranklist']['status'], 'radio'); showsetting('setting_ranklist_index_cache_time', 'settingnew[ranklist][cache_time]', $setting['ranklist']['cache_time'], 'text'); showsetting('setting_ranklist_index_select', array('settingnew[ranklist][index_select]', array(array('all',cplang('dateline_all')), array('thismonth',cplang('thismonth')), array('thisweek',cplang('thisweek')), array('today',cplang('today')))), $setting['ranklist']['index_select'], 'select'); showsetting('setting_ranklist_ignorefid', 'settingnew[ranklist][ignorefid]', $setting['ranklist']['ignorefid'], 'text'); diff --git a/upload/source/admincp/admincp_tasks.php b/upload/source/admincp/admincp_tasks.php index 4564efd68..fe2fe3e6d 100644 --- a/upload/source/admincp/admincp_tasks.php +++ b/upload/source/admincp/admincp_tasks.php @@ -36,9 +36,6 @@ if(!($operation)) { array('nav_task_type', 'tasks&operation=type', 0) )); showformheader('tasks'); - showtableheader(); - showsetting('tasks_on', 'taskonnew', $_G['setting']['taskon'], 'radio'); - showtablefooter(); showtableheader('tasks_list', 'fixpadding'); showsubtitle(array('display_order', 'available', 'name', 'tasks_reward', 'time', '')); @@ -111,10 +108,6 @@ if(!($operation)) { } } - if($_GET['taskonnew'] != $_G['setting']['taskon']) { - C::t('common_setting')->update('taskon', $_GET['taskonnew']); - } - updatecache('setting'); if($checksettingsok) { diff --git a/upload/source/class/helper/helper_access.php b/upload/source/class/helper/helper_access.php index a56c7fe4d..431117499 100644 --- a/upload/source/class/helper/helper_access.php +++ b/upload/source/class/helper/helper_access.php @@ -14,7 +14,7 @@ class helper_access { public static function check_module($module) { $status = 0; - $allowfuntype = array('portal', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist'); + $allowfuntype = array('portal', 'forum', 'friend', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist', 'medal', 'task', 'magic', 'favorite'); $module = in_array($module, $allowfuntype) ? trim($module) : ''; if(!empty($module)) { $status = getglobal('setting/'.$module.'status'); diff --git a/upload/source/function/cache/cache_setting.php b/upload/source/function/cache/cache_setting.php index 949e70de1..0f61edfcd 100644 --- a/upload/source/function/cache/cache_setting.php +++ b/upload/source/function/cache/cache_setting.php @@ -321,7 +321,6 @@ function build_cache_setting() { } $data['tradeopen'] = C::t('common_usergroup_field')->count_by_field('allowposttrade', 1) ? 1 : 0; - $data['medalstatus'] = intval(C::t('forum_medal')->count_by_available()); $focus = array(); if($data['focus']['data']) { diff --git a/upload/source/function/function_space.php b/upload/source/function/function_space.php index 4115ea46a..ab3f20d54 100644 --- a/upload/source/function/function_space.php +++ b/upload/source/function/function_space.php @@ -128,21 +128,27 @@ function getblockhtml($blockname,$parameters = array()) { $html .= ''; } } else { - require_once libfile('function/friend'); - $isfriend = friend_check($uid); - $follow = C::t('home_follow')->fetch_by_uid_followuid($_G['uid'], $uid); - if($follow) { - $html .= "
  • ".lang('space', 'follow_cancle_follow')."
    • "; - } else { - $html .= "
  • ".lang('space', 'follow_follow_ta')."
    • "; + if(helper_access::check_module('follow')) { + $follow = C::t('home_follow')->fetch_by_uid_followuid($_G['uid'], $uid); + if($follow) { + $html .= "
  • ".lang('space', 'follow_cancle_follow')."
    • "; + } else { + $html .= "
  • ".lang('space', 'follow_follow_ta')."
    • "; + } } - if (!$isfriend) { - $html .= "
  • ".lang('space', 'block_profile_friend_add')."
    • "; - } else { - $html .= "
  • ".lang('space', 'block_profile_friend_ignore')."
    • "; + if(helper_access::check_module('friend')) { + require_once libfile('function/friend'); + $isfriend = friend_check($uid); + if (!$isfriend) { + $html .= "
  • ".lang('space', 'block_profile_friend_add')."
    • "; + } else { + $html .= "
  • ".lang('space', 'block_profile_friend_ignore')."
    • "; + } + $html .= "
  • ".lang('space', 'block_profile_poke')."
    • "; + } + if(helper_access::check_module('wall')) { + $html .= "
  • ".lang('space', 'block_profile_wall_to_me')."
    • "; } - $html .= "
  • ".lang('space', 'block_profile_wall_to_me')."
    • "; - $html .= "
  • ".lang('space', 'block_profile_poke')."
    • "; $html .= "
  • ".lang('space', 'block_profile_sendmessage')."
    • "; } @@ -156,7 +162,11 @@ function getblockhtml($blockname,$parameters = array()) { $managehtml .= '
  • '.lang('home/template', 'member_manage').'
    • '; } if($_G['adminid'] == 1) { - $managehtml .= "
  • ".lang('home/template', 'content_manage')."
    • "; + if(helper_access::check_module('forum')) { + $managehtml .= "
  • ".lang('home/template', 'content_manage')."
    • "; + } else { + $managehtml .= "
  • ".lang('home/template', 'content_manage')."
    • "; + } } if(!empty($managehtml)) { $html .= '
    '; if($_G['adminid'] == 1) { $html .= ''; } } diff --git a/upload/source/include/misc/misc_ajax.php b/upload/source/include/misc/misc_ajax.php index 008a24f38..93f06d3ac 100644 --- a/upload/source/include/misc/misc_ajax.php +++ b/upload/source/include/misc/misc_ajax.php @@ -17,6 +17,15 @@ if($op == 'comment') { $cid = empty($_GET['cid'])?0:intval($_GET['cid']); + $idtype_array = array('picid' => 'album', 'blogid' => 'blog', 'sid' => 'share', 'uid' => 'wall'); + + $cmt = C::t('home_comment')->fetch($cid); + if(empty($cmt['idtype']) || !array_key_exists($cmt['idtype'], $idtype_array)) { + showmessage('no_privilege_comment', '', array(), array('return' => true)); + } else if(!$_G['setting'][$idtype_array[$cmt['idtype']].'status']) { + showmessage($idtype_array[$cmt['idtype']].'_status_off'); + } + if($cid) { $ajax_edit = 1; } else { @@ -31,6 +40,10 @@ if($op == 'comment') { } elseif($op == 'getfriendgroup') { + if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); + } + $uid = intval($_GET['uid']); if($_G['uid'] && $uid) { $space = getuserbyuid($_G['uid']); @@ -46,6 +59,10 @@ if($op == 'comment') { } elseif($op == 'getfriendname') { + if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); + } + $groupname = ''; $group = intval($_GET['group']); @@ -57,6 +74,10 @@ if($op == 'comment') { } elseif($op == 'share') { + if (!$_G['setting']['sharestatus']) { + showmessage('share_status_off'); + } + require_once libfile('function/share'); $list = array(); @@ -68,6 +89,10 @@ if($op == 'comment') { } elseif($op == 'album') { + if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); + } + $id = empty($_GET['id'])?0:intval($_GET['id']); $perpage = 10; @@ -94,6 +119,10 @@ if($op == 'comment') { } elseif($op == 'docomment') { + if (!$_G['setting']['doingstatus']) { + showmessage('doing_status_off'); + } + $doid = intval($_GET['doid']); $clist = $do = array(); $icon = $_GET['icon'] == 'plus' ? 'minus' : 'plus'; @@ -227,6 +256,9 @@ if($op == 'comment') { include_once libfile('function/profile'); $html = showdistrict($values, $elems, $container, $showlevel, $containertype); } elseif($_GET['op'] == 'createalbum') { + if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); + } $albumname = 'new:'.$_GET['name']; require_once libfile('function/spacecp'); $albumid = album_creat_by_id($albumname, intval($_GET['catid'])); diff --git a/upload/source/include/misc/misc_category.php b/upload/source/include/misc/misc_category.php index fa2a2341e..f3816af84 100644 --- a/upload/source/include/misc/misc_category.php +++ b/upload/source/include/misc/misc_category.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $_G['mnid'] = 'mn_F'.$gid; $gquery = C::t('forum_forum')->fetch_all_info_by_fids($gid); $query = C::t('forum_forum')->fetch_all_info_by_fids(0, 1, 0, $gid, 1, 0, 0, 'forum'); diff --git a/upload/source/include/misc/misc_forumselect.php b/upload/source/include/misc/misc_forumselect.php index dd243859a..84ab5e437 100644 --- a/upload/source/include/misc/misc_forumselect.php +++ b/upload/source/include/misc/misc_forumselect.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + if(!isset($_G['cache']['forums'])) { loadcache('forums'); } diff --git a/upload/source/include/misc/misc_inputpwd.php b/upload/source/include/misc/misc_inputpwd.php index a3c574bd8..680534e88 100644 --- a/upload/source/include/misc/misc_inputpwd.php +++ b/upload/source/include/misc/misc_inputpwd.php @@ -18,10 +18,16 @@ if(submitcheck('pwdsubmit')) { $itemarr = array(); if($blogid) { + if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); + } $itemarr = C::t('home_blog')->fetch($blogid); $itemurl = "home.php?mod=space&uid=$itemarr[uid]&do=blog&id=$itemarr[blogid]"; $cookiename = 'view_pwd_blog_'.$blogid; } elseif($albumid) { + if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); + } $itemarr = C::t('home_album')->fetch($albumid); $itemurl = "home.php?mod=space&uid=$itemarr[uid]&do=album&id=$itemarr[albumid]"; $cookiename = 'view_pwd_album_'.$albumid; diff --git a/upload/source/include/misc/misc_ranklist_member.php b/upload/source/include/misc/misc_ranklist_member.php index bd464159a..fc5f047e5 100644 --- a/upload/source/include/misc/misc_ranklist_member.php +++ b/upload/source/include/misc/misc_ranklist_member.php @@ -60,7 +60,7 @@ if ($_GET['view'] == 'credit') { $orderby = $_GET['orderby']; $list = getranklistdata($type, $view, $orderby); -} elseif ($_GET['view'] == 'friendnum') { +} elseif ($_GET['view'] == 'friendnum' && helper_access::check_module('friend')) { $gettype = 'friend'; if($_G['uid']) { @@ -104,7 +104,7 @@ if ($_GET['view'] == 'credit') { $orderby = $_GET['orderby']; $list = getranklistdata($type, $view, $orderby); -} elseif($_GET['view'] == 'blog') { +} elseif($_GET['view'] == 'blog' && helper_access::check_module('blog')) { $gettype = 'blog'; $now_pos = -1; @@ -128,7 +128,7 @@ if ($_GET['view'] == 'credit') { $orderby = $_GET['orderby']; $list = getranklistdata($type, $view, $orderby); -} elseif($_GET['view'] == 'post') { +} elseif($_GET['view'] == 'post' && helper_access::check_module('forum')) { $gettype = 'post'; $postsrank_change = 1; @@ -149,7 +149,7 @@ if ($_GET['view'] == 'credit') { $orderby = $_GET['orderby']; $list = getranklistdata($type, $view, $orderby); -} elseif($_GET['view'] == 'onlinetime') { +} elseif($_GET['view'] == 'onlinetime' && !$_G['setting']['sessionclose']) { $gettype = 'onlinetime'; $onlinetimerank_change = 1; diff --git a/upload/source/include/modcp/modcp_moderate.php b/upload/source/include/modcp/modcp_moderate.php index bf39c2f62..7dfdb71e3 100644 --- a/upload/source/include/modcp/modcp_moderate.php +++ b/upload/source/include/modcp/modcp_moderate.php @@ -11,6 +11,9 @@ if(!defined('IN_DISCUZ') || !defined('IN_MODCP')) { exit('Access Denied'); } +if(!$_G['setting']['forumstatus'] && $op != 'members') { + showmessage('forum_status_off'); +} $modact = empty($_GET['modact']) || !in_array($_GET['modact'] , array('delete', 'ignore', 'validate')) ? 'ignore' : $_GET['modact']; diff --git a/upload/source/include/space/space_activity.php b/upload/source/include/space/space_activity.php index 874f013d9..f14af1b02 100644 --- a/upload/source/include/space/space_activity.php +++ b/upload/source/include/space/space_activity.php @@ -11,14 +11,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); $opactives['activity'] = 'class="a"'; -if(empty($_GET['view'])) $_GET['view'] = 'we'; -$_GET['order'] = empty($_GET['order']) ? 'dateline' : $_GET['order']; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $perpage = 20; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/space/space_album.php b/upload/source/include/space/space_album.php index 45ca87cb8..60c2d0927 100644 --- a/upload/source/include/space/space_album.php +++ b/upload/source/include/space/space_album.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:intval($_G['setting']['feedhotmin']); $id = empty($_GET['id'])?0:intval($_GET['id']); $picid = empty($_GET['picid'])?0:intval($_GET['picid']); @@ -286,9 +290,8 @@ if($id) { $pricount = 0; $picmode = 0; - if(empty($_GET['view'])) { - $_GET['view'] = 'we'; - } + $_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; + $_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $gets = array( 'mod' => 'space', diff --git a/upload/source/include/space/space_blog.php b/upload/source/include/space/space_blog.php index a8db894c9..8db6fd62f 100644 --- a/upload/source/include/space/space_blog.php +++ b/upload/source/include/space/space_blog.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; @@ -182,7 +186,8 @@ if($id) { loadcache('blogcategory'); $category = $_G['cache']['blogcategory']; - if(empty($_GET['view'])) $_GET['view'] = 'we'; + $_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; + $_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $perpage = 10; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/space/space_debate.php b/upload/source/include/space/space_debate.php index 61d971a4f..e397c45b3 100644 --- a/upload/source/include/space/space_debate.php +++ b/upload/source/include/space/space_debate.php @@ -11,14 +11,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); $opactives['debate'] = 'class="a"'; -if(empty($_GET['view'])) $_GET['view'] = 'we'; -$_GET['order'] = empty($_GET['order']) ? 'dateline' : $_GET['order']; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $perpage = 20; $perpage = mob_perpage($perpage); $start = ($page-1)*$perpage; diff --git a/upload/source/include/space/space_doing.php b/upload/source/include/space/space_doing.php index f37910b3e..2b5fa38ee 100644 --- a/upload/source/include/space/space_doing.php +++ b/upload/source/include/space/space_doing.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['doingstatus']) { + showmessage('doing_status_off'); +} + $perpage = 20; $perpage = mob_perpage($perpage); @@ -23,9 +27,7 @@ ckstart($start, $perpage); $dolist = array(); $count = 0; -if(empty($_GET['view'])) { - $_GET['view'] = 'we'; -} +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; $gets = array( 'mod' => 'space', diff --git a/upload/source/include/space/space_favorite.php b/upload/source/include/space/space_favorite.php index 42c119cc2..452f5ad6d 100644 --- a/upload/source/include/space/space_favorite.php +++ b/upload/source/include/space/space_favorite.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['favoritestatus']) { + showmessage('favorite_status_off'); +} + $space = getuserbyuid($_G['uid']); $page = empty($_GET['page'])?1:intval($_GET['page']); diff --git a/upload/source/include/space/space_friend.php b/upload/source/include/space/space_friend.php index bb190970d..fdc7ce5e2 100644 --- a/upload/source/include/space/space_friend.php +++ b/upload/source/include/space/space_friend.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); +} + $perpage = 24; $perpage = mob_perpage($perpage); @@ -20,7 +24,8 @@ $page = empty($_GET['page'])?0:intval($_GET['page']); if($page<1) $page = 1; $start = ($page-1)*$perpage; -if(empty($_GET['view']) || $_GET['view'] == 'all') $_GET['view'] = 'me'; +$_GET['view'] = in_array($_GET['view'], array('online', 'visitor', 'trace', 'blacklist', 'me')) ? $_GET['view'] : 'me'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; ckstart($start, $perpage); diff --git a/upload/source/include/space/space_home.php b/upload/source/include/space/space_home.php index 3500d039b..711a1dc9d 100644 --- a/upload/source/include/space/space_home.php +++ b/upload/source/include/space/space_home.php @@ -37,9 +37,8 @@ if(empty($_GET['view'])) { } elseif(!in_array($_GET['view'], array('we', 'me', 'all', 'app'))) { $_GET['view'] = 'all'; } -if(empty($_GET['order'])) { - $_GET['order'] = 'dateline'; -} + +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $perpage = $_G['setting']['feedmaxnum']<20?20:$_G['setting']['feedmaxnum']; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/space/space_poll.php b/upload/source/include/space/space_poll.php index c1f7989a5..507cc70d8 100644 --- a/upload/source/include/space/space_poll.php +++ b/upload/source/include/space/space_poll.php @@ -11,14 +11,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); -$_GET['order'] = in_array($_GET['order'], array('dateline', 'hot')) ? $_GET['order'] : 'dateline'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $opactives['poll'] = 'class="a"'; -if(empty($_GET['view'])) $_GET['view'] = 'we'; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; $perpage = 20; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/space/space_reward.php b/upload/source/include/space/space_reward.php index 504504d1c..b652cd005 100644 --- a/upload/source/include/space/space_reward.php +++ b/upload/source/include/space/space_reward.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; diff --git a/upload/source/include/space/space_share.php b/upload/source/include/space/space_share.php index abf310821..b0e0dfbaf 100644 --- a/upload/source/include/space/space_share.php +++ b/upload/source/include/space/space_share.php @@ -11,10 +11,15 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['sharestatus']) { + showmessage('share_status_off'); +} + $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); $_GET['type'] = in_array($_GET['type'], array('all', 'link', 'video', 'music', 'flash', 'blog', 'album', 'pic', 'poll', 'space', 'thread', 'article'))? $_GET['type'] : 'all'; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; if($id) { if(!IS_ROBOT) { diff --git a/upload/source/include/space/space_thread.php b/upload/source/include/space/space_thread.php index fb6a043fb..17493227d 100644 --- a/upload/source/include/space/space_thread.php +++ b/upload/source/include/space/space_thread.php @@ -11,14 +11,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); $opactives['thread'] = 'class="a"'; -if(empty($_GET['view'])) $_GET['view'] = 'me'; -$_GET['order'] = empty($_GET['order']) ? 'dateline' : $_GET['order']; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'all')) ? $_GET['view'] : 'we'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $allowviewuserthread = $_G['setting']['allowviewuserthread']; @@ -265,6 +269,10 @@ if($_GET['view'] == 'me') { } else { + if(!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); + } + space_merge($space, 'field_home'); if($space['feedfriend']) { diff --git a/upload/source/include/space/space_trade.php b/upload/source/include/space/space_trade.php index ea30baeed..36903ebb1 100644 --- a/upload/source/include/space/space_trade.php +++ b/upload/source/include/space/space_trade.php @@ -11,13 +11,18 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + $minhot = $_G['setting']['feedhotmin']<1?3:$_G['setting']['feedhotmin']; $page = empty($_GET['page'])?1:intval($_GET['page']); if($page<1) $page=1; $id = empty($_GET['id'])?0:intval($_GET['id']); $opactives['trade'] = 'class="a"'; -if(empty($_GET['view'])) $_GET['view'] = 'we'; +$_GET['view'] = in_array($_GET['view'], array('we', 'me', 'tradelog', 'eccredit', 'onlyuser')) ? $_GET['view'] : 'we'; +$_GET['order'] = in_array($_GET['order'], array('hot', 'dateline')) ? $_GET['order'] : 'dateline'; $perpage = 20; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/space/space_wall.php b/upload/source/include/space/space_wall.php index 31314143b..4a2c69a29 100644 --- a/upload/source/include/space/space_wall.php +++ b/upload/source/include/space/space_wall.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['wallstatus']) { + showmessage('wall_status_off'); +} + $perpage = 20; $perpage = mob_perpage($perpage); diff --git a/upload/source/include/spacecp/spacecp_album.php b/upload/source/include/spacecp/spacecp_album.php index ff5b1d056..8a11e451a 100644 --- a/upload/source/include/spacecp/spacecp_album.php +++ b/upload/source/include/spacecp/spacecp_album.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); +} + $albumid = empty($_GET['albumid'])?0:intval($_GET['albumid']); $picid = empty($_GET['picid'])?0:intval($_GET['picid']); diff --git a/upload/source/include/spacecp/spacecp_blog.php b/upload/source/include/spacecp/spacecp_blog.php index 20374477f..a72e88ec2 100644 --- a/upload/source/include/spacecp/spacecp_blog.php +++ b/upload/source/include/spacecp/spacecp_blog.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); +} + $blogid = empty($_GET['blogid'])?0:intval($_GET['blogid']); $op = empty($_GET['op'])?'':$_GET['op']; diff --git a/upload/source/include/spacecp/spacecp_class.php b/upload/source/include/spacecp/spacecp_class.php index 59f36a26c..943989d80 100644 --- a/upload/source/include/spacecp/spacecp_class.php +++ b/upload/source/include/spacecp/spacecp_class.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); +} + $classid = empty($_GET['classid'])?0:intval($_GET['classid']); $op = empty($_GET['op'])?'':$_GET['op']; diff --git a/upload/source/include/spacecp/spacecp_click.php b/upload/source/include/spacecp/spacecp_click.php index c732d3981..054a935b4 100644 --- a/upload/source/include/spacecp/spacecp_click.php +++ b/upload/source/include/spacecp/spacecp_click.php @@ -25,6 +25,9 @@ if(empty($click)) { switch ($idtype) { case 'picid': + if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); + } $item = C::t('home_pic')->fetch($id); if($item) { $picfield = C::t('home_picfield')->fetch($id); @@ -36,10 +39,16 @@ switch ($idtype) { $tablename = 'home_pic'; break; case 'aid': + if (!$_G['setting']['portalstatus']) { + showmessage('portal_status_off'); + } $item = C::t('portal_article_title')->fetch($id); $tablename = 'portal_article_title'; break; default: + if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); + } $idtype = 'blogid'; $item = array_merge( C::t('home_blog')->fetch($id), diff --git a/upload/source/include/spacecp/spacecp_comment.php b/upload/source/include/spacecp/spacecp_comment.php index 304eb9cb7..6ff3eb5ed 100644 --- a/upload/source/include/spacecp/spacecp_comment.php +++ b/upload/source/include/spacecp/spacecp_comment.php @@ -11,7 +11,7 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } - +$idtype_array = array('picid' => 'album', 'blogid' => 'blog', 'sid' => 'share', 'uid' => 'wall'); $tospace = $pic = $blog = $album = $share = $poll = array(); include_once libfile('class/bbcode'); @@ -40,6 +40,12 @@ if(submitcheck('commentsubmit', 0, $seccodecheck, $secqaacheck)) { $message = getstr($_POST['message'], 0, 0, 0, 2); $cid = empty($_POST['cid'])?0:intval($_POST['cid']); + if(!array_key_exists($idtype, $idtype_array)) { + showmessage('no_privilege_comment', '', array(), array('return' => true)); + } else if(!$_G['setting'][$idtype_array[$idtype].'status']) { + showmessage($idtype_array[$idtype].'_status_off'); + } + if(strlen($message) < 2) { showmessage('content_is_too_short', '', array(), array()); } @@ -56,6 +62,15 @@ if(submitcheck('commentsubmit', 0, $seccodecheck, $secqaacheck)) { $cid = empty($_GET['cid'])?0:intval($_GET['cid']); +$cmt = C::t('home_comment')->fetch($cid); +if(empty($cmt)) { + showmessage('comments_do_not_exist'); +} else if(empty($cmt['idtype']) || !array_key_exists($cmt['idtype'], $idtype_array)) { + showmessage('no_privilege_comment', '', array(), array('return' => true)); +} else if(!$_G['setting'][$idtype_array[$cmt['idtype']].'status']) { + showmessage($idtype_array[$cmt['idtype']].'_status_off'); +} + if($_GET['op'] == 'edit') { if($_G['adminid'] != 1 && $_GET['modcommentkey'] != modauthkey($_GET['cid'])) { $authorid = intval($_G['uid']); @@ -98,10 +113,7 @@ if($_GET['op'] == 'edit') { } elseif($_GET['op'] == 'reply') { - if(!$comment = C::t('home_comment')->fetch($cid)) { - showmessage('comments_do_not_exist'); - } - if($comment['idtype'] == 'uid' && ($seccodecheck || $secqaacheck)) { + if($cmt['idtype'] == 'uid' && ($seccodecheck || $secqaacheck)) { $seccodecheck = 0; $secqaacheck = 0; } diff --git a/upload/source/include/spacecp/spacecp_doing.php b/upload/source/include/spacecp/spacecp_doing.php index abaeef715..8d757a0b8 100644 --- a/upload/source/include/spacecp/spacecp_doing.php +++ b/upload/source/include/spacecp/spacecp_doing.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['doingstatus']) { + showmessage('doing_status_off'); +} + $doid = empty($_GET['doid'])?0:intval($_GET['doid']); $id = empty($_GET['id'])?0:intval($_GET['id']); if(helper_access::check_module('doing')) { diff --git a/upload/source/include/spacecp/spacecp_favorite.php b/upload/source/include/spacecp/spacecp_favorite.php index 42ee5c31e..5defc8583 100644 --- a/upload/source/include/spacecp/spacecp_favorite.php +++ b/upload/source/include/spacecp/spacecp_favorite.php @@ -10,6 +10,11 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } + +if (!$_G['setting']['favoritestatus']) { + showmessage('favorite_status_off'); +} + $_GET['type'] = in_array($_GET['type'], array("thread", "forum", "group", "blog", "album", "article", "all")) ? $_GET['type'] : 'all'; if($_GET['op'] == 'delete') { diff --git a/upload/source/include/spacecp/spacecp_feed.php b/upload/source/include/spacecp/spacecp_feed.php index 575f0afaf..c42ff31ff 100644 --- a/upload/source/include/spacecp/spacecp_feed.php +++ b/upload/source/include/spacecp/spacecp_feed.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['feedstatus']) { + showmessage('feed_status_off'); +} + $feedid = empty($_GET['feedid'])?0:intval($_GET['feedid']); $page = empty($_GET['page'])?0:intval($_GET['page']); if($page<1) $page=1; diff --git a/upload/source/include/spacecp/spacecp_follow.php b/upload/source/include/spacecp/spacecp_follow.php index 56c40df8d..76b4d5499 100644 --- a/upload/source/include/spacecp/spacecp_follow.php +++ b/upload/source/include/spacecp/spacecp_follow.php @@ -9,6 +9,11 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } + +if (!$_G['setting']['followstatus']) { + showmessage('follow_status_off'); +} + $ops = array('add', 'del', 'bkname', 'checkfeed', 'relay', 'getfeed', 'delete', 'newthread'); $op = in_array($_GET['op'], $ops) ? $_GET['op'] : ''; diff --git a/upload/source/include/spacecp/spacecp_friend.php b/upload/source/include/spacecp/spacecp_friend.php index 27ec06fc8..1ceb143e2 100644 --- a/upload/source/include/spacecp/spacecp_friend.php +++ b/upload/source/include/spacecp/spacecp_friend.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); +} + require_once libfile('function/friend'); $op = empty($_GET['op'])?'':$_GET['op']; diff --git a/upload/source/include/spacecp/spacecp_magic.php b/upload/source/include/spacecp/spacecp_magic.php index c4e094e55..b95bb8ab4 100644 --- a/upload/source/include/spacecp/spacecp_magic.php +++ b/upload/source/include/spacecp/spacecp_magic.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['magicstatus']) { + showmessage('magics_close'); +} + $space['credit'] = $space['credits']; $op = empty($_GET['op']) ? "view" : $_GET['op']; diff --git a/upload/source/include/spacecp/spacecp_poke.php b/upload/source/include/spacecp/spacecp_poke.php index b60456288..5f3b82700 100644 --- a/upload/source/include/spacecp/spacecp_poke.php +++ b/upload/source/include/spacecp/spacecp_poke.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); +} + $uid = empty($_GET['uid'])?0:intval($_GET['uid']); if($uid == $_G['uid']) { diff --git a/upload/source/include/spacecp/spacecp_search.php b/upload/source/include/spacecp/spacecp_search.php index 76e00a2dd..8ef98b10a 100644 --- a/upload/source/include/spacecp/spacecp_search.php +++ b/upload/source/include/spacecp/spacecp_search.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); +} + $myfields = array('uid','gender','birthyear','birthmonth','birthday','birthprovince','birthcity','resideprovince','residecity', 'residedist', 'residecommunity'); loadcache('profilesetting'); diff --git a/upload/source/include/spacecp/spacecp_share.php b/upload/source/include/spacecp/spacecp_share.php index 3382b8445..bb2b24aef 100644 --- a/upload/source/include/spacecp/spacecp_share.php +++ b/upload/source/include/spacecp/spacecp_share.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['sharestatus']) { + showmessage('share_status_off'); +} + $sid = intval($_GET['sid']); if($_GET['op'] == 'delete') { diff --git a/upload/source/include/spacecp/spacecp_top.php b/upload/source/include/spacecp/spacecp_top.php index 088124896..8be407b86 100644 --- a/upload/source/include/spacecp/spacecp_top.php +++ b/upload/source/include/spacecp/spacecp_top.php @@ -10,6 +10,11 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } + +if (!$_G['setting']['friendstatus']) { + showmessage('friend_status_off'); +} + $operation = in_array($_GET['op'], array('modify')) ? trim($_GET['op']) : ''; if($_G['setting']['creditstransextra'][6]) { $key = 'extcredits'.intval($_G['setting']['creditstransextra'][6]); diff --git a/upload/source/include/spacecp/spacecp_upload.php b/upload/source/include/spacecp/spacecp_upload.php index 913771919..081090d2a 100644 --- a/upload/source/include/spacecp/spacecp_upload.php +++ b/upload/source/include/spacecp/spacecp_upload.php @@ -11,7 +11,12 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['albumstatus']) { + showmessage('album_status_off'); +} + $albumid = empty($_GET['albumid'])?0:intval($_GET['albumid']); +$_GET['op'] = in_array($_GET['op'], array('recount', 'cam', 'flash', 'normal')) ? $_GET['op'] : 'normal'; if($_GET['op'] == 'recount') { $newsize = C::t('home_pic')->count_size_by_uid($_G['uid']); diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php index 75bf7ed43..0da46f471 100644 --- a/upload/source/language/lang_admincp.php +++ b/upload/source/language/lang_admincp.php @@ -1645,29 +1645,41 @@ $lang = array 'setting_functions_curscript_open' => '开启', 'setting_functions_curscript_close' => '关闭', 'setting_functions_curscript_portal' => '门户', + 'setting_functions_curscript_forum' => '论坛', 'setting_functions_curscript_group' => '群组', 'setting_functions_curscript_follow' => '广播', 'setting_functions_curscript_collection' => '淘帖', 'setting_functions_curscript_guide' => '导读', 'setting_functions_curscript_feed' => '动态', + 'setting_functions_curscript_friend' => '好友', 'setting_functions_curscript_blog' => '日志', 'setting_functions_curscript_album' => '相册', 'setting_functions_curscript_share' => '分享', 'setting_functions_curscript_doing' => '记录', 'setting_functions_curscript_message' => '留言板', 'setting_functions_curscript_ranklist' => '排行榜', + 'setting_functions_curscript_medal' => '勋章', + 'setting_functions_curscript_task' => '任务', + 'setting_functions_curscript_magic' => '道具', + 'setting_functions_curscript_favorite' => '收藏', 'setting_functions_curscript_portal_intro' => '通过门户，网站可以将最热门的帖子、文章、活动等信息展现给用户', + 'setting_functions_curscript_forum_intro' => '通过论坛，网站可以给用户提供在线讨论、交流、互动的平台', 'setting_functions_curscript_group_intro' => '志同道合者的聚集地，更加专业更加隐秘的交流乐园', 'setting_functions_curscript_follow_intro' => '收听感兴趣的人，分享有趣的事儿，信息快速传播的利器', 'setting_functions_curscript_collection_intro' => '网站优质内容的收集与分类，网站内容运营必不可少的好帮手', 'setting_functions_curscript_guide_intro' => '自动聚合网站最具争议、最热门、最精华、最新发布等“最”主题', 'setting_functions_curscript_feed_intro' => '了解网站关注好友网站动向的直接渠道，让用户不再感觉孤独', + 'setting_functions_curscript_friend_intro' => '结交感兴趣的人，了解感兴趣的事儿，情感快速蔓延的渠道', 'setting_functions_curscript_blog_intro' => '记录每日见闻，分享人生感悟，用户感情宣泄的家园', 'setting_functions_curscript_album_intro' => '自己的美丽容颜，祖国的大好河山，各种美图的影像档案', 'setting_functions_curscript_share_intro' => '将网站精华内容推荐给其他网友，形成良好的共享氛围', 'setting_functions_curscript_doing_intro' => '分享灵感，表达心情，记录随时想到的人和事儿', 'setting_functions_curscript_message_intro' => '通过留言，可以让其他用户不会错过你的互动', 'setting_functions_curscript_ranklist_intro' => '通过排行榜，可以查看本站的相关排行内容', + 'setting_functions_curscript_medal_intro' => '彰显用户在某一方面的特殊贡献，调动用户积极性', + 'setting_functions_curscript_task_intro' => '缩短用户适应时间，让用户快速融入站点', + 'setting_functions_curscript_magic_intro' => '提供丰富多彩的娱乐功能，提升站点交互性和活跃度', + 'setting_functions_curscript_favorite_intro' => '让用户记录喜爱的内容，增加用户留存和用户粘性', 'setting_functions_mod' => '管理相关', 'setting_functions_mod_updatestat' => '开启站点趋势统计', diff --git a/upload/source/language/lang_message.php b/upload/source/language/lang_message.php index 8830c7bfa..8c22ce671 100644 --- a/upload/source/language/lang_message.php +++ b/upload/source/language/lang_message.php @@ -19,6 +19,20 @@ $lang = array ( 'quickclear_noperm' => '您没有权限进行此操作', 'attachment_nonexistence' => '抱歉，该附件无法读取', 'attachment_forum_nopermission' => '抱歉，只有特定用户可以下载本站附件', + 'album_status_off' => '抱歉，相册功能尚未开启', + 'blog_status_off' => '抱歉，日志功能尚未开启', + 'collection_status_off' => '抱歉，淘帖功能尚未开启', + 'doing_status_off' => '抱歉，记录功能尚未开启', + 'feed_status_off' => '抱歉，动态功能尚未开启', + 'friend_status_off' => '抱歉，好友功能尚未开启', + 'forum_status_off' => '抱歉，论坛功能尚未开启', + 'follow_status_off' => '抱歉，广播功能尚未开启', + 'group_module_status_off' => '抱歉，群组功能尚未开启', + 'guide_status_off' => '抱歉，导读功能尚未开启', + 'medal_status_off' => '抱歉，勋章功能尚未开启', + 'share_status_off' => '抱歉，分享功能尚未开启', + 'wall_status_off' => '抱歉，留言板功能尚未开启', + 'favorite_status_off' => '抱歉，收藏功能尚未开启', 'forum_not_group' => '该版块不是{_G/setting/navs/3/navname}', 'forum_group_status_off' => '该{_G/setting/navs/3/navname}已关闭', 'forum_group_noallowed' => '抱歉，您没有权限访问该{_G/setting/navs/3/navname}', @@ -245,7 +259,9 @@ $lang = array ( 'magicuse_bad_object' => '尚未正确选择道具要作用的对象', 'magicuse_has_no_valid_friend' => '抱歉，此道具仅对您的好友有效', 'mobile_template_no_found' => '您访问的页面无手机页面，是否进一步访问电脑版？

    继续访问

    ', - + 'medals_existence' => '目前系统内有可用的勋章，请到“勋章中心”取消所有可用勋章后再进行此操作', + 'close_ggcf_before_close_forum' => '请先关闭群组、导读、淘帖、广播功能后再关闭论坛功能', + 'open_forum_before_open_ggcf' => '请先开启论坛功能后再开启群组、导读、淘帖、广播功能', 'portal_status_off' => '抱歉，门户功能尚未开启', 'no_privilege_my_app_status' => '对不起，当前站点已经关闭了用户多应用服务。', diff --git a/upload/source/language/lang_spacecp.php b/upload/source/language/lang_spacecp.php index 673c09eb2..4f912b07b 100644 --- a/upload/source/language/lang_spacecp.php +++ b/upload/source/language/lang_spacecp.php @@ -308,6 +308,8 @@ $lang = array( 'invite_you_to_visit' => '{user}邀请您访问{bbname}', 'portal' => '门户', + 'forum' => '论坛', + 'friend' => '好友', 'group' => '群组', 'follow' => '广播', 'collection' => '淘帖', @@ -318,6 +320,10 @@ $lang = array( 'wall' => '留言板', 'homepage' => '个人主页', 'ranklist' => '排行榜', + 'medal' => '勋章', + 'task' => '任务', + 'magic' => '道具', + 'favorite' => '收藏', 'select_the_navigation_position' => '选择{type}导航位置', 'close_module' => '关闭{type}功能', diff --git a/upload/source/module/forum/forum_ajax.php b/upload/source/module/forum/forum_ajax.php index 50f14fae3..ea4521b1c 100644 --- a/upload/source/module/forum/forum_ajax.php +++ b/upload/source/module/forum/forum_ajax.php @@ -12,6 +12,10 @@ if(!defined('IN_DISCUZ')) { } define('NOROBOT', TRUE); +if(!in_array($_GET['action'], array('checkusername', 'checkemail', 'checkinvitecode', 'checkuserexists', 'quickclear', 'setnav')) && !$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + if($_GET['action'] == 'checkusername') { @@ -640,7 +644,7 @@ EOF; if($_G['adminid'] != 1) { showmessage('quickclear_noperm'); } - $allowfuntype = array('portal', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist'); + $allowfuntype = array('portal', 'forum', 'friend', 'group', 'follow', 'collection', 'guide', 'feed', 'blog', 'doing', 'album', 'share', 'wall', 'homepage', 'ranklist', 'medal', 'task', 'magic', 'favorite'); $type = in_array($_GET['type'], $allowfuntype) ? trim($_GET['type']) : ''; $do = in_array($_GET['do'], array('open', 'close')) ? $_GET['do'] : 'close'; if(!submitcheck('funcsubmit')) { @@ -652,12 +656,30 @@ EOF; $funkey = $type.'status'; $funstatus = $do == 'open' ? 1 : 0; if($type != 'homepage') { - $identifier = array('portal' => 1, 'group' => 3, 'feed' => 4, 'ranklist' => 8, 'follow' => 9, 'guide' => 10, 'collection' => 11, 'blog' => 12, 'album' => 13, 'share' => 14, 'doing' => 15); + $identifier = array('portal' => 1, 'forum' => 2, 'group' => 3, 'feed' => 4, 'ranklist' => 8, 'follow' => 9, 'guide' => 10, 'collection' => 11, 'blog' => 12, 'album' => 13, 'share' => 14, 'doing' => 15, 'friend' => 26, 'favorite' => 27, 'medal' => 29, 'task' => 30, 'magic' => 31); $navdata = array('available' => -1); $navtype = $do == 'open' ? array() : array(0, 3); - if(in_array($type, array('blog', 'album', 'share', 'doing', 'follow'))) { + if(in_array($type, array('blog', 'album', 'share', 'doing', 'follow', 'friend', 'favorite', 'medal', 'task', 'magic'))) { $navtype[] = 2; } + if($do == 'close' && $type == 'medal') { + if(intval(C::t('forum_medal')->count_by_available()) > 0) { + showmessage('medals_existence', dreferer(), array(), array('showdialog' => true, 'locationtime' => true)); + exit; + } + } + if($do == 'close' && $type == 'forum') { + if($_G['setting']['groupstatus'] || $_G['setting']['guidestatus'] || $_G['setting']['collectionstatus'] || $_G['setting']['followstatus']) { + showmessage('close_ggcf_before_close_forum', dreferer(), array(), array('showdialog' => true, 'locationtime' => true)); + exit; + } + } + if($do == 'open' && in_array($type, array('group', 'guide', 'collection', 'follow'))) { + if(!$_G['setting']['forumstatus']) { + showmessage('open_forum_before_open_ggcf', dreferer(), array(), array('showdialog' => true, 'locationtime' => true)); + exit; + } + } if($do == 'open') { if($_GET['location']['header']) { $navtype[] = 0; @@ -685,7 +707,7 @@ EOF; include libfile('function/cache'); updatecache('setting'); } - showmessage('do_success', dreferer(), array(), array('header'=>true)); + showmessage('do_success', dreferer(), array(), array('showdialog' => true, 'locationtime' => true)); } exit; } elseif($_GET['action'] == 'checkpostrule') { diff --git a/upload/source/module/forum/forum_collection.php b/upload/source/module/forum/forum_collection.php index 398c16963..aa54fcaac 100644 --- a/upload/source/module/forum/forum_collection.php +++ b/upload/source/module/forum/forum_collection.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['collectionstatus']) { + showmessage('collection_status_off'); +} + require_once libfile('function/collection'); $tpp = $_G['setting']['topicperpage']; //per page diff --git a/upload/source/module/forum/forum_group.php b/upload/source/module/forum/forum_group.php index 3329fef1f..f73d2d78e 100644 --- a/upload/source/module/forum/forum_group.php +++ b/upload/source/module/forum/forum_group.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['groupstatus']) { + showmessage('group_module_status_off'); +} + require_once libfile('function/group'); $_G['action']['action'] = 3; $_G['action']['fid'] = $_G['fid']; diff --git a/upload/source/module/forum/forum_guide.php b/upload/source/module/forum/forum_guide.php index ac75f67b7..0d106aa74 100644 --- a/upload/source/module/forum/forum_guide.php +++ b/upload/source/module/forum/forum_guide.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['guidestatus']) { + showmessage('guide_status_off'); +} + $view = $_GET['view']; loadcache('forum_guide'); if(!in_array($view, array('hot', 'digest', 'new', 'my', 'newthread', 'sofa'))) { diff --git a/upload/source/module/forum/forum_misc.php b/upload/source/module/forum/forum_misc.php index bc3f1dc76..b75c9db61 100644 --- a/upload/source/module/forum/forum_misc.php +++ b/upload/source/module/forum/forum_misc.php @@ -12,6 +12,10 @@ if(!defined('IN_DISCUZ')) { } define('NOROBOT', TRUE); +if(!in_array($_GET['action'], array('paysucceed', 'showdarkroom')) && !$_G['setting']['forumstatus']) { + showmessage('forum_status_off'); +} + require_once libfile('function/post'); $feed = array(); diff --git a/upload/source/module/forum/forum_modcp.php b/upload/source/module/forum/forum_modcp.php index 312d23b8e..4103ba3e2 100644 --- a/upload/source/module/forum/forum_modcp.php +++ b/upload/source/module/forum/forum_modcp.php @@ -13,6 +13,12 @@ if(!defined('IN_DISCUZ')) { define('IN_MODCP', true); +if(!$_G['setting']['forumstatus'] && !in_array($_GET['action'], array('', 'home', 'moderate', 'ban', 'ipban', 'member', 'log', 'login', 'logout'))) { + showmessage('forum_status_off'); +} else if(!$_G['setting']['forumstatus']) { + unset($_G['fid'], $_GET['fid'], $_POST['fid']); +} + $cpscript = basename($_G['PHP_SELF']); if(!empty($_G['forum']) && $_G['forum']['status'] == 3) { showmessage('group_admin_enter_panel', 'forum.php?mod=group&action=manage&fid='.$_G['fid']); @@ -33,7 +39,7 @@ if($_GET['action'] == 'logout') { } $modforums = $modsession->get('modforums'); -$_GET['action'] = empty($_GET['action']) && $_G['fid'] ? 'thread' : $_GET['action']; +$_GET['action'] = empty($_GET['action']) ? (($_G['setting']['forumstatus'] && $_G['fid']) ? 'thread' : 'home') : $_GET['action']; $op = getgpc('op'); if($modforums === null) { $modforums = array('fids' => '', 'list' => array(), 'recyclebins' => array()); diff --git a/upload/source/module/home/home_follow.php b/upload/source/module/home/home_follow.php index 3d6ac5e61..2c1d5be87 100644 --- a/upload/source/module/home/home_follow.php +++ b/upload/source/module/home/home_follow.php @@ -10,6 +10,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['followstatus']) { + showmessage('follow_status_off'); +} + if(!$_G['uid']) { showmessage('login_before_enter_home', null, array(), array('showmsg' => true, 'login' => 1)); } diff --git a/upload/source/module/home/home_medal.php b/upload/source/module/home/home_medal.php index 8bfca071f..77bdf3c7b 100644 --- a/upload/source/module/home/home_medal.php +++ b/upload/source/module/home/home_medal.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['medalstatus']) { + showmessage('medal_status_off'); +} + loadcache('medals'); if(!$_G['uid'] && $_GET['action']) { diff --git a/upload/source/module/home/home_rss.php b/upload/source/module/home/home_rss.php index d6a6673de..dfe8e5e03 100644 --- a/upload/source/module/home/home_rss.php +++ b/upload/source/module/home/home_rss.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if (!$_G['setting']['blogstatus']) { + showmessage('blog_status_off'); +} + $pagenum = 20; $siteurl = getsiteurl(); diff --git a/upload/source/module/home/home_space.php b/upload/source/module/home/home_space.php index 05ee90f10..0fad91f17 100644 --- a/upload/source/module/home/home_space.php +++ b/upload/source/module/home/home_space.php @@ -15,7 +15,7 @@ $dos = array('index', 'doing', 'blog', 'album', 'friend', 'wall', 'notice', 'share', 'home', 'pm', 'videophoto', 'favorite', 'thread', 'trade', 'poll', 'activity', 'debate', 'reward', 'profile', 'plugin', 'follow'); -$do = (!empty($_GET['do']) && in_array($_GET['do'], $dos))?$_GET['do']:'index'; +$_GET['do'] = $do = (!empty($_GET['do']) && in_array($_GET['do'], $dos)) ? $_GET['do'] : 'index'; if(!in_array($do, array('home', 'doing', 'blog', 'album', 'share', 'wall'))) { $_G['mnid'] = 'mn_common'; diff --git a/upload/source/module/home/home_task.php b/upload/source/module/home/home_task.php index f4824f74b..682f63dab 100644 --- a/upload/source/module/home/home_task.php +++ b/upload/source/module/home/home_task.php @@ -15,7 +15,7 @@ $_G['disabledwidthauto'] = 0; require_once libfile('function/spacecp'); -if(!$_G['setting']['taskon'] && $_G['adminid'] != 1) { +if(!$_G['setting']['taskstatus']) { showmessage('task_close'); } diff --git a/upload/source/module/misc/misc_invite.php b/upload/source/module/misc/misc_invite.php index b8ebb9b5b..7762d0192 100644 --- a/upload/source/module/misc/misc_invite.php +++ b/upload/source/module/misc/misc_invite.php @@ -11,6 +11,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['friendstatus']) { + showmessage("friend_status_off"); +} + require_once libfile('function/friend'); $_GET['action'] = dhtmlspecialchars(preg_replace("/[^\[A-Za-z0-9_\]]/", '', $_GET['action'])); diff --git a/upload/source/module/misc/misc_ranklist.php b/upload/source/module/misc/misc_ranklist.php index 47a6aaaf7..18e85ef69 100644 --- a/upload/source/module/misc/misc_ranklist.php +++ b/upload/source/module/misc/misc_ranklist.php @@ -10,6 +10,10 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } +if(!$_G['setting']['rankliststatus']) { + showmessage('ranklist_status_off'); +} + $page = $_G['page']; $type = $_GET['type']; @@ -20,14 +24,13 @@ if(!in_array($type, array('index', 'member', 'thread', 'blog', 'poll', 'picture' } $ranklist_setting = $_G['setting']['ranklist']; -if(!$ranklist_setting['status']) { - showmessage('ranklist_status_off'); -} $navtitle = lang('core', 'title_ranklist_'.$type); +$allowtype = array('member' => 'ranklist', 'thread' => 'forum', 'blog' => 'blog', 'poll' => 'forum', 'picture' => 'album', 'activity' => 'forum', 'forum' => 'forum', 'group' => 'group'); + if($type != 'index') { - if(!$ranklist_setting[$type]['available']) { + if(!array_key_exists($type, $allowtype) || !$_G['setting'][$allowtype[$type].'status'] || !$ranklist_setting[$type]['available']) { showmessage('ranklist_this_status_off'); } } diff --git a/upload/source/module/portal/portal_portalcp.php b/upload/source/module/portal/portal_portalcp.php index c7be341aa..698d7f8ec 100644 --- a/upload/source/module/portal/portal_portalcp.php +++ b/upload/source/module/portal/portal_portalcp.php @@ -11,9 +11,13 @@ if(!defined('IN_DISCUZ')) { exit('Access Denied'); } -$_G['disabledwidthauto'] = 0; +$ac = in_array($_GET['ac'], array('comment', 'article', 'related', 'block', 'portalblock', 'blockdata', 'topic', 'diy', 'upload', 'category', 'plugin', 'logout')) ? $_GET['ac'] : 'index'; + +if (!$_G['setting']['portalstatus'] && !in_array($ac, array('index', 'block', 'blockdata', 'logout'))) { + showmessage('portal_status_off'); +} -$ac = in_array($_GET['ac'], array('comment', 'article', 'related', 'block', 'portalblock', 'blockdata', 'topic', 'diy', 'upload', 'category', 'plugin', 'logout'))?$_GET['ac']:'index'; +$_G['disabledwidthauto'] = 0; $admincp2 = getstatus($_G['member']['allowadmincp'], 2); $admincp3 = getstatus($_G['member']['allowadmincp'], 3); diff --git a/upload/template/default/common/header.htm b/upload/template/default/common/header.htm index ed34932bb..23a1bf0a3 100644 --- a/upload/template/default/common/header.htm +++ b/upload/template/default/common/header.htm @@ -84,9 +84,11 @@ diff --git a/upload/template/default/forum/modcp_moderate.htm b/upload/template/default/forum/modcp_moderate.htm index 7a02a2c7a..52c741e4a 100644 --- a/upload/template/default/forum/modcp_moderate.htm +++ b/upload/template/default/forum/modcp_moderate.htm @@ -43,7 +43,7 @@

    {lang mod_option_subject_mod}

      - + {lang mod_option_subject_modthreads} {lang mod_option_subject_modreplies} diff --git a/upload/template/default/forum/viewthread_activity.htm b/upload/template/default/forum/viewthread_activity.htm index 6779a489a..217001672 100644 --- a/upload/template/default/forum/viewthread_activity.htm +++ b/upload/template/default/forum/viewthread_activity.htm @@ -50,7 +50,7 @@ $allapplynum {lang activity_member_unit} | - {lang invite}   + {lang invite}   {lang manage}   {lang pm_archive} diff --git a/upload/template/default/forum/viewthread_album.htm b/upload/template/default/forum/viewthread_album.htm index 68d4331e9..8bbadf90c 100644 --- a/upload/template/default/forum/viewthread_album.htm +++ b/upload/template/default/forum/viewthread_album.htm @@ -44,7 +44,7 @@

      $_G[forum_thread][subject]

      -
      {lang home_view_num}: $_G[forum_thread][views] | {lang comment_num}: $_G[forum_thread][replies] | {lang thread_favorite} {$_G['forum_thread']['favtimes']} +
      {lang home_view_num}: $_G[forum_thread][views] | {lang comment_num}: $_G[forum_thread][replies] | {lang thread_favorite} {$_G['forum_thread']['favtimes']} |{lang post_add_aboutcounter}{lang edit}
      @@ -228,7 +228,7 @@ {lang thread_share}{lang thread_share}{$_G['forum_thread']['sharetimes']} - {lang thread_favorite}{lang thread_favorite}{$_G['forum_thread']['favtimes']} + {lang thread_favorite}{lang thread_favorite}{$_G['forum_thread']['favtimes']} $_G['setting']['recommendthread'][addtext]$_G['setting']['recommendthread'][addtext]$_G[forum_thread][recommend_add] @@ -240,7 +240,7 @@ {lang rate}{lang rate} - + {lang invite}{lang invite} diff --git a/upload/template/default/forum/viewthread_node.htm b/upload/template/default/forum/viewthread_node.htm index 68d18c264..e5da4e168 100644 --- a/upload/template/default/forum/viewthread_node.htm +++ b/upload/template/default/forum/viewthread_node.htm @@ -318,8 +318,9 @@ $postshowavatars = !($_G['setting']['bannedmessages'] & 2 && ($post['memberstatu
      - - {lang thread_favorite}{lang thread_favorite} + + {lang thread_favorite}{lang thread_favorite} + {lang rate}{lang rate} diff --git a/upload/template/default/forum/viewthread_portal.htm b/upload/template/default/forum/viewthread_portal.htm index 8674aee45..372fe2244 100644 --- a/upload/template/default/forum/viewthread_portal.htm +++ b/upload/template/default/forum/viewthread_portal.htm @@ -74,7 +74,9 @@ {lang thread_share}{lang thread_share}{$_G['forum_thread']['sharetimes']} - {lang thread_favorite}{lang thread_favorite}{$_G['forum_thread']['favtimes']} + + {lang thread_favorite}{lang thread_favorite}{$_G['forum_thread']['favtimes']} + $_G['setting']['recommendthread'][addtext]$_G['setting']['recommendthread'][addtext]$_G[forum_thread][recommend_add] @@ -86,7 +88,7 @@ {lang rate}{lang rate} - + {lang invite}{lang invite} diff --git a/upload/template/default/group/group.htm b/upload/template/default/group/group.htm index 0ed9762c1..e655ccd98 100644 --- a/upload/template/default/group/group.htm +++ b/upload/template/default/group/group.htm @@ -26,7 +26,7 @@
      $_G['forum']['description']
      - {lang favorite}|RSS|{lang my_buddylist_invite} + {lang favorite}|RSS|{lang my_buddylist_invite} | {lang credits}: $_G[forum][commoncredits]|{lang group_moderator_title}: , $manage[username]
      @@ -69,7 +69,7 @@
      $_G[forum][name]
      $_G[forum][description]
      - {lang favorite}|RSS|{lang my_buddylist_invite} + {lang favorite}|RSS|{lang my_buddylist_invite} {lang credits}: $_G[forum][commoncredits]|{lang group_moderator_title}: , $manage[username]
      diff --git a/upload/template/default/home/space_album_view.htm b/upload/template/default/home/space_album_view.htm index b1f127521..9156f199c 100644 --- a/upload/template/default/home/space_album_view.htm +++ b/upload/template/default/home/space_album_view.htm @@ -1,5 +1,5 @@ - - + + @@ -35,7 +35,7 @@
      - {lang favorite} + {lang favorite} {lang share}
      @@ -149,9 +149,9 @@
      - - - - - + + + + + \ No newline at end of file diff --git a/upload/template/default/home/space_blog_view.htm b/upload/template/default/home/space_blog_view.htm index 0cb2f74fc..bc0e36f13 100644 --- a/upload/template/default/home/space_blog_view.htm +++ b/upload/template/default/home/space_blog_view.htm @@ -91,9 +91,9 @@
      - {lang favorite} + {lang favorite} {lang share} - {lang invite} + {lang invite} {lang use_magic_tools} | diff --git a/upload/template/default/home/space_card.htm b/upload/template/default/home/space_card.htm index e375006aa..60f79478f 100644 --- a/upload/template/default/home/space_card.htm +++ b/upload/template/default/home/space_card.htm @@ -71,14 +71,16 @@ {lang follow_del}{lang follow_add}TA + {lang add_friend} {lang ignore_friend} - {lang send_pm} {lang say_hi} + + {lang send_pm} {lang connect_me} @@ -105,7 +107,7 @@ {lang user_ban} - {lang manage_post} + href="forum.php?mod=modcp&action=thread&op=post&do=search&searchsubmit=1&users=$encodeusername" target="_blank" class="xi1">{lang manage_post}
      diff --git a/upload/template/default/home/space_favorite.htm b/upload/template/default/home/space_favorite.htm index 4d9d4494a..98142384c 100644 --- a/upload/template/default/home/space_favorite.htm +++ b/upload/template/default/home/space_favorite.htm @@ -74,8 +74,8 @@

      {lang favorite}

        {lang favorite_all} - {lang favorite_thread} - {lang favorite_forum} + {lang favorite_thread} + {lang favorite_forum} {lang favorite_group} {lang favorite_blog} {lang favorite_album} diff --git a/upload/template/default/home/space_header_personalnv.htm b/upload/template/default/home/space_header_personalnv.htm index e1cc2f6f0..6e33ad373 100644 --- a/upload/template/default/home/space_header_personalnv.htm +++ b/upload/template/default/home/space_header_personalnv.htm @@ -27,7 +27,7 @@
      • $personalnv['items']['follow']{lang follow}
        • - +
      • $personalnv['items']['topic']{lang topic}
        • diff --git a/upload/template/default/home/space_menu.htm b/upload/template/default/home/space_menu.htm index 44acd250b..0cccd763e 100644 --- a/upload/template/default/home/space_menu.htm +++ b/upload/template/default/home/space_menu.htm @@ -14,6 +14,7 @@ +
      • {lang add_friend} @@ -21,6 +22,7 @@ {lang ignore_friend}
        • +
      • {lang send_pm}
        • @@ -65,7 +67,7 @@ - {lang content_manage} + href="forum.php?mod=modcp&action=thread&op=post&do=search&searchsubmit=1&users=$encodeusername" id="umanageli" onmouseover="showMenu(this.id)" class="showmenu">{lang content_manage}