diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 77e1f10d9..1c419c05a 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -797,7 +797,7 @@ CREATE TABLE IF NOT EXISTS `bb_groups` (
`group_single_user` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`group_id`),
KEY `group_single_user` (`group_single_user`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
diff --git a/upload/ajax.php b/upload/ajax.php
index 49a2b37b5..c1180fe3a 100644
--- a/upload/ajax.php
+++ b/upload/ajax.php
@@ -52,8 +52,8 @@ switch ($ajax->action)
require(INC_DIR . 'functions_admin.php');
break;
- case 'manage_group':
case 'group_membership':
+ case 'manage_group':
require(INC_DIR . 'functions_group.php');
break;
@@ -80,7 +80,6 @@ class ajax_common
'change_user_opt' => array('admin'),
'manage_user' => array('admin'),
'manage_admin' => array('admin'),
- 'manage_group' => array('user'),
'mod_action' => array('mod'),
'topic_tpl' => array('mod'),
@@ -92,6 +91,7 @@ class ajax_common
'gen_passkey' => array('user'),
'change_torrent' => array('user'),
'change_tor_status' => array('user'),
+ 'manage_group' => array('user'),
'view_post' => array('guest'),
'view_torrent' => array('guest'),
@@ -339,10 +339,12 @@ class ajax_common
{
require(AJAX_DIR . 'group_membership.php');
}
- function manage_group()
- {
- require(AJAX_DIR . 'edit_group_profile.php');
- }
+
+ function manage_group()
+ {
+ require(AJAX_DIR . 'edit_group_profile.php');
+ }
+
function post_mod_comment()
{
require(AJAX_DIR . 'post_mod_comment.php');
diff --git a/upload/group-config.php b/upload/group_config.php
similarity index 96%
rename from upload/group-config.php
rename to upload/group_config.php
index 70632b1c7..fcab87f7b 100644
--- a/upload/group-config.php
+++ b/upload/group_config.php
@@ -1,7 +1,7 @@
($group_info['release_group']) ? true : false,
));
- $template->set_filenames(array('body' => 'group-config.tpl'));
+ $template->set_filenames(array('body' => 'group_config.tpl'));
$template->assign_vars(array('PAGE_TITLE' => 'Настройка группы'));
diff --git a/upload/groupcp.php b/upload/groupcp.php
index 9fb3f6950..e9fd3fb10 100644
--- a/upload/groupcp.php
+++ b/upload/groupcp.php
@@ -3,7 +3,7 @@
define('IN_FORUM', true);
define('BB_SCRIPT', 'groupcp');
define('BB_ROOT', './');
-require(BB_ROOT ."common.php");
+require(BB_ROOT .'common.php');
require(INC_DIR .'bbcode.php');
require(INC_DIR .'functions_group.php');
@@ -22,7 +22,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
$user_time = ( !empty($row['user_time']) ) ? bb_date($row['user_time']) : $lang['NONE'];
$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
$pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '![' . $lang['SEND_PRIVATE_MESSAGE'] . '](' . $images['icon_pm'] . ' "' . $lang['SEND_PRIVATE_MESSAGE'] . '")
';
- $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), true, 50, 50);
+ $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), true, 50, 50);
if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod)
{
@@ -511,9 +511,9 @@ else
'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'],
'GROUP_NAME' => htmlCHR($group_info['group_name']),
'GROUP_DESCRIPTION' => bbcode2html($group_info['group_description']),
- 'GROUP_DETAILS' => $group_details,
+ 'GROUP_DETAILS' => $group_details,
'MOD_USER' => profile_url($group_moderator),
- 'MOD_AVATAR' => $avatar,
+ 'MOD_AVATAR' => $avatar,
'MOD_FROM' => $from,
'MOD_JOINED' => $joined,
'MOD_POSTS' => $posts,
@@ -522,7 +522,7 @@ else
'MOD_WWW' => $www,
'MOD_TIME' => (!empty($group_info['group_time'])) ? bb_date($group_info['group_time']) : $lang['NONE'],
'U_SEARCH_USER' => "search.php?mode=searchuser",
- 'U_GROUP_CONFIG' => "group-config.php?g=$group_id",
+ 'U_GROUP_CONFIG' => "group_config.php?g=$group_id",
'GROUP_TYPE' => $group_type,
'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
@@ -551,7 +551,7 @@ else
'ROW_NUMBER' => $i + ( $start + 1 ),
'ROW_CLASS' => $row_class,
'USER' => profile_url($member),
- 'AVATAR_IMG' => $avatar,
+ 'AVATAR_IMG' => $avatar,
'FROM' => $from,
'JOINED' => $joined,
'POSTS' => $posts,
diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php
index 610b1d48b..55a149897 100644
--- a/upload/language/ua/main.php
+++ b/upload/language/ua/main.php
@@ -699,7 +699,7 @@ $lang['ORDER'] = ''; // не потрібно, в англійській вик
// Group control panel
//
$lang['GROUP_CONTROL_PANEL'] = 'Групи';
-$lang['GROUP_RETURN'] = 'Вернуться на страницу группы';
+$lang['GROUP_RETURN'] = 'Вернуться на страницу групи';
$lang['MEMBERSHIP_DETAILS'] = 'Інформація про членство в групах';
$lang['JOIN_A_GROUP'] = 'Вступити в групу';
@@ -717,7 +717,7 @@ $lang['GROUP_CLOSED'] = 'Група з закритим членством';
$lang['GROUP_HIDDEN'] = 'Прихована група';
$lang['GROUP_TIME'] = 'Дата создания';
-$lang['RELEASE_GROUP'] = 'Релиз группа';
+$lang['RELEASE_GROUP'] = 'Реліз група';
$lang['GROUP_MEMBER_MOD'] = 'Є модератором груп';
$lang['GROUP_MEMBER_MEMBER'] = 'Є членом груп';
@@ -728,7 +728,7 @@ $lang['GROUP_MEMBER_HIDDEN'] = 'Приховані групи';
$lang['NO_GROUPS_EXIST'] = 'Немає ні однієї групи';
$lang['GROUP_NOT_EXIST'] = 'Такої групи не існує';
-$lang['NO_GROUP_ID_SPECIFIED'] = 'Не указан ID группы';
+$lang['NO_GROUP_ID_SPECIFIED'] = 'Не указан ID групи';
$lang['NO_GROUP_MEMBERS'] = 'В цій групі немає жодного члена';
$lang['HIDDEN_GROUP_MEMBERS'] = 'Ця група прихована, ви не можете побачити її складу';
diff --git a/upload/templates/default/group-config.tpl b/upload/templates/default/group_config.tpl
similarity index 100%
rename from upload/templates/default/group-config.tpl
rename to upload/templates/default/group_config.tpl
index 36d31f753..8aa99ff7b 100644
--- a/upload/templates/default/group-config.tpl
+++ b/upload/templates/default/group_config.tpl
@@ -10,8 +10,8 @@
console.log(data);
}
}
-
+
{PAGE_TITLE} :: {GROUP_NAME}
{L_GROUP_RETURN}