From 5cb2a7e2747442e27fbf748bfb20cdae4577fd8a Mon Sep 17 00:00:00 2001 From: "glix08@gmail.com" Date: Sun, 12 Jan 2014 21:02:48 +0000 Subject: [PATCH] r556 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс http://torrentpier.me/threads/23983/ git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@556 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- mods/Virtual Keyboard/kb.tpl | 10 +++--- upload/config.php | 2 +- upload/develop/open_editor.php | 3 +- upload/includes/bbcode.php | 4 +-- upload/includes/datastore/build_stats.php | 40 +++++++++++------------ upload/includes/init_bb.php | 2 +- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/mods/Virtual Keyboard/kb.tpl b/mods/Virtual Keyboard/kb.tpl index 0ff2103ab..935fa6c3f 100644 --- a/mods/Virtual Keyboard/kb.tpl +++ b/mods/Virtual Keyboard/kb.tpl @@ -24,20 +24,20 @@ var l_letter=new Array('`','1','2','3','4','5','6','7','8','9','0','-','=','q',' {L_KB_TITLE}
- {L_KB_TRANSLIT}
- {L_KB_RULES}
- {L_HIDE} + {L_KB_TRANSLIT}
+ {L_KB_RULES}
+ {L_HIDE}
-
{L_KB_SHOW}
+
{L_KB_SHOW}
- + diff --git a/upload/config.php b/upload/config.php index dbdc21eb0..249babac6 100644 --- a/upload/config.php +++ b/upload/config.php @@ -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'; diff --git a/upload/develop/open_editor.php b/upload/develop/open_editor.php index 49e89d869..c068d81ed 100644 --- a/upload/develop/open_editor.php +++ b/upload/develop/open_editor.php @@ -12,5 +12,4 @@ $prog_args = $_GET['args']; $command = "$interpreter $prog_path $prog_args"; exec($command); echo ''; -exit; - +exit; \ No newline at end of file diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index b778234f7..7757beffb 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -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"); -} +} \ No newline at end of file diff --git a/upload/includes/datastore/build_stats.php b/upload/includes/datastore/build_stats.php index b2b5d0149..c85d758c7 100644 --- a/upload/includes/datastore/build_stats.php +++ b/upload/includes/datastore/build_stats.php @@ -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); \ No newline at end of file diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 27fdd4357..873ee4bee 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -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
{L_KB_RULES}{L_KB_CLOSE}{L_KB_CLOSE}
а
б
в
г
д
е