From 0eb7faeed7381b0bced0867d7fc54182bab8428f Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sun, 30 Jul 2017 11:25:57 +0300 Subject: [PATCH] Some deprecations, normalize.css, torrent file content sort fix. --- common.php | 3 +- library/ajax/sitemap.php | 6 - library/includes/cron/jobs/sitemap.php | 1 - library/language/source/main.php | 2 +- src/Legacy/Common/User.php | 8 +- src/Legacy/TorrentFileList.php | 2 +- styles/templates/default/css/main.css | 3 +- styles/templates/default/css/normalize.css | 447 +++++++++++++++++++++ 8 files changed, 455 insertions(+), 17 deletions(-) create mode 100644 styles/templates/default/css/normalize.css diff --git a/common.php b/common.php index ed951adc8d..c2e5c4d9e7 100644 --- a/common.php +++ b/common.php @@ -264,8 +264,7 @@ function file_write($str, $file, $max_size = LOG_MAX_SIZE, $lock = true, $replac $old_name = $file; $ext = ''; if (preg_match('#^(.+)(\.[^\\\/]+)$#', $file, $matches)) { - $old_name = $matches[1]; - $ext = $matches[2]; + list($old_name, $ext) = $matches; } $new_name = $old_name . '_[old]_' . date('Y-m-d_H-i-s_') . getmypid() . $ext; clearstatcache(); diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php index 838fe48f0f..538b361d5c 100644 --- a/library/ajax/sitemap.php +++ b/library/ajax/sitemap.php @@ -56,12 +56,6 @@ $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: ' . $lang['SITEMAP_ERROR'] . ' URL: http://google.com/webmasters/sitemaps/ping?sitemap=' . $map_link . ''; } - if ($map->sendSitemap('http://ping.blogs.yandex.ru/ping?sitemap=', $map_link)) { - $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: ' . $lang['SITEMAP_SENT'] . ''; - } else { - $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: ' . $lang['SITEMAP_ERROR'] . ' URL: http://ping.blogs.yandex.ru/ping?sitemap=' . $map_link . ''; - } - if ($map->sendSitemap('http://www.bing.com/ping?sitemap=', $map_link)) { $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: ' . $lang['SITEMAP_SENT'] . ''; } else { diff --git a/library/includes/cron/jobs/sitemap.php b/library/includes/cron/jobs/sitemap.php index e8c442bfa2..27b3ea1d88 100644 --- a/library/includes/cron/jobs/sitemap.php +++ b/library/includes/cron/jobs/sitemap.php @@ -34,6 +34,5 @@ $map_link = make_url('sitemap/sitemap.xml'); $map->sendSitemap('http://google.com/webmasters/sitemaps/ping?sitemap=', $map_link); - $map->sendSitemap('http://ping.blogs.yandex.ru/ping?sitemap=', $map_link); $map->sendSitemap('http://www.bing.com/ping?sitemap=', $map_link); } diff --git a/library/language/source/main.php b/library/language/source/main.php index 3d6fbc9d34..0a6a9e27f0 100644 --- a/library/language/source/main.php +++ b/library/language/source/main.php @@ -846,7 +846,7 @@ $lang['NOT_MODERATOR'] = 'You are not a moderator of this forum.'; $lang['NOT_AUTHORISED'] = 'Not Authorised'; -$lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.
Please contact the webmaster or board administrator for more information.'; +$lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum. Please contact the board administrator for more information.'; // Viewonline $lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes'; diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php index 992f364e72..5fbcdcc021 100644 --- a/src/Legacy/Common/User.php +++ b/src/Legacy/Common/User.php @@ -239,7 +239,7 @@ public function session_start(array $cfg = []) */ public function session_create($userdata, $auto_created = false) { - global $bb_cfg; + global $bb_cfg, $lang; $this->data = $userdata; $session_id = $this->sessiondata['sid']; @@ -254,10 +254,8 @@ public function session_create($userdata, $auto_created = false) $where_sql = 'ban_ip = ' . USER_IP; $where_sql .= $login ? " OR ban_userid = $user_id" : ''; - $sql = "SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1"; - - if (DB()->fetch_row($sql)) { - header('Location: https://torrentpier.com/banned/'); + if (DB()->fetch_row("SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1")) { + bb_simple_die($lang['YOU_BEEN_BANNED']); } } diff --git a/src/Legacy/TorrentFileList.php b/src/Legacy/TorrentFileList.php index 5ebf7cb272..724d93e31e 100644 --- a/src/Legacy/TorrentFileList.php +++ b/src/Legacy/TorrentFileList.php @@ -114,7 +114,7 @@ private function build_filelist_array() $cur_files_ary[] = $this->build_file_item($name, $length); } } - natsort($cur_files_ary); + asort($cur_files_ary); } else { $name = $f['path'][0]; $this->files_ary['/'][] = $this->build_file_item($name, $length); diff --git a/styles/templates/default/css/main.css b/styles/templates/default/css/main.css index 0e70008a40..31393d1fae 100644 --- a/styles/templates/default/css/main.css +++ b/styles/templates/default/css/main.css @@ -22,11 +22,12 @@ * SOFTWARE. */ +@import "normalize.css"; +@import "initial.css"; @import "ajax.css"; @import "alert.css"; @import "globals.css"; @import "images.css"; -@import "initial.css"; @import "main_content.css"; @import "menus.css"; @import "misc.css"; diff --git a/styles/templates/default/css/normalize.css b/styles/templates/default/css/normalize.css new file mode 100644 index 0000000000..fa4e73dd41 --- /dev/null +++ b/styles/templates/default/css/normalize.css @@ -0,0 +1,447 @@ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +}