Enable thumbnailing

classes/imagetools.class.php

@@ -11,12 +11,12 @@ class ImageTools {
    * @param string $Url image URL
    * @return image proxy URL
    */
-  public static function proxy_url($Url) {
+  public static function proxy_url($Url, $Thumb = false) {
     if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.IMAGE_DOMAIN.')\//', $Url) || $Url[0]=='/') {
       if (strpos($Url, '?') === false) $Url .= '?';
       return $Url;
     } else {
-      return 'https://'.IMAGE_DOMAIN.'/?h='.rawurlencode(base64_encode(hash_hmac('sha256', $Url, IMAGE_PSK, true))).'&i='.urlencode($Url);
+      return 'https://'.IMAGE_DOMAIN.($Thumb?'/thumb/':'/').'?h='.rawurlencode(base64_encode(hash_hmac('sha256', $Url, IMAGE_PSK, true))).'&i='.urlencode($Url);
     }
   }
 
@@ -28,7 +28,7 @@ class ImageTools {
    */
   public static function process($Url = '', $Thumb = false) {
     // TODO: Thumbnailing
-    return $Url ? self::proxy_url($Url) : '';
+    return $Url ? self::proxy_url($Url, $Thumb) : '';
   }
 
   /**

sections/torrents/browse.php

@@ -524,7 +524,7 @@ View::show_header('Browse Torrents', 'browse');
     $CoverArt = $GroupInfo['WikiImage'];
     $DisplayName .= "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt)."\" onmouseleave=\"ungetCover(event)\" ";
+      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt, true)."\" onmouseleave=\"ungetCover(event)\" ";
     }
     $DisplayName .= "dir=\"ltr\">$GroupName</a>";
     if ($GroupYear) {
@@ -642,7 +642,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     $CoverArt = $GroupInfo['WikiImage'];
     $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt)."\" onmouseleave=\"ungetCover(event)\" ";
+      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt, true)."\" onmouseleave=\"ungetCover(event)\" ";
     }
     $DisplayName .= "dir=\"ltr\">$GroupName</a>";
     if (isset($GroupedCategories[$CategoryID - 1])) {

sections/torrents/details.php

@@ -186,7 +186,7 @@ View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,su
 <div id="covers">
 <div id="cover_div_<?=$Index?>">
 <?  if ($WikiImage != '') { ?>
-      <div><img width="100%" class="lightbox-init" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$AltName?>" /></div>
+      <div><img width="100%" class="lightbox-init" src="<?=ImageTools::process($WikiImage, true)?>" lightbox-img="<?=ImageTools::process($WikiImage)?>" alt="<?=$AltName?>" /></div>
 <?  } else { ?>
       <div><img width="100%" src="<?=STATIC_SERVER?>common/noartwork/nocover.png" alt="<?=$Categories[$GroupCategoryID - 1]?>" class="brackets tooltip" title="<?=$Categories[$GroupCategoryID - 1]?>" /></div>
 <?
@@ -201,9 +201,9 @@ $Index++;
         <div>
 <?
           if (empty($LoggedUser['ShowExtraCovers'])) {
-            $Src = 'src="" data-gazelle-temp-src="' . ImageTools::process($Image, true) . '"';
+            $Src = 'src="" data-gazelle-temp-src="' . ImageTools::process($Image, true) . '" lightbox-img="'.ImageTools::process($Image).'"';
           } else {
-            $Src = 'src="' . ImageTools::process($Image, true) . '"';
+            $Src = 'src="' . ImageTools::process($Image, true) . '" lightbox-img="'.ImageTools::process($Image).'"';
           }
 ?>
           <img id="cover_<?=$Index?>" class="lightbox-init" width="100%" <?=$Src?> alt="<?=$Summary?>" />
@@ -778,10 +778,11 @@ if (count($PersonalCollages) > 0) {
 <?
     foreach($Screenshots as $Screenshot) {
       $SSURL = ImageTools::process($Screenshot['Image']);
+      $ThumbURL = ImageTools::process($Screenshot['Image'], true);
       if (check_perms('users_mod')) {
-        ?><img class='tooltip lightbox-init' title='<?=Users::format_username($Screenshot['UserID'], false, false, false)?> - <?=time_diff($Screenshot['Time'])?>' data-src="<?=$SSURL?>" /><?
+        ?><img class='tooltip lightbox-init' title='<?=Users::format_username($Screenshot['UserID'], false, false, false)?> - <?=time_diff($Screenshot['Time'])?>' lightbox-img="<?=$SSURL?>" src="<?=$ThumbURL?>" /><?
       } else {
-        ?><img class='tooltip lightbox-init' title='Added <?=time_diff($Screenshot['Time'])?>' data-src="<?=$SSURL?>" /><?
+        ?><img class='tooltip lightbox-init' title='Added <?=time_diff($Screenshot['Time'])?>' lightbox-img="<?=$SSURL?>" src="<?=$ThumbURL?>" /><?
       }
     }
 ?>

static/functions/browse.js

@@ -280,11 +280,4 @@ $(function() {
     var els = $('#torrent_table.grouping .colhead td:first-child(), #torrent_table.grouping .colhead_dark td:first-child(), #torrent_table.grouping .torrent td:first-child()')
     for (var i = 0; i < els.length; i++) { els[i].style.display = 'none' }
   }
-/*
-  //Preload first result's cover
-  if ($('#torrent_table').length > 0) {
-    var a = $('a[data-cover]')[0]
-    if (a) preload(a.attributes['data-cover'].value)
-  }
- */
 })

static/functions/global.js

@@ -260,7 +260,7 @@ window.onkeydown = function(e) {
   e = e || window.event
   if (e.keyCode == 37 || e.keyCode == 39) {
     if ($('#lightbox').raw() && !$('#lightbox').raw().classList.contains('hidden')) {
-      ($('[id!="lightbox"] > [src="'+$('#lightbox > img').raw().src+'"]').raw()[((e.keyCode==39)?'next':'previous')+'Sibling'].click()||function(){})()
+      ($('[id!="lightbox"] > [lightbox-img="'+$('#lightbox > img').raw().src+'"]').raw()[((e.keyCode==39)?'next':'previous')+'Sibling'].click()||function(){})()
     }
   }
 }
@@ -311,7 +311,6 @@ function getCover(event) {
   $('#coverCont img')[0].src = image?image:'/static/common/noartwork/nocover.png'
   coverCont.className = (event.clientX > (window.innerWidth/2)) ? 'left' : 'right'
   coverCont.style.display = 'block'
-/*
   //Preload next image
   if ($('.torrent_table, .request_table').length > 0) {
     var as = $('[data-cover]')
@@ -319,7 +318,6 @@ function getCover(event) {
     preload((as[as.toArray().indexOf(a)+1]||as[0]).attributes['data-cover'].value)
     preload((as[as.toArray().indexOf(a)-1]||as[0]).attributes['data-cover'].value)
   }
-*/
 }
 function ungetCover(event) {
   $('#coverCont img').remove()
@@ -333,12 +331,6 @@ if (typeof NodeList.prototype.forEach !== 'function') {
 }
 
 $(function() {
-/*
-  if ($('.request_table').length > 0) {
-    var a = $('[data-cover]')[0]
-    if (a) preload(a.attributes['data-cover'].value)
-  }
-*/
   document.querySelectorAll('[data-toggle-target]').forEach(function(el) {
     el.addEventListener('click', function(event) {
       $(el.attributes['data-toggle-target'].value).gtoggle()
@@ -349,6 +341,6 @@ $(function() {
   })
 
   $(document).on('click', '.lightbox-init', function(e) {
-    lightbox.init(e.target.attributes['lightbox-img']||e.target.src, e.target.attributes['lightbox-size']||e.target.width)
+    lightbox.init((e.target.attributes['lightbox-img']||[]).value||e.target.src, (e.target.attributes['lightbox-size']||[]).value||e.target.width)
   })
 })

static/functions/torrent.js

@@ -188,11 +188,3 @@ function Vote(amount, requestid) {
     }
   );
 }
-
-$(() => {
-  $('.torrent_screenshots_box > .head > a[data-toggle-replace]').on('click', event => {
-    $('.torrent_screenshots > img').each((i, el) => {
-      el.src = $(el).data('src')
-    })
-  })
-})