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

r556

Browse source 
Фикс http://torrentpier.me/threads/23983/ git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@556 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08@gmail.com 2014-01-12 21:02:48 +00:00
commit 5cb2a7e274
6 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mods/Virtual Keyboard/kb.tpl
View file

@ -24,20 +24,20 @@ var l_letter=new Array('`','1','2','3','4','5','6','7','8','9','0','-','=','q','
<b>{L_KB_TITLE}</b>
<div id="kb_rules" class="small" style="{S_VISIBILITY_RULES}">
<script>if(isMOZ||isIE)document.write("{L_KB_RUS_KEYLAYOUT}<select name='decflag' onchange='document.post.message.focus();' style='font-size:10px;position:relative;top:2px'><option value=0>{L_KB_NONE}<option value=1>{L_KB_TRANSLIT}<option value=2 selected>{L_KB_TRADITIONAL}</select><br />");</script>
<span class="a" onclick="javascript:translit();">{L_KB_TRANSLIT}</span><br />
<span class="a" onclick="javascript:kb_rules();">{L_KB_RULES}</span><br />
<span class="a" onclick="javascript:kb_close();">{L_HIDE}</span>
<span class="a" onclick="translit();">{L_KB_TRANSLIT}</span><br />
<span class="a" onclick="kb_rules();">{L_KB_RULES}</span><br />
<span class="a" onclick="kb_close();">{L_HIDE}</span>
</div>
</td>
<td class="row2">
<div id="kb_off" style="{S_VISIBILITY_OFF}"><span class="a" onclick="javascript:kb_show();">{L_KB_SHOW}</span></div>
<div id="kb_off" style="{S_VISIBILITY_OFF}"><span class="a" onclick="kb_show();">{L_KB_SHOW}</span></div>
<div id="kb_trules" style="{S_VISIBILITY_KEYB}">
<table class="borderless">
<tr>
<td nowrap="nowrap" colspan="10"><b>{L_KB_RULES}</b></td>
<td colspan="2" class="small"><span class="a" onclick="javascript:kb_rules();">{L_KB_CLOSE}</span></td>
<td colspan="2" class="small"><span class="a" onclick="kb_rules();">{L_KB_CLOSE}</span></td>
</tr>
<tr valign="top">
<td nowrap="nowrap"><b>&#1072; <br>&#1073; <br>&#1074; <br>&#1075; <br>&#1076; <br>&#1077; </b></td>

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'] = '13-01-2014';
$bb_cfg['tp_release_state'] = 'R555';
$bb_cfg['tp_release_state'] = 'R556';
// Database
$charset = 'utf8';

3
upload/develop/open_editor.php
View file

@ -12,5 +12,4 @@ $prog_args = $_GET['args'];
$command = "$interpreter $prog_path $prog_args";
exec($command);
echo '<HTML><BODY onload="javascript:self.close()"></BODY></HTML>';
exit;
exit;

4
upload/includes/bbcode.php
View file

@ -107,7 +107,7 @@ function generate_smilies($mode)
$user->session_start();
}
$data = $datastore->get('smile_replacements');
$data = $datastore->get('smile_replacements');
if ($sql = $data['smile'])
{
@ -936,4 +936,4 @@ function get_parsed_post ($postrow, $mode = 'full', $return_chars = 600)
function update_post_html ($postrow)
{
DB()->query("DELETE FROM ". BB_POSTS_HTML ." WHERE post_id = ". (int) $postrow['post_id'] ." LIMIT 1");
}
}

40
upload/includes/datastore/build_stats.php
View file

@ -22,37 +22,37 @@ $data['topiccount'] = number_format($row['topiccount']);
// Tracker stats
if ($bb_cfg['tor_stats'])
{
// torrents stat
$row = DB()->fetch_row("SELECT COUNT(topic_id) AS torrentcount, SUM(size) AS size FROM ". BB_BT_TORRENTS);
$data['torrentcount'] = number_format($row['torrentcount']);
$data['size'] = $row['size'];
// torrents stat
$row = DB()->fetch_row("SELECT COUNT(topic_id) AS torrentcount, SUM(size) AS size FROM ". BB_BT_TORRENTS);
$data['torrentcount'] = number_format($row['torrentcount']);
$data['size'] = $row['size'];
// peers stat
$row = DB()->fetch_row("SELECT SUM(seeders) AS seeders, SUM(leechers) AS leechers, ((SUM(speed_up) + SUM(speed_down))/2) AS speed FROM ". BB_BT_TRACKER_SNAP);
$data['seeders'] = number_format($row['seeders']);
$data['leechers'] = number_format($row['leechers']);
$data['peers'] = number_format($row['seeders'] + $row['leechers']);
$data['speed'] = $row['speed'];
// peers stat
$row = DB()->fetch_row("SELECT SUM(seeders) AS seeders, SUM(leechers) AS leechers, ((SUM(speed_up) + SUM(speed_down))/2) AS speed FROM ". BB_BT_TRACKER_SNAP);
$data['seeders'] = number_format($row['seeders']);
$data['leechers'] = number_format($row['leechers']);
$data['peers'] = number_format($row['seeders'] + $row['leechers']);
$data['speed'] = $row['speed'];
}
// gender stat
if ($bb_cfg['gender'])
{
$sql = DB()->fetch_rowset("SELECT user_gender FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")");
$data['male'] = $data['female'] = $data['unselect'] = 0;
$sql = DB()->fetch_rowset("SELECT user_gender FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")");
$data['male'] = $data['female'] = $data['unselect'] = 0;
foreach($sql as $row)
{
if($row['user_gender'] == MALE) $data['male']++;
if($row['user_gender'] == FEMALE) $data['female']++;
if(!$row['user_gender']) $data['unselect']++;
}
foreach ($sql as $row)
{
if($row['user_gender'] == MALE) $data['male']++;
if($row['user_gender'] == FEMALE) $data['female']++;
if(!$row['user_gender']) $data['unselect']++;
}
}
// birthday stat
if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
{
$sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday IS NOT NULL ORDER BY user_level DESC, username");
$sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != '0000-00-00' AND user_active = 1 ORDER BY user_level DESC, username");
$this_year = bb_date(TIMENOW, 'Y', 'false');
$date_today = bb_date(TIMENOW, 'Ymd', 'false');
$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday_check_day']*86400), 'Ymd', 'false');
@ -89,7 +89,7 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
}
$data['birthday_today_list'] = $birthday_today_list;
$data['birthday_week_list'] = $birthday_week_list;
$data['birthday_week_list'] = $birthday_week_list;
}
$this->store('stats', $data);

2
upload/includes/init_bb.php
View file

@ -147,7 +147,7 @@ define('USER_ACTIVATION_ADMIN', 2);
define('USER_AVATAR_NONE', 0);
define('USER_AVATAR_UPLOAD', 1);
define('USER_AVATAR_REMOTE', 2); // не ипользуется
define('USER_AVATAR_REMOTE', 2); // не используется
define('USER_AVATAR_GALLERY', 3);
// Group settings