github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-07-14 00:53:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r593

Browse source 
Форматирование.
This commit is contained in:
Exile 2014-08-02 19:50:08 +04:00
parent b8cb7633e6
commit 61b27dd444
7 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install/sql/mysql.sql
View file

@ -797,7 +797,7 @@ CREATE TABLE IF NOT EXISTS `bb_groups` (
`group_single_user` tinyint(1) NOT NULL DEFAULT '1', `group_single_user` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`group_id`), PRIMARY KEY (`group_id`),
KEY `group_single_user` (`group_single_user`) KEY `group_single_user` (`group_single_user`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- -------------------------------------------------------- -- --------------------------------------------------------

14
upload/ajax.php
View file

@ -52,8 +52,8 @@ switch ($ajax->action)
require(INC_DIR . 'functions_admin.php'); require(INC_DIR . 'functions_admin.php');
break; break;
case 'manage_group':
case 'group_membership': case 'group_membership':
case 'manage_group':
require(INC_DIR . 'functions_group.php'); require(INC_DIR . 'functions_group.php');
break; break;
@ -80,7 +80,6 @@ class ajax_common
'change_user_opt' => array('admin'), 'change_user_opt' => array('admin'),
'manage_user' => array('admin'), 'manage_user' => array('admin'),
'manage_admin' => array('admin'), 'manage_admin' => array('admin'),
'manage_group' => array('user'),
'mod_action' => array('mod'), 'mod_action' => array('mod'),
'topic_tpl' => array('mod'), 'topic_tpl' => array('mod'),
@ -92,6 +91,7 @@ class ajax_common
'gen_passkey' => array('user'), 'gen_passkey' => array('user'),
'change_torrent' => array('user'), 'change_torrent' => array('user'),
'change_tor_status' => array('user'), 'change_tor_status' => array('user'),
'manage_group' => array('user'),
'view_post' => array('guest'), 'view_post' => array('guest'),
'view_torrent' => array('guest'), 'view_torrent' => array('guest'),
@ -339,10 +339,12 @@ class ajax_common
{ {
require(AJAX_DIR . 'group_membership.php'); require(AJAX_DIR . 'group_membership.php');
} }
function manage_group()
{ function manage_group()
require(AJAX_DIR . 'edit_group_profile.php'); {
} require(AJAX_DIR . 'edit_group_profile.php');
}
function post_mod_comment() function post_mod_comment()
{ {
require(AJAX_DIR . 'post_mod_comment.php'); require(AJAX_DIR . 'post_mod_comment.php');

4
upload/group-config.php → upload/group_config.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_config');
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');
@ -69,7 +69,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_config.tpl'));
$template->assign_vars(array('PAGE_TITLE' => 'Настройка группы')); $template->assign_vars(array('PAGE_TITLE' => 'Настройка группы'));

12
upload/groupcp.php
View file

@ -3,7 +3,7 @@
define('IN_FORUM', true); define('IN_FORUM', true);
define('BB_SCRIPT', 'groupcp'); define('BB_SCRIPT', 'groupcp');
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');
require(INC_DIR .'functions_group.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']; $user_time = ( !empty($row['user_time']) ) ? bb_date($row['user_time']) : $lang['NONE'];
$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
$pm = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. (PM_URL . "?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . (PM_URL . "?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>'; $pm = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. (PM_URL . "?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . (PM_URL . "?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
$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) if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod)
{ {
@ -511,9 +511,9 @@ else
'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'], 'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'],
'GROUP_NAME' => htmlCHR($group_info['group_name']), 'GROUP_NAME' => htmlCHR($group_info['group_name']),
'GROUP_DESCRIPTION' => bbcode2html($group_info['group_description']), 'GROUP_DESCRIPTION' => bbcode2html($group_info['group_description']),
'GROUP_DETAILS' => $group_details, 'GROUP_DETAILS' => $group_details,
'MOD_USER' => profile_url($group_moderator), 'MOD_USER' => profile_url($group_moderator),
'MOD_AVATAR' => $avatar, 'MOD_AVATAR' => $avatar,
'MOD_FROM' => $from, 'MOD_FROM' => $from,
'MOD_JOINED' => $joined, 'MOD_JOINED' => $joined,
'MOD_POSTS' => $posts, 'MOD_POSTS' => $posts,
@ -522,7 +522,7 @@ else
'MOD_WWW' => $www, 'MOD_WWW' => $www,
'MOD_TIME' => (!empty($group_info['group_time'])) ? bb_date($group_info['group_time']) : $lang['NONE'], 'MOD_TIME' => (!empty($group_info['group_time'])) ? bb_date($group_info['group_time']) : $lang['NONE'],
'U_SEARCH_USER' => "search.php?mode=searchuser", '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, 'GROUP_TYPE' => $group_type,
'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
@ -551,7 +551,7 @@ else
'ROW_NUMBER' => $i + ( $start + 1 ), 'ROW_NUMBER' => $i + ( $start + 1 ),
'ROW_CLASS' => $row_class, 'ROW_CLASS' => $row_class,
'USER' => profile_url($member), 'USER' => profile_url($member),
'AVATAR_IMG' => $avatar, 'AVATAR_IMG' => $avatar,
'FROM' => $from, 'FROM' => $from,
'JOINED' => $joined, 'JOINED' => $joined,
'POSTS' => $posts, 'POSTS' => $posts,

6
upload/language/ua/main.php
View file

@ -699,7 +699,7 @@ $lang['ORDER'] = ''; // не потрібно, в англійській вик
// Group control panel // Group control panel
// //
$lang['GROUP_CONTROL_PANEL'] = 'Групи'; $lang['GROUP_CONTROL_PANEL'] = 'Групи';
$lang['GROUP_RETURN'] = 'Вернуться на страницу группы'; $lang['GROUP_RETURN'] = 'Вернуться на страницу групи';
$lang['MEMBERSHIP_DETAILS'] = 'Інформація про членство в групах'; $lang['MEMBERSHIP_DETAILS'] = 'Інформація про членство в групах';
$lang['JOIN_A_GROUP'] = 'Вступити в групу'; $lang['JOIN_A_GROUP'] = 'Вступити в групу';
@ -717,7 +717,7 @@ $lang['GROUP_CLOSED'] = 'Група з закритим членством';
$lang['GROUP_HIDDEN'] = 'Прихована група'; $lang['GROUP_HIDDEN'] = 'Прихована група';
$lang['GROUP_TIME'] = 'Дата создания'; $lang['GROUP_TIME'] = 'Дата создания';
$lang['RELEASE_GROUP'] = 'Релиз группа'; $lang['RELEASE_GROUP'] = 'Реліз група';
$lang['GROUP_MEMBER_MOD'] = 'Є модератором груп'; $lang['GROUP_MEMBER_MOD'] = 'Є модератором груп';
$lang['GROUP_MEMBER_MEMBER'] = 'Є членом груп'; $lang['GROUP_MEMBER_MEMBER'] = 'Є членом груп';
@ -728,7 +728,7 @@ $lang['GROUP_MEMBER_HIDDEN'] = 'Приховані групи';
$lang['NO_GROUPS_EXIST'] = 'Немає ні однієї групи'; $lang['NO_GROUPS_EXIST'] = 'Немає ні однієї групи';
$lang['GROUP_NOT_EXIST'] = 'Такої групи не існує'; $lang['GROUP_NOT_EXIST'] = 'Такої групи не існує';
$lang['NO_GROUP_ID_SPECIFIED'] = 'Не указан ID группы'; $lang['NO_GROUP_ID_SPECIFIED'] = 'Не указан ID групи';
$lang['NO_GROUP_MEMBERS'] = 'В цій групі немає жодного члена'; $lang['NO_GROUP_MEMBERS'] = 'В цій групі немає жодного члена';
$lang['HIDDEN_GROUP_MEMBERS'] = 'Ця група прихована, ви не можете побачити її складу'; $lang['HIDDEN_GROUP_MEMBERS'] = 'Ця група прихована, ви не можете побачити її складу';

2
upload/templates/default/group-config.tpl → upload/templates/default/group_config.tpl
View file

@ -10,8 +10,8 @@
console.log(data); console.log(data);
} }
} }
</script> </script>
<h1 class="pagetitle">{PAGE_TITLE}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h1> <h1 class="pagetitle">{PAGE_TITLE}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h1>
<p class="nav"><a href="{U_GROUP_URL}">{L_GROUP_RETURN}</a></p> <p class="nav"><a href="{U_GROUP_URL}">{L_GROUP_RETURN}</a></p>
<form action="{S_GROUPCP_ACTION}" method="post"> <form action="{S_GROUPCP_ACTION}" method="post">

32
upload/templates/default/groupcp.tpl
View file

@ -17,7 +17,7 @@
<td class="pad_4"> <td class="pad_4">
<table class="bordered wAuto bCenter"> <table class="bordered wAuto bCenter">
<tr class="row2"> <tr class="row2">
<!-- BEGIN groups --> <!-- BEGIN groups -->
<td class="pad_8 med bold">{groups.MEMBERSHIP}</td> <td class="pad_8 med bold">{groups.MEMBERSHIP}</td>
<!-- END groups --> <!-- END groups -->
</tr> </tr>
@ -56,18 +56,18 @@
</tr> </tr>
<tr><td colspan="2"><h2>{GROUP_NAME}</h2></td></tr> <tr><td colspan="2"><h2>{GROUP_NAME}</h2></td></tr>
<tr> <tr>
<td align="center" valign="top"> <td align="center" valign="top">
<div style="height:100px;width:100px;background:#285e8e;">&nbsp;</div> <div style="height:100px;width:100px;background:#285e8e;">&nbsp;</div>
</td> </td>
<td valign="top"> <td valign="top">
<!-- IF GROUP_DESCRIPTION --> <!-- IF GROUP_DESCRIPTION -->
{GROUP_DESCRIPTION} {GROUP_DESCRIPTION}
<!-- ENDIF / GROUP_DESCRIPTION --> <!-- ENDIF / GROUP_DESCRIPTION -->
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{L_GROUP_TIME}</td> <td>{L_GROUP_TIME}</td>
<td>{MOD_TIME}</td> <td>{MOD_TIME}</td>
</tr> </tr>
<tr> <tr>
<td>{L_GROUP_MEMBERSHIP}:</td> <td>{L_GROUP_MEMBERSHIP}:</td>
@ -83,8 +83,8 @@
</tr> </tr>
<!-- BEGIN switch_mod_option --> <!-- BEGIN switch_mod_option -->
<tr> <tr>
<td>Настройка группы:</td> <td>Настройка группы:</td>
<td><a href="{U_GROUP_CONFIG}">Перейти в панель управления группой</a></td> <td><a href="{U_GROUP_CONFIG}">Перейти в панель управления группой</a></td>
</tr> </tr>
<!-- END switch_mod_option --> <!-- END switch_mod_option -->
</table> </table>
@ -100,7 +100,7 @@
<thead> <thead>
<tr> <tr>
<th class="{sorter: 'digit'}" ><b class="tbs-text">#</b></th> <th class="{sorter: 'digit'}" ><b class="tbs-text">#</b></th>
<th class="{sorter: false}" ><b class="tbs-text">{L_AVATAR}</b></th> <th class="{sorter: false}" ><b class="tbs-text">{L_AVATAR}</b></th>
<th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th> <th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th>
<th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th> <th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th>
<th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th> <th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th>
@ -116,7 +116,7 @@
</tr> </tr>
<tr class="row1 tCenter"> <tr class="row1 tCenter">
<td width="3%">{ROW_NUMBER}</td> <td width="3%">{ROW_NUMBER}</td>
<td width="3%" align="center">{MOD_AVATAR}</td> <td width="3%" align="center">{MOD_AVATAR}</td>
<td><b>{MOD_USER}</b></td> <td><b>{MOD_USER}</b></td>
<td>{MOD_PM}</td> <td>{MOD_PM}</td>
<td>{MOD_EMAIL}</td> <td>{MOD_EMAIL}</td>
@ -135,7 +135,7 @@
<!-- BEGIN member --> <!-- BEGIN member -->
<tr class="{member.ROW_CLASS} tCenter"> <tr class="{member.ROW_CLASS} tCenter">
<td width="3%">{member.ROW_NUMBER}</td> <td width="3%">{member.ROW_NUMBER}</td>
<td width="3%" align="center">{member.AVATAR_IMG}</td> <td width="3%" align="center">{member.AVATAR_IMG}</td>
<td>{member.USER}</td> <td>{member.USER}</td>
<td>{member.PM}</td> <td>{member.PM}</td>
<td>{member.EMAIL}</td> <td>{member.EMAIL}</td>