From 7c7573eb4882875c1fea85dd2c56596e09398f58 Mon Sep 17 00:00:00 2001 From: Git Date: Fri, 15 Feb 2013 08:00:35 +0000 Subject: [PATCH] Empty commit --- classes/class_torrents.php | 6 +- design/privateheader.php | 28 + design/views/generic/reply/staffpm.php | 48 +- sections/artist/artist_rearrange.php | 2 +- sections/forums/forum.php | 3 - sections/index/private.php | 19 +- sections/requests/request.php | 30 +- sections/requests/requests.php | 40 +- sections/requests/requests.php.presphinx | 50 +- sections/staffblog/index.php | 23 +- sections/tools/data/bitcoin_balance.php | 2 +- sections/tools/data/suggestions.php | 3 +- sections/tools/managers/dnu_list.php | 17 +- sections/top10/history.php | 12 +- sections/torrents/index.php | 1 + sections/torrents/notify.php | 4 +- sections/torrents/notify_actions.php | 14 + sections/userhistory/subscribed_collages.php | 46 +- sections/wiki/article.php | 2 +- static/functions/notifications.js | 55 +- static/styles/celebrate/banner.gif | Bin 9811 -> 0 bytes static/styles/celebrate/celebrate.css | 10 - static/styles/celebrate/celebratetheme.css | 1035 ----------------- static/styles/celebrate/fireworks.jpg | Bin 687393 -> 0 bytes static/styles/celebrate/images/Akzidenz.otf | Bin 31440 -> 0 bytes static/styles/celebrate/images/Avant.otf | Bin 32760 -> 0 bytes .../styles/celebrate/images/CorpidOffice.ttf | Bin 101416 -> 0 bytes static/styles/celebrate/images/Officina.otf | Bin 35440 -> 0 bytes .../styles/celebrate/images/alert-overlay.png | Bin 135 -> 0 bytes static/styles/celebrate/images/bg_header.png | Bin 145 -> 0 bytes static/styles/celebrate/images/bg_inputs.png | Bin 284 -> 0 bytes static/styles/celebrate/images/bg_menu.png | Bin 3082 -> 0 bytes static/styles/celebrate/images/body.jpg | Bin 7313 -> 0 bytes .../styles/celebrate/images/content_light.png | Bin 192 -> 0 bytes static/styles/celebrate/images/external.png | Bin 178 -> 0 bytes static/styles/celebrate/images/gazelle.png | Bin 4256 -> 0 bytes .../styles/celebrate/images/go_last_read.png | Bin 3209 -> 0 bytes static/styles/celebrate/images/hide.png | Bin 122 -> 0 bytes static/styles/celebrate/images/leechers.png | Bin 210 -> 0 bytes static/styles/celebrate/images/load.gif | Bin 723 -> 0 bytes .../styles/celebrate/images/locked_read.png | Bin 596 -> 0 bytes .../celebrate/images/locked_sticky_read.png | Bin 546 -> 0 bytes .../celebrate/images/locked_sticky_unread.png | Bin 3228 -> 0 bytes .../styles/celebrate/images/locked_unread.png | Bin 608 -> 0 bytes static/styles/celebrate/images/logo.png | Bin 1457 -> 0 bytes static/styles/celebrate/images/nav_matrix.png | Bin 8988 -> 0 bytes .../celebrate/images/nav_matrix_extended.png | Bin 19434 -> 0 bytes .../styles/celebrate/images/nu_nav_matrix.png | Bin 38402 -> 0 bytes static/styles/celebrate/images/poll_left.png | Bin 3087 -> 0 bytes .../styles/celebrate/images/poll_middle.png | Bin 2850 -> 0 bytes static/styles/celebrate/images/poll_right.png | Bin 3166 -> 0 bytes static/styles/celebrate/images/read.png | Bin 696 -> 0 bytes static/styles/celebrate/images/seeders.png | Bin 204 -> 0 bytes static/styles/celebrate/images/show.png | Bin 127 -> 0 bytes static/styles/celebrate/images/snatched.png | Bin 281 -> 0 bytes .../styles/celebrate/images/sticky_read.png | Bin 400 -> 0 bytes .../styles/celebrate/images/sticky_unread.png | Bin 3072 -> 0 bytes .../styles/celebrate/images/table_header.png | Bin 462 -> 0 bytes .../celebrate/images/table_header_dark.png | Bin 356 -> 0 bytes static/styles/celebrate/images/unread.png | Bin 3301 -> 0 bytes static/styles/celebrate/images/wood.jpg | Bin 514011 -> 0 bytes static/styles/celebrate/images/woodlogo.png | Bin 4216 -> 0 bytes static/styles/celebrate/images/wrapper.png | Bin 761603 -> 0 bytes .../images/icons/minimal_mod_alt_apps.png | Bin 0 -> 3367 bytes .../icons/minimal_mod_alt_audiobook.png | Bin 0 -> 1390 bytes .../images/icons/minimal_mod_alt_comedy.png | Bin 0 -> 3620 bytes .../images/icons/minimal_mod_alt_ebook.png | Bin 0 -> 1372 bytes .../images/icons/minimal_mod_alt_learning.png | Bin 0 -> 3630 bytes .../images/icons/minimal_mod_alt_music.png | Bin 0 -> 1294 bytes .../images/icons/minimal_mod_alt_shield.png | Bin 0 -> 3681 bytes .../images/minimal_mod_alt_balloon.png | Bin 0 -> 2980 bytes .../images/minimal_mod_alt_balloon_unread.png | Bin 0 -> 3152 bytes .../minimal_mod_alt_lock-sticky-unread.png} | Bin 2944 -> 3061 bytes .../minimal/images/minimal_mod_alt_lock.png | Bin 0 -> 3016 bytes .../images/minimal_mod_alt_lock_unread.png | Bin 0 -> 3157 bytes .../images/minimal_mod_alt_new.png} | Bin 2804 -> 2894 bytes .../minimal/images/minimal_mod_alt_sprite.png | Bin 0 -> 3502 bytes .../minimal/images/minimal_mod_alt_sticky.png | Bin 0 -> 3030 bytes .../images/minimal_mod_alt_sticky_unread.png | Bin 0 -> 3184 bytes .../minimal/images/minimal_mod_sprite.png | Bin 0 -> 11157 bytes static/styles/minimal/style.css | 2 +- static/styles/minimal/style2.css | 64 +- static/styles/minimal_mod_alt.css | 72 +- 83 files changed, 306 insertions(+), 1282 deletions(-) delete mode 100644 static/styles/celebrate/banner.gif delete mode 100644 static/styles/celebrate/celebrate.css delete mode 100644 static/styles/celebrate/celebratetheme.css delete mode 100644 static/styles/celebrate/fireworks.jpg delete mode 100644 static/styles/celebrate/images/Akzidenz.otf delete mode 100644 static/styles/celebrate/images/Avant.otf delete mode 100644 static/styles/celebrate/images/CorpidOffice.ttf delete mode 100644 static/styles/celebrate/images/Officina.otf delete mode 100644 static/styles/celebrate/images/alert-overlay.png delete mode 100644 static/styles/celebrate/images/bg_header.png delete mode 100644 static/styles/celebrate/images/bg_inputs.png delete mode 100644 static/styles/celebrate/images/bg_menu.png delete mode 100644 static/styles/celebrate/images/body.jpg delete mode 100644 static/styles/celebrate/images/content_light.png delete mode 100644 static/styles/celebrate/images/external.png delete mode 100644 static/styles/celebrate/images/gazelle.png delete mode 100644 static/styles/celebrate/images/go_last_read.png delete mode 100644 static/styles/celebrate/images/hide.png delete mode 100644 static/styles/celebrate/images/leechers.png delete mode 100644 static/styles/celebrate/images/load.gif delete mode 100644 static/styles/celebrate/images/locked_read.png delete mode 100644 static/styles/celebrate/images/locked_sticky_read.png delete mode 100644 static/styles/celebrate/images/locked_sticky_unread.png delete mode 100644 static/styles/celebrate/images/locked_unread.png delete mode 100644 static/styles/celebrate/images/logo.png delete mode 100644 static/styles/celebrate/images/nav_matrix.png delete mode 100644 static/styles/celebrate/images/nav_matrix_extended.png delete mode 100644 static/styles/celebrate/images/nu_nav_matrix.png delete mode 100644 static/styles/celebrate/images/poll_left.png delete mode 100644 static/styles/celebrate/images/poll_middle.png delete mode 100644 static/styles/celebrate/images/poll_right.png delete mode 100644 static/styles/celebrate/images/read.png delete mode 100644 static/styles/celebrate/images/seeders.png delete mode 100644 static/styles/celebrate/images/show.png delete mode 100644 static/styles/celebrate/images/snatched.png delete mode 100644 static/styles/celebrate/images/sticky_read.png delete mode 100644 static/styles/celebrate/images/sticky_unread.png delete mode 100644 static/styles/celebrate/images/table_header.png delete mode 100644 static/styles/celebrate/images/table_header_dark.png delete mode 100644 static/styles/celebrate/images/unread.png delete mode 100644 static/styles/celebrate/images/wood.jpg delete mode 100644 static/styles/celebrate/images/woodlogo.png delete mode 100644 static/styles/celebrate/images/wrapper.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_apps.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_audiobook.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_comedy.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_ebook.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_learning.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_music.png create mode 100644 static/styles/minimal/images/icons/minimal_mod_alt_shield.png create mode 100644 static/styles/minimal/images/minimal_mod_alt_balloon.png create mode 100644 static/styles/minimal/images/minimal_mod_alt_balloon_unread.png rename static/styles/{celebrate/images/bg_footer.png => minimal/images/minimal_mod_alt_lock-sticky-unread.png} (87%) create mode 100644 static/styles/minimal/images/minimal_mod_alt_lock.png create mode 100644 static/styles/minimal/images/minimal_mod_alt_lock_unread.png rename static/styles/{celebrate/images/content.png => minimal/images/minimal_mod_alt_new.png} (92%) create mode 100644 static/styles/minimal/images/minimal_mod_alt_sprite.png create mode 100644 static/styles/minimal/images/minimal_mod_alt_sticky.png create mode 100644 static/styles/minimal/images/minimal_mod_alt_sticky_unread.png create mode 100644 static/styles/minimal/images/minimal_mod_sprite.png diff --git a/classes/class_torrents.php b/classes/class_torrents.php index e3fb6364..7d11622c 100644 --- a/classes/class_torrents.php +++ b/classes/class_torrents.php @@ -455,7 +455,7 @@ public static function regenerate_filelist($TorrentID) { $TmpFileList[] = self::filelist_format_file($File); } $FilePath = isset($Tor->Val['info']->Val['files']) ? Format::make_utf8($Tor->get_name()) : ""; - $FileString = Format::make_utf8(implode("\n", $TmpFileList)); + $FileString = implode("\n", $TmpFileList); $DB->query("UPDATE torrents SET Size = ".$TotalSize.", FilePath = '".db_string($FilePath)."', FileList = '".db_string($FileString)."' WHERE ID = ".$TorrentID); $Cache->delete_value('torrents_details_'.$GroupID); } @@ -482,8 +482,8 @@ public static function filelist_format_file($File) { list($Size, $Name) = $File; $Name = Format::make_utf8(strtr($Name, "\n\r\t", " ")); $ExtPos = strrpos($Name, '.'); - $Ext = $ExtPos ? substr($Name, $ExtPos) : ''; - return sprintf("%s s%ds %s %s", $Ext, $Size, $Name, self::filelist_delim()); + $Ext = $ExtPos ? trim(substr($Name, $ExtPos+1)) : ''; + return sprintf("%s s%ds %s %s", ".$Ext", $Size, $Name, self::filelist_delim()); } /** diff --git a/design/privateheader.php b/design/privateheader.php index d16a8f2b..bf1b8e99 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -242,6 +242,34 @@ $Alerts[] = ''.'New Blog Post!'.''; } +// Staff blog +if(check_perms('users_mod')) { + global $SBlogReadTime, $LatestSBlogTime; + if (!$SBlogReadTime && ($SBlogReadTime = $Cache->get_value('staff_blog_read_'.$LoggedUser['ID'])) === false) { + $DB->query("SELECT Time FROM staff_blog_visits WHERE UserID = ".$LoggedUser['ID']); + if (list($SBlogReadTime) = $DB->next_record()) { + $SBlogReadTime = strtotime($SBlogReadTime); + } else { + $SBlogReadTime = 0; + } + $Cache->cache_value('staff_blog_read_'.$LoggedUser['ID'], $SBlogReadTime, 1209600); + } + if (!$LatestSBlogTime && ($LatestSBlogTime = $Cache->get_value('staff_blog_latest_time')) === false) { + $DB->query("SELECT MAX(Time) FROM staff_blog"); + if (list($LatestSBlogTime) = $DB->next_record()) { + $LatestSBlogTime = strtotime($LatestSBlogTime); + } else { + $LatestSBlogTime = 0; + } + $Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600); + } + if ($SBlogReadTime < $LatestSBlogTime) { + global $Debug; + $Debug->log_var(array('b' => $SBlogReadTime, 'l' => $LatestSBlogTime), 'Times'); + $Alerts[] = ''.'New Staff Blog Post!'.''; + } +} + //Staff PM $NewStaffPMs = $Cache->get_value('staff_pm_new_'.$LoggedUser['ID']); if ($NewStaffPMs === false) { diff --git a/design/views/generic/reply/staffpm.php b/design/views/generic/reply/staffpm.php index 7b8ddceb..1803555d 100644 --- a/design/views/generic/reply/staffpm.php +++ b/design/views/generic/reply/staffpm.php @@ -1,25 +1,25 @@ -
-
- -

- -
- -

- -
- - Send to: - - - - - -
+
+
+ +

+ +
+ +

+ +
+ + Send to: + + + + + +
\ No newline at end of file diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php index 5e8d8bb5..9d404b5c 100644 --- a/sections/artist/artist_rearrange.php +++ b/sections/artist/artist_rearrange.php @@ -360,7 +360,7 @@ function display_name($ReleaseType) { - [ DL ] + DL   »  diff --git a/sections/forums/forum.php b/sections/forums/forum.php index be2ed7d9..a6095837 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -111,9 +111,6 @@
- - Scoreboard - to_array(); - $Cache->cache_value('staff_blog',$Blog,1209600); + $Blog = $DB->to_array(false, MYSQLI_NUM); + $Cache->cache_value('staff_blog', $Blog, 1209600); } -if(($ReadTime = $Cache->get_value('staff_blog_read_'.$LoggedUser['ID'])) === false) { +if (($SBlogReadTime = $Cache->get_value('staff_blog_read_'.$LoggedUser['ID'])) === false) { $DB->query("SELECT Time FROM staff_blog_visits WHERE UserID = ".$LoggedUser['ID']); - if (list($ReadTime) = $DB->next_record()) { - $ReadTime = strtotime($ReadTime); + if (list($SBlogReadTime) = $DB->next_record()) { + $SBlogReadTime = strtotime($SBlogReadTime); } else { - $ReadTime = 0; + $SBlogReadTime = 0; } - $Cache->cache_value('staff_blog_read_'.$LoggedUser['ID'],$ReadTime,1209600); + $Cache->cache_value('staff_blog_read_'.$LoggedUser['ID'], $SBlogReadTime, 1209600); } ?>