github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Group cp rename

Browse source 
Переименование файлов с группами и настройкой групп. Использовать слово config из-за htaccess нельзя.
This commit is contained in:
Exile 2014-08-29 01:22:31 +04:00
commit 8f3af36460
20 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/ajax/group_membership.php
View file

@ -30,7 +30,7 @@ switch ($mode)
{ {
$class = ($row['user_pending']) ? 'med' : 'med bold'; $class = ($row['user_pending']) ? 'med' : 'med bold';
$class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : ''; $class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : '';
$href = "groupcp.php?g={$row['group_id']}"; $href = "group.php?g={$row['group_id']}";
if (IS_ADMIN) if (IS_ADMIN)
{ {

2
upload/ajax/index_data.php
View file

@ -65,7 +65,7 @@ switch($mode)
{ {
foreach ($mod['mod_groups'][$forum_id] as $group_id) foreach ($mod['mod_groups'][$forum_id] as $group_id)
{ {
$moderators[] = '<a href="'. "groupcp.php?". POST_GROUPS_URL ."=". $group_id .'">'. $mod['name_groups'][$group_id] .'</a>'; $moderators[] = '<a href="'. "group.php?". POST_GROUPS_URL ."=". $group_id .'">'. $mod['name_groups'][$group_id] .'</a>';
} }
} }

8
upload/config.php
View file

@ -48,7 +48,7 @@
* PM * PM
* Actions log * Actions log
* Users * Users
* GroupCP * Groups
* Tidy * Tidy
* Ads * 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['topic_notify_enabled'] = true;
$bb_cfg['pm_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['email_change_disabled'] = false; // disable changing email by user
$bb_cfg['tech_admin_email'] = 'admin@' . $domain_name; // email for sending error reports $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_activated_days_keep'] = 7; // "not activated" == "not finished registration"
$bb_cfg['user_not_active_days_keep'] = 180; // inactive users but only with no posts $bb_cfg['user_not_active_days_keep'] = 180; // inactive users but only with no posts
// GroupCP // Groups
$bb_cfg['groupcp_members_per_page'] = 50; $bb_cfg['group_members_per_page'] = 50;
// Tidy // Tidy
$bb_cfg['tidy_post'] = (!extension_loaded('tidy')) ? false : true; $bb_cfg['tidy_post'] = (!extension_loaded('tidy')) ? false : true;

28
upload/groupcp.php → upload/group.php
View file

@ -1,7 +1,7 @@
<?php <?php
define('IN_FORUM', true); define('IN_FORUM', true);
define('BB_SCRIPT', 'groupcp'); define('BB_SCRIPT', 'group');
define('BB_ROOT', './'); define('BB_ROOT', './');
require(BB_ROOT .'common.php'); require(BB_ROOT .'common.php');
require(INC_DIR .'bbcode.php'); require(INC_DIR .'bbcode.php');
@ -45,7 +45,7 @@ set_die_append_msg();
$group_id = isset($_REQUEST[POST_GROUPS_URL]) ? intval($_REQUEST[POST_GROUPS_URL]) : null; $group_id = isset($_REQUEST[POST_GROUPS_URL]) ? intval($_REQUEST[POST_GROUPS_URL]) : null;
$start = isset($_REQUEST['start']) ? abs(intval($_REQUEST['start'])) : 0; $start = isset($_REQUEST['start']) ? abs(intval($_REQUEST['start'])) : 0;
$per_page = $bb_cfg['groupcp_members_per_page']; $per_page = $bb_cfg['group_members_per_page'];
$view_mode = isset($_REQUEST['view']) ? (string) $_REQUEST['view'] : null; $view_mode = isset($_REQUEST['view']) ? (string) $_REQUEST['view'] : null;
$rel_limit = 50; $rel_limit = 50;
@ -175,7 +175,7 @@ if (!$group_id)
$template->assign_vars(array( $template->assign_vars(array(
'SELECT_GROUP' => true, 'SELECT_GROUP' => true,
'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'], 'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'],
'S_USERGROUP_ACTION' => 'groupcp.php', 'S_USERGROUP_ACTION' => 'group.php',
'S_HIDDEN_FIELDS' => $s_hidden_fields, '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); 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'); require(INC_DIR .'emailer.class.php');
$emailer = new emailer($bb_cfg['smtp_delivery']); $emailer = new emailer($bb_cfg['smtp_delivery']);
@ -232,7 +232,7 @@ else if (@$_POST['joingroup'])
'USER' => $userdata['username'], 'USER' => $userdata['username'],
'SITENAME' => $bb_cfg['sitename'], 'SITENAME' => $bb_cfg['sitename'],
'GROUP_MODERATOR' => $moderator['username'], 'GROUP_MODERATOR' => $moderator['username'],
'U_GROUPCP' => make_url(GROUP_URL . $group_id), 'U_GROUP' => make_url(GROUP_URL . $group_id),
)); ));
$emailer->send(); $emailer->send();
@ -270,7 +270,7 @@ else
add_user_into_group($group_id, $row['user_id']); 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'); require(INC_DIR .'emailer.class.php');
$emailer = new emailer($bb_cfg['smtp_delivery']); $emailer = new emailer($bb_cfg['smtp_delivery']);
@ -283,7 +283,7 @@ else
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $bb_cfg['sitename'], 'SITENAME' => $bb_cfg['sitename'],
'GROUP_NAME' => $group_info['group_name'], 'GROUP_NAME' => $group_info['group_name'],
'U_GROUPCP' => make_url(GROUP_URL . $group_id), 'U_GROUP' => make_url(GROUP_URL . $group_id),
)); ));
$emailer->send(); $emailer->send();
@ -331,7 +331,7 @@ else
} }
} }
// Email users when they are approved // 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 $sql_select = "SELECT username, user_email, user_lang
FROM ". BB_USERS ." FROM ". BB_USERS ."
@ -356,7 +356,7 @@ else
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $bb_cfg['sitename'], 'SITENAME' => $bb_cfg['sitename'],
'GROUP_NAME' => $group_info['group_name'], 'GROUP_NAME' => $group_info['group_name'],
'U_GROUPCP' => make_url(GROUP_URL . $group_id), 'U_GROUP' => make_url(GROUP_URL . $group_id),
)); ));
$emailer->send(); $emailer->send();
@ -477,9 +477,9 @@ else
'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : $lang['NONE'], 'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : $lang['NONE'],
'U_SEARCH_USER' => "search.php?mode=searchuser", 'U_SEARCH_USER' => "search.php?mode=searchuser",
'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id", 'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
'U_GROUP_RELEASES' => "groupcp.php?view=releases&amp;". POST_GROUPS_URL ."=$group_id", 'U_GROUP_RELEASES' => "group.php?view=releases&amp;". POST_GROUPS_URL ."=$group_id",
'U_GROUP_MEMBERS' => "groupcp.php?view=members&amp;". POST_GROUPS_URL ."=$group_id", 'U_GROUP_MEMBERS' => "group.php?view=members&amp;". POST_GROUPS_URL ."=$group_id",
'U_GROUP_CONFIG' => "group_config.php?g=$group_id", 'U_GROUP_CONFIG' => "group_edit.php?g=$group_id",
'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false,
'GROUP_TYPE' => $group_type, 'GROUP_TYPE' => $group_type,
@ -493,7 +493,7 @@ else
'S_MODE_SELECT' => $select_sort_mode, 'S_MODE_SELECT' => $select_sort_mode,
'S_ORDER_SELECT' => $select_sort_order, '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) switch ($view_mode)
@ -693,4 +693,4 @@ else
} }
} }
print_page('groupcp.tpl'); print_page('group.tpl');

6
upload/group_config.php → upload/group_edit.php
View file

@ -1,7 +1,7 @@
<?php <?php
define('IN_FORUM', true); define('IN_FORUM', true);
define('BB_SCRIPT', 'group_config'); define('BB_SCRIPT', 'group_edit');
define('BB_ROOT', './'); define('BB_ROOT', './');
require(BB_ROOT .'common.php'); require(BB_ROOT .'common.php');
require(INC_DIR .'functions_group.php'); require(INC_DIR .'functions_group.php');
@ -86,7 +86,7 @@ if ($is_moderator)
'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '',
'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '',
'S_HIDDEN_FIELDS' => $s_hidden_fields, '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_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']) : '', '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, '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'])); $template->assign_vars(array('PAGE_TITLE' => $lang['GROUP_CONFIGURATION']));
require(PAGE_HEADER); require(PAGE_HEADER);

2
upload/includes/init_bb.php
View file

@ -342,7 +342,7 @@ define('PAGE_FOOTER', INC_DIR .'page_footer.php');
define('CAT_URL', 'index.php?c='); define('CAT_URL', 'index.php?c=');
define('DOWNLOAD_URL', 'dl.php?id='); define('DOWNLOAD_URL', 'dl.php?id=');
define('FORUM_URL', 'viewforum.php?f='); 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('LOGIN_URL', $bb_cfg['login_url']);
define('MODCP_URL', 'modcp.php?f='); define('MODCP_URL', 'modcp.php?f=');
define('PM_URL', $bb_cfg['pm_url']); define('PM_URL', $bb_cfg['pm_url']);

2
upload/includes/page_header.php
View file

@ -211,7 +211,7 @@ $template->assign_vars(array(
'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'], 'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'],
'U_FORUM' => "viewforum.php", 'U_FORUM' => "viewforum.php",
'U_GROUP_CP' => "groupcp.php", 'U_GROUPS' => "group.php",
'U_LOGIN_LOGOUT' => $u_login_logout, 'U_LOGIN_LOGOUT' => $u_login_logout,
'U_MEMBERLIST' => "memberlist.php", 'U_MEMBERLIST' => "memberlist.php",
'U_MODCP' => "modcp.php", 'U_MODCP' => "modcp.php",

2
upload/language/en/email/group_added.tpl
View file

@ -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. This action was done by the group moderator or the site administrator, contact them for more information.
You can view your groups information here: You can view your groups information here:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/en/email/group_approved.tpl
View file

@ -6,6 +6,6 @@ Congratulations,
Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved. Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved.
Click on the following link to see your group membership. Click on the following link to see your group membership.
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/en/email/group_request.tpl
View file

@ -6,6 +6,6 @@ Dear {GROUP_MODERATOR},
A user {USER} has requested to join a group you moderator on {SITENAME}. 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: To approve or deny this request for group membership please visit the following link:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/ru/email/group_added.tpl
View file

@ -7,6 +7,6 @@ Charset: UTF-8
Это было проделано модератором группы или администратором сайта, обратитесь к ним за дополнительной информацией. Это было проделано модератором группы или администратором сайта, обратитесь к ним за дополнительной информацией.
Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/ru/email/group_approved.tpl
View file

@ -6,6 +6,6 @@ Charset: UTF-8
Ваша просьба о вступлении в группу "{GROUP_NAME}" на сайте {SITENAME} была удовлетворена. Ваша просьба о вступлении в группу "{GROUP_NAME}" на сайте {SITENAME} была удовлетворена.
Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/ru/email/group_request.tpl
View file

@ -6,6 +6,6 @@ Charset: UTF-8
Пользователь {USER} попросил о вступлении в группу (на сайте {SITENAME}), модератором которой Вы являетесь. Пользователь {USER} попросил о вступлении в группу (на сайте {SITENAME}), модератором которой Вы являетесь.
Чтобы удовлетворить или отклонить эту просьбу, перейдите по следующей ссылке: Чтобы удовлетворить или отклонить эту просьбу, перейдите по следующей ссылке:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/uk/email/group_added.tpl
View file

@ -7,6 +7,6 @@ Charset: UTF-8
Це було зроблено модератором групи чи адміністратором сайту, зверніться до них за додатковою інформацією. Це було зроблено модератором групи чи адміністратором сайту, зверніться до них за додатковою інформацією.
Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах: Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/uk/email/group_approved.tpl
View file

@ -6,6 +6,6 @@ Charset: UTF-8
Ваше прохання про вступ до групи "{GROUP_NAME}" на сайті {SITENAME} була задоволена. Ваше прохання про вступ до групи "{GROUP_NAME}" на сайті {SITENAME} була задоволена.
Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах: Перейдіть за посиланням, щоб побачити інформацію про ваше членство в групах:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/language/uk/email/group_request.tpl
View file

@ -6,6 +6,6 @@ Charset: UTF-8
Користувач {USER} попросив про вступ в групу (на сайті {SITENAME}), модератором якої Ви є. Користувач {USER} попросив про вступ в групу (на сайті {SITENAME}), модератором якої Ви є.
Щоб задовольнити або відхилити це прохання, перейдіть за наступним посиланням: Щоб задовольнити або відхилити це прохання, перейдіть за наступним посиланням:
{U_GROUPCP} {U_GROUP}
{EMAIL_SIG} {EMAIL_SIG}

2
upload/robots.txt
View file

@ -1,6 +1,6 @@
User-agent: * User-agent: *
Disallow: /dl.php Disallow: /dl.php
Disallow: /groupcp.php Disallow: /group.php
Disallow: /login.php Disallow: /login.php
Disallow: /memberlist.php Disallow: /memberlist.php
Disallow: /modcp.php Disallow: /modcp.php

4
upload/templates/default/groupcp.tpl → upload/templates/default/group.tpl
View file

@ -45,7 +45,7 @@
<!-- IF GROUP_INFO --> <!-- IF GROUP_INFO -->
<!--========================================================================--> <!--========================================================================-->
<form action="{S_GROUPCP_ACTION}" method="post"> <form action="{S_GROUP_ACTION}" method="post">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
<table class="forumline pad_4"> <table class="forumline pad_4">
@ -114,7 +114,7 @@
<p class="nav"><a href="{U_GROUP_MEMBERS}" name="members">{L_GROUP_MEMBERS}</a><!-- IF RELEASE_GROUP -->&nbsp;::&nbsp;<a href="{U_GROUP_RELEASES}" name="releases">{L_GROUPS_RELEASES}</a><!-- ENDIF --></p> <p class="nav"><a href="{U_GROUP_MEMBERS}" name="members">{L_GROUP_MEMBERS}</a><!-- IF RELEASE_GROUP -->&nbsp;::&nbsp;<a href="{U_GROUP_RELEASES}" name="releases">{L_GROUPS_RELEASES}</a><!-- ENDIF --></p>
<!-- IF MEMBERS --> <!-- IF MEMBERS -->
<form action="{S_GROUPCP_ACTION}" method="post" name="post"> <form action="{S_GROUP_ACTION}" method="post" name="post">
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
<table class="forumline tablesorter"> <table class="forumline tablesorter">

0
upload/templates/default/group_config.tpl → upload/templates/default/group_edit.tpl
View file

2
upload/templates/default/page_header.tpl
View file

@ -250,7 +250,7 @@ if ( (typeof(window.opera) != "undefined" && window.opera.version() < 13) || (wi
<a href="{U_TRACKER}"><b>{L_TRACKER}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_TRACKER}"><b>{L_TRACKER}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_SEARCH}"><b>{L_SEARCH}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_SEARCH}"><b>{L_SEARCH}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_TERMS}"><b style="color: #993300;">{L_TERMS}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_TERMS}"><b style="color: #993300;">{L_TERMS}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_GROUP_CP}"><b>{L_USERGROUPS}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_GROUPS}"><b>{L_USERGROUPS}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a> <a href="{U_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a>
</td> </td>
<td class="nowrap" align="right"> <td class="nowrap" align="right">