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

r562

Browse source 
Удаление мода виртуальной клавиатуры из основного дистрибутива; фикс главной страницы админ-панели; фикс панели управления шаблонами в админ-панели; частичная замена else if на elseif, для возможности отхода от использования фигурных скобок в дальнейшем. Дальнейшая поддержка и распространение мода виртуальной клавиатуры осуществляется на форуме: http://torrentpier.me/resources/84/ git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@562 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08@gmail.com 2014-01-19 19:04:25 +00:00
commit 399ac5a1b0
26 changed files with 152 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

148
mods/Virtual Keyboard/install.txt
View file

@ -1,148 +0,0 @@
# Инструкция от dimka3210
# Данный мод позволяет использовать виртуальную клавиатуру.
# Сам мод был вырезан из-за неактивности, но будет поставляться вместе с движком.
# Получить поддержку по движку можно на форуме http://torrentpier.me
Скопировать файл kb.tpl в /templates/default/
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
config_mods.php
#
#-----[ ADD / Добавить ]-----------------------------------------
#
$bb_cfg['show_virtual_keyboard'] = true;
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
posting.php
#
#-----[ FIND / Найти ]-------------------------------------------
#
'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields)
);
#
#-----[ AFTER ADD / После добавить]------------------------------
#
$template->assign_vars(array(
'SHOW_VIRTUAL_KEYBOARD' => $bb_cfg['show_virtual_keyboard'],
'S_VISIBILITY_RULES' => 'position:absolute;visibility:hidden;',
'S_VISIBILITY_KEYB' => 'position:absolute;visibility:hidden;',
'S_VISIBILITY_OFF' => '')
);
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
privmsg.php
#
#-----[ FIND / Найти ]-------------------------------------------
#
'U_VIEW_FORUM' => append_sid("privmsg.php"))
);
#
#-----[ AFTER ADD / После добавить]------------------------------
#
$template->assign_vars(array(
'SHOW_VIRTUAL_KEYBOARD' => $bb_cfg['show_virtual_keyboard'],
'S_VISIBILITY_RULES' => 'position:absolute;visibility:hidden;',
'S_VISIBILITY_KEYB' => 'position:absolute;visibility:hidden;',
'S_VISIBILITY_OFF' => '')
);
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
lang_english/lang_main.php
#
#-----[ ADD / Добавить в конец]------------------------------
#
// MAIL.RU KEYBOARD
$lang['KB_TITLE'] = 'Russian keyboard';
$lang['KB_RUS_KEYLAYOUT'] = 'Layout: ';
$lang['KB_NONE'] = 'None';
$lang['KB_TRANSLIT'] = 'Translit';
$lang['KB_TRADITIONAL'] = 'Traditional';
$lang['KB_RULES'] = 'Using translit';
$lang['KB_SHOW'] = 'Show keyboard (Make sure you\'re using Cyrillic codepage!)';
$lang['KB_ABOUT'] = 'About';
$lang['KB_CLOSE'] = 'Close';
$lang['KB_TRANSLIT_MOZILLA'] = 'Select text you wish to translit and click \'Translit\'.';
$lang['KB_TRANSLIT_OPERA7'] = 'Click here to translit your message.';
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
lang_russian/lang_main.php
#
#-----[ ADD / Добавить в конец]------------------------------
#
// MAIL.RU KEYBOARD
$lang['KB_TITLE'] = 'Русская клавиатура';
$lang['KB_RUS_KEYLAYOUT'] = 'Раскладка: ';
$lang['KB_NONE'] = 'Отсутствует';
$lang['KB_TRANSLIT'] = 'Транслит';
$lang['KB_TRADITIONAL'] = 'Традиционная';
$lang['KB_RULES'] = 'Правила набора';
$lang['KB_SHOW'] = 'Показать клавиатуру';
$lang['KB_ABOUT'] = 'О клавиатуре';
$lang['KB_CLOSE'] = 'Закрыть';
$lang['KB_TRANSLIT_MOZILLA'] = 'Выберите текст, который вы хотите для перевода в транслит, и нажмите кнопку \'Транслит\'.';
$lang['KB_TRANSLIT_OPERA7'] = 'Нажмите здесь для перевода вашего сообщения в транслит.';
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
templates/default/posting.tpl
#
#-----[ FIND / Найти ]-------------------------------------------
#
<!-- IF IN_PM -->
<!-- ELSEIF LOGGED_IN -->
#
#-----[ BEFORE ADD / Перед добавить]------------------------------
#
<!-- IF SHOW_VIRTUAL_KEYBOARD --><!-- INCLUDE kb.tpl --><!-- ENDIF -->
#
#-----[ OPEN / Открыть ]-----------------------------------------
#
templates/default/posting_editor.tpl
#
#-----[ FIND / Найти ]-------------------------------------------
#
class="editor mrg_4" name="message" id="message" rows="18" cols="92"
#
#-----[ ADD / Добавить]------------------------------
#
<!-- IF SHOW_VIRTUAL_KEYBOARD -->
onkeypress = "if(use_kb) return decode(event);"
<!-- ENDIF -->
#
#-----[ SAVE/CLOSE ALL FILES / Сохранить/Закрыть все файлы]------------------------------------------
#

136
mods/Virtual Keyboard/kb.tpl
View file

File diff suppressed because one or more lines are too long

3
upload/admin/admin_disallow.php
View file

@ -45,8 +45,7 @@ else if( isset($_POST['delete_name']) )
{
$disallowed_id = (isset($_POST['disallowed_id']) ) ? intval( $_POST['disallowed_id'] ) : intval( $_GET['disallowed_id']);
$sql = "DELETE FROM " . BB_DISALLOW . "
WHERE disallow_id = $disallowed_id";
$sql = "DELETE FROM " . BB_DISALLOW . " WHERE disallow_id = $disallowed_id";
$result = DB()->sql_query($sql);
if( !$result )
{

22
upload/admin/admin_ranks.php
View file

@ -55,8 +55,7 @@ if($mode != '')
message_die(GENERAL_MESSAGE, $lang['MUST_SELECT_RANK']);
}
$sql = "SELECT * FROM " . BB_RANKS . "
WHERE rank_id = $rank_id";
$sql = "SELECT * FROM " . BB_RANKS . " WHERE rank_id = $rank_id";
if(!$result = DB()->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't obtain rank data", '', __LINE__, __FILE__, $sql);
@ -64,7 +63,6 @@ if($mode != '')
$rank_info = DB()->sql_fetchrow($result);
$s_hidden_fields .= '<input type="hidden" name="id" value="'. $rank_id .'" />';
}
else
{
@ -90,7 +88,6 @@ if($mode != '')
'S_RANK_ACTION' => "admin_ranks.php",
'S_HIDDEN_FIELDS' => $s_hidden_fields,
));
}
elseif ($mode == 'save')
{
@ -131,17 +128,18 @@ if($mode != '')
{
if (!$special_rank)
{
$sql = "UPDATE " . BB_USERS . "
SET user_rank = 0
WHERE user_rank = $rank_id";
$sql = "UPDATE " . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id";
if (!$result = DB()->sql_query($sql))
{
message_die(GENERAL_ERROR, $lang['NO_UPDATE_RANKS'], '', __LINE__, __FILE__, $sql);
}
}
$sql = "UPDATE " . BB_RANKS . "
SET rank_title = '". DB()->escape($rank_title) ."', rank_special = $special_rank, rank_min = $min_posts, rank_image = '". DB()->escape($rank_image) . "', rank_style = '". DB()->escape($rank_style) ."'
SET rank_title = '". DB()->escape($rank_title) ."',
rank_special = $special_rank,
rank_min = $min_posts,
rank_image = '". DB()->escape($rank_image) . "',
rank_style = '". DB()->escape($rank_style) ."'
WHERE rank_id = $rank_id";
$message = $lang['RANK_UPDATED'];
@ -190,10 +188,7 @@ if($mode != '')
message_die(GENERAL_ERROR, "Couldn't delete rank data", '', __LINE__, __FILE__, $sql);
}
$sql = "UPDATE " . BB_USERS . "
SET user_rank = 0
WHERE user_rank = $rank_id";
$sql = "UPDATE " . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id";
if (!$result = DB()->sql_query($sql))
{
message_die(GENERAL_ERROR, $lang['NO_UPDATE_RANKS'], '', __LINE__, __FILE__, $sql);
@ -204,7 +199,6 @@ if($mode != '')
$datastore->update('ranks');
message_die(GENERAL_MESSAGE, $message);
}
else
{

2
upload/admin/admin_topic_templates.php
View file

@ -111,7 +111,7 @@ elseif ($mode == 'delete')
print_confirmation(array(
'QUESTION' => $lang['QUESTION'],
'ITEMS_LIST' => join('\n</li>\n<li>\n', $names),
'ITEMS_LIST' => join("\n</li>\n<li>\n", $names),
'FORM_ACTION' => "admin_topic_templates.php?mode=delete",
'HIDDEN_FIELDS' => build_hidden_fields($hidden_fields),
));

5
upload/admin/index.php
View file

@ -132,8 +132,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
$dblist = array();
foreach ($bb_cfg['db'] as $name => $row)
{
$sql = "SHOW TABLE STATUS
FROM {$row[1]}";
$sql = "SHOW TABLE STATUS FROM {$row[1]}";
if ($result = DB()->sql_query($sql))
{
$tabledata_ary = DB()->sql_fetchrowset($result);
@ -141,7 +140,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
$dbsize = 0;
for ($i = 0; $i < count($tabledata_ary); $i++)
{
if( @$tabledata_ary[$i]['Type'] != 'MRG_MyISAM' )
if( @$tabledata_ary[$i]['Type'] != 'MRG_MYISAM' )
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}

1
upload/ajax/manage_user.php
View file

@ -18,6 +18,7 @@ switch ($mode)
'bb_cap_sid',
);
// foreach ($bb_cfg['cache']['engines'] as $cache_name => $cache_val)
foreach ($gc_cache as $cache_name)
{
CACHE($cache_name)->rm();

2
upload/config.php
View file

@ -56,7 +56,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 (unstable)';
$bb_cfg['tp_release_date'] = '19-01-2014';
$bb_cfg['tp_release_state'] = 'R561';
$bb_cfg['tp_release_state'] = 'R562';
// Database
$charset = 'utf8';

5
upload/posting.php
View file

@ -78,6 +78,7 @@ switch ($mode)
$is_auth_type = 'auth_post';
}
break;
case 'reply':
case 'quote':
if (bf($userdata['user_opt'], 'user_opt', 'allow_post'))
@ -86,6 +87,7 @@ switch ($mode)
}
$is_auth_type = 'auth_reply';
break;
case 'editpost':
if (bf($userdata['user_opt'], 'user_opt', 'allow_post_edit'))
{
@ -93,13 +95,16 @@ switch ($mode)
}
$is_auth_type = 'auth_edit';
break;
case 'delete':
case 'poll_delete':
$is_auth_type = 'auth_delete';
break;
case 'vote':
$is_auth_type = 'auth_vote';
break;
default:
message_die(GENERAL_MESSAGE, $lang['NO_POST_MODE']);
break;