diff --git a/upload/ajax/group_membership.php b/upload/ajax/group_membership.php index 76ac136ae..78b9c3071 100644 --- a/upload/ajax/group_membership.php +++ b/upload/ajax/group_membership.php @@ -30,7 +30,7 @@ switch ($mode) { $class = ($row['user_pending']) ? 'med' : 'med bold'; $class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : ''; - $href = "groupcp.php?g={$row['group_id']}"; + $href = "group.php?g={$row['group_id']}"; if (IS_ADMIN) { diff --git a/upload/ajax/index_data.php b/upload/ajax/index_data.php index 0d9ebc0af..47447c854 100644 --- a/upload/ajax/index_data.php +++ b/upload/ajax/index_data.php @@ -65,7 +65,7 @@ switch($mode) { foreach ($mod['mod_groups'][$forum_id] as $group_id) { - $moderators[] = ''. $mod['name_groups'][$group_id] .''; + $moderators[] = ''. $mod['name_groups'][$group_id] .''; } } diff --git a/upload/config.php b/upload/config.php index cacbe6c57..9d3ebe496 100644 --- a/upload/config.php +++ b/upload/config.php @@ -48,7 +48,7 @@ * PM * Actions log * Users - * GroupCP + * Groups * Tidy * Ads @@ -356,7 +356,7 @@ $bb_cfg['board_email_sitename'] = $domain_name; // sitename used in all email $bb_cfg['topic_notify_enabled'] = true; $bb_cfg['pm_notify_enabled'] = true; -$bb_cfg['groupcp_send_email'] = true; +$bb_cfg['group_send_email'] = true; $bb_cfg['email_change_disabled'] = false; // disable changing email by user $bb_cfg['tech_admin_email'] = 'admin@' . $domain_name; // email for sending error reports @@ -502,8 +502,8 @@ $bb_cfg['color_nick'] = true; // Окраска ников $bb_cfg['user_not_activated_days_keep'] = 7; // "not activated" == "not finished registration" $bb_cfg['user_not_active_days_keep'] = 180; // inactive users but only with no posts -// GroupCP -$bb_cfg['groupcp_members_per_page'] = 50; +// Groups +$bb_cfg['group_members_per_page'] = 50; // Tidy $bb_cfg['tidy_post'] = (!extension_loaded('tidy')) ? false : true; diff --git a/upload/groupcp.php b/upload/group.php similarity index 96% rename from upload/groupcp.php rename to upload/group.php index 6de2c8be1..c8b436f2a 100644 --- a/upload/groupcp.php +++ b/upload/group.php @@ -1,7 +1,7 @@ assign_vars(array( 'SELECT_GROUP' => true, 'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'], - 'S_USERGROUP_ACTION' => 'groupcp.php', + 'S_USERGROUP_ACTION' => 'group.php', 'S_HIDDEN_FIELDS' => $s_hidden_fields, )); } @@ -218,7 +218,7 @@ else if (@$_POST['joingroup']) add_user_into_group($group_id, $userdata['user_id'], 1, TIMENOW); - if ($bb_cfg['groupcp_send_email']) + if ($bb_cfg['group_send_email']) { require(INC_DIR .'emailer.class.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); @@ -232,7 +232,7 @@ else if (@$_POST['joingroup']) 'USER' => $userdata['username'], 'SITENAME' => $bb_cfg['sitename'], 'GROUP_MODERATOR' => $moderator['username'], - 'U_GROUPCP' => make_url(GROUP_URL . $group_id), + 'U_GROUP' => make_url(GROUP_URL . $group_id), )); $emailer->send(); @@ -270,7 +270,7 @@ else add_user_into_group($group_id, $row['user_id']); - if ($bb_cfg['groupcp_send_email']) + if ($bb_cfg['group_send_email']) { require(INC_DIR .'emailer.class.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); @@ -283,7 +283,7 @@ else $emailer->assign_vars(array( 'SITENAME' => $bb_cfg['sitename'], 'GROUP_NAME' => $group_info['group_name'], - 'U_GROUPCP' => make_url(GROUP_URL . $group_id), + 'U_GROUP' => make_url(GROUP_URL . $group_id), )); $emailer->send(); @@ -331,7 +331,7 @@ else } } // Email users when they are approved - if (!empty($_POST['approve']) && $bb_cfg['groupcp_send_email']) + if (!empty($_POST['approve']) && $bb_cfg['group_send_email']) { $sql_select = "SELECT username, user_email, user_lang FROM ". BB_USERS ." @@ -356,7 +356,7 @@ else $emailer->assign_vars(array( 'SITENAME' => $bb_cfg['sitename'], 'GROUP_NAME' => $group_info['group_name'], - 'U_GROUPCP' => make_url(GROUP_URL . $group_id), + 'U_GROUP' => make_url(GROUP_URL . $group_id), )); $emailer->send(); @@ -477,9 +477,9 @@ else 'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : $lang['NONE'], 'U_SEARCH_USER' => "search.php?mode=searchuser", 'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id", - 'U_GROUP_RELEASES' => "groupcp.php?view=releases&". POST_GROUPS_URL ."=$group_id", - 'U_GROUP_MEMBERS' => "groupcp.php?view=members&". POST_GROUPS_URL ."=$group_id", - 'U_GROUP_CONFIG' => "group_config.php?g=$group_id", + 'U_GROUP_RELEASES' => "group.php?view=releases&". POST_GROUPS_URL ."=$group_id", + 'U_GROUP_MEMBERS' => "group.php?view=members&". POST_GROUPS_URL ."=$group_id", + 'U_GROUP_CONFIG' => "group_edit.php?g=$group_id", 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, 'GROUP_TYPE' => $group_type, @@ -493,7 +493,7 @@ else 'S_MODE_SELECT' => $select_sort_mode, 'S_ORDER_SELECT' => $select_sort_order, - 'S_GROUPCP_ACTION' => "groupcp.php?" . POST_GROUPS_URL . "=$group_id", + 'S_GROUP_ACTION' => "group.php?" . POST_GROUPS_URL . "=$group_id", )); switch ($view_mode) @@ -693,4 +693,4 @@ else } } -print_page('groupcp.tpl'); \ No newline at end of file +print_page('group.tpl'); \ No newline at end of file diff --git a/upload/group_config.php b/upload/group_edit.php similarity index 94% rename from upload/group_config.php rename to upload/group_edit.php index 091dd6043..615131704 100644 --- a/upload/group_config.php +++ b/upload/group_edit.php @@ -1,7 +1,7 @@ ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_GROUP_CONFIG_ACTION' => "group_config.php?" . POST_GROUPS_URL . "=$group_id", + 'S_GROUP_CONFIG_ACTION' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id", 'AVATAR_EXPLAIN' => sprintf($lang['AVATAR_EXPLAIN'], $bb_cfg['group_avatars']['max_width'], $bb_cfg['group_avatars']['max_height'], (round($bb_cfg['group_avatars']['max_size'] / 1024))), 'AVATAR_URL_PATH' => ($group_info['avatar_ext_id']) ? get_avatar_path(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id']) : '', @@ -94,7 +94,7 @@ if ($is_moderator) 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, )); - $template->set_filenames(array('body' => 'group_config.tpl')); + $template->set_filenames(array('body' => 'group_edit.tpl')); $template->assign_vars(array('PAGE_TITLE' => $lang['GROUP_CONFIGURATION'])); require(PAGE_HEADER); diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index a49450855..38592736f 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -342,7 +342,7 @@ define('PAGE_FOOTER', INC_DIR .'page_footer.php'); define('CAT_URL', 'index.php?c='); define('DOWNLOAD_URL', 'dl.php?id='); define('FORUM_URL', 'viewforum.php?f='); -define('GROUP_URL', 'groupcp.php?g='); +define('GROUP_URL', 'group.php?g='); define('LOGIN_URL', $bb_cfg['login_url']); define('MODCP_URL', 'modcp.php?f='); define('PM_URL', $bb_cfg['pm_url']); diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index 77183659c..f8274fb28 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -211,7 +211,7 @@ $template->assign_vars(array( 'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'], 'U_FORUM' => "viewforum.php", - 'U_GROUP_CP' => "groupcp.php", + 'U_GROUPS' => "group.php", 'U_LOGIN_LOGOUT' => $u_login_logout, 'U_MEMBERLIST' => "memberlist.php", 'U_MODCP' => "modcp.php", diff --git a/upload/language/en/email/group_added.tpl b/upload/language/en/email/group_added.tpl index 7ee9fe534..a1c8900af 100644 --- a/upload/language/en/email/group_added.tpl +++ b/upload/language/en/email/group_added.tpl @@ -7,6 +7,6 @@ You have been added to the "{GROUP_NAME}" group on {SITENAME}. This action was done by the group moderator or the site administrator, contact them for more information. You can view your groups information here: -{U_GROUPCP} +{U_GROUP} -{EMAIL_SIG} +{EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/en/email/group_approved.tpl b/upload/language/en/email/group_approved.tpl index cbcfbf56d..cca7bb6e5 100644 --- a/upload/language/en/email/group_approved.tpl +++ b/upload/language/en/email/group_approved.tpl @@ -6,6 +6,6 @@ Congratulations, Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved. Click on the following link to see your group membership. -{U_GROUPCP} +{U_GROUP} -{EMAIL_SIG} +{EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/en/email/group_request.tpl b/upload/language/en/email/group_request.tpl index 21d21abf6..bb588ca2d 100644 --- a/upload/language/en/email/group_request.tpl +++ b/upload/language/en/email/group_request.tpl @@ -6,6 +6,6 @@ Dear {GROUP_MODERATOR}, A user {USER} has requested to join a group you moderator on {SITENAME}. To approve or deny this request for group membership please visit the following link: -{U_GROUPCP} +{U_GROUP} -{EMAIL_SIG} +{EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/ru/email/group_added.tpl b/upload/language/ru/email/group_added.tpl index e6d1f96c5..14c6766c5 100644 --- a/upload/language/ru/email/group_added.tpl +++ b/upload/language/ru/email/group_added.tpl @@ -7,6 +7,6 @@ Charset: UTF-8 Это было проделано модератором группы или администратором сайта, обратитесь к ним за дополнительной информацией. Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/ru/email/group_approved.tpl b/upload/language/ru/email/group_approved.tpl index cacf730bd..af42ef770 100644 --- a/upload/language/ru/email/group_approved.tpl +++ b/upload/language/ru/email/group_approved.tpl @@ -6,6 +6,6 @@ Charset: UTF-8 Ваша просьба о вступлении в группу "{GROUP_NAME}" на сайте {SITENAME} была удовлетворена. Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/ru/email/group_request.tpl b/upload/language/ru/email/group_request.tpl index f8b9d68e7..f59e9f73e 100644 --- a/upload/language/ru/email/group_request.tpl +++ b/upload/language/ru/email/group_request.tpl @@ -6,6 +6,6 @@ Charset: UTF-8 Пользователь {USER} попросил о вступлении в группу (на сайте {SITENAME}), модератором которой Вы являетесь. Чтобы удовлетворить или отклонить эту просьбу, перейдите по следующей ссылке: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/uk/email/group_added.tpl b/upload/language/uk/email/group_added.tpl index 18c9c90e6..2ce774f73 100644 --- a/upload/language/uk/email/group_added.tpl +++ b/upload/language/uk/email/group_added.tpl @@ -7,6 +7,6 @@ Charset: UTF-8 Це було зроблено модератором групи чи адміністратором сайту, зверніться до них за додатковою інформацією. Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/uk/email/group_approved.tpl b/upload/language/uk/email/group_approved.tpl index 97e32cdd1..96ca92a73 100644 --- a/upload/language/uk/email/group_approved.tpl +++ b/upload/language/uk/email/group_approved.tpl @@ -6,6 +6,6 @@ Charset: UTF-8 Ваше прохання про вступ до групи "{GROUP_NAME}" на сайті {SITENAME} була задоволена. Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/language/uk/email/group_request.tpl b/upload/language/uk/email/group_request.tpl index 4c8791c68..179fbb167 100644 --- a/upload/language/uk/email/group_request.tpl +++ b/upload/language/uk/email/group_request.tpl @@ -6,6 +6,6 @@ Charset: UTF-8 Користувач {USER} попросив про вступ в групу (на сайті {SITENAME}), модератором якої Ви є. Щоб задовольнити або відхилити це прохання, перейдіть за наступним посиланням: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} \ No newline at end of file diff --git a/upload/robots.txt b/upload/robots.txt index 7516cba8a..b7d377cec 100644 --- a/upload/robots.txt +++ b/upload/robots.txt @@ -1,6 +1,6 @@ User-agent: * Disallow: /dl.php -Disallow: /groupcp.php +Disallow: /group.php Disallow: /login.php Disallow: /memberlist.php Disallow: /modcp.php diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/group.tpl similarity index 98% rename from upload/templates/default/groupcp.tpl rename to upload/templates/default/group.tpl index 53ca85776..f25b6356f 100644 --- a/upload/templates/default/groupcp.tpl +++ b/upload/templates/default/group.tpl @@ -45,7 +45,7 @@ -
+ {S_HIDDEN_FIELDS} @@ -114,7 +114,7 @@

{L_GROUP_MEMBERS} :: {L_GROUPS_RELEASES}

- + {S_HIDDEN_FIELDS}
diff --git a/upload/templates/default/group_config.tpl b/upload/templates/default/group_edit.tpl similarity index 100% rename from upload/templates/default/group_config.tpl rename to upload/templates/default/group_edit.tpl diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 2819a000c..2d607a8ec 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -250,7 +250,7 @@ if ( (typeof(window.opera) != "undefined" && window.opera.version() < 13) || (wi {L_TRACKER}|{L_SEARCH}|{L_TERMS}| - {L_USERGROUPS}| + {L_USERGROUPS}|{L_MEMBERLIST}