Support arbitrary thumbnailing profiles

classes/imagetools.class.php

@@ -7,30 +7,21 @@
 class ImageTools {
 
   /**
-   * Create image proxy URL
-   * @param string $Url image URL
-   * @return image proxy URL
+   * Determine the image URL. This takes care of the image proxy and thumbnailing.
+   * @param string $Url
+   * @param string $Thumb image proxy scale profile to use
+   * @return string
    */
-  public static function proxy_url($Url, $Thumb = false) {
+  public static function process($Url = '', $Thumb = false) {
+    if (!$Url) return '';
     if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.IMAGE_DOMAIN.')\//', $Url) || $Url[0]=='/') {
       if (strpos($Url, '?') === false) $Url .= '?';
       return $Url;
     } else {
-      return 'https://'.IMAGE_DOMAIN.($Thumb?'/thumb/':'/').'?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);
     }
   }
 
-  /**
-   * Determine the image URL. This takes care of the image proxy and thumbnailing.
-   * @param string $Url
-   * @param bool $Thumb
-   * @return string
-   */
-  public static function process($Url = '', $Thumb = false) {
-    // TODO: Thumbnailing
-    return $Url ? self::proxy_url($Url, $Thumb) : '';
-  }
-
   /**
    * Checks if a link's host is (not) good, otherwise displays an error.
    * @param string $Url Link to an image

classes/text.class.php

@@ -732,7 +732,7 @@ class Text {
                 }
                 $Str .= '"';
                 if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-                  $Str .= " onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($Group['WikiImage'], true)."\" onmouseleave=\"ungetCover(event)\"";
+                  $Str .= " onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($Group['WikiImage'], 'thumb')."\" onmouseleave=\"ungetCover(event)\"";
                 }
                 $Name = empty($Group['Name']) ? (empty($Group['NameRJ']) ? $Group['NameJP'] : $Group['NameRJ']) : $Group['Name'];
                 $Str .= '>'.$Name.'</a>';

classes/users.class.php

@@ -521,7 +521,7 @@ class Users {
    * @return string
    */
   public static function show_avatar($Avatar, $UserID, $Username, $Setting, $Size = 150, $ReturnHTML = true) {
-    $Avatar = ImageTools::process($Avatar);
+    $Avatar = ImageTools::process($Avatar, 'avatar');
     $Style = 'style="max-height: 400px;"';
     $AvatarMouseOverText = '';
     $SecondAvatar = '';
@@ -538,7 +538,7 @@ class Users {
       $AvatarMouseOverText = "alt=\"$Username's avatar\"";
     }
     if ($EnabledRewards['HasSecondAvatar'] && !empty($Rewards['SecondAvatar'])) {
-      $SecondAvatar = ' data-gazelle-second-avatar="' . ImageTools::process($Rewards['SecondAvatar']) . '"';
+      $SecondAvatar = ' data-gazelle-second-avatar="' . ImageTools::process($Rewards['SecondAvatar'], 'avatar') . '"';
     }
     // case 1 is avatars disabled
     switch ($Setting) {

sections/artist/artist.php

@@ -206,7 +206,7 @@ foreach ($TorrentList as $Group) {
 
     $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" class=\"tooltip\" title=\"View torrent group\" ";
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover()" ';
+      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover()" ';
     }
 
     $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
@@ -312,7 +312,7 @@ foreach ($TorrentList as $Group) {
 
     $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($WikiImage, true)."\" onmouseleave=\"ungetCover(event)\" ";
+      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($WikiImage, 'thumb')."\" onmouseleave=\"ungetCover(event)\" ";
     }
 
     $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
@@ -463,7 +463,7 @@ if (check_perms('site_torrents_notify')) {
     <div class="box box_image">
       <div class="head"><strong><?=$Name?></strong></div>
       <div style="text-align: center; padding: 10px 0px;">
-        <img style="max-width: 220px;" class="lightbox-init" src="<?=ImageTools::process($Image, true)?>" alt="<?=$Name?>" />
+        <img style="max-width: 220px;" class="lightbox-init" src="<?=ImageTools::process($Image, 'thumb')?>" alt="<?=$Name?>" />
       </div>
     </div>
 <?  } ?>

sections/better/covers.php

@@ -52,7 +52,7 @@ foreach ($Results as $Result) {
 
   $DisplayName = "<a href=\"torrents.php?id=$ID\" class=\"tooltip\" title=\"View torrent group\" ";
   if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)" ';
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
   }
   $DisplayName .= "dir=\"ltr\">$Name</a>";
   if ($Year > 0) {

sections/better/screenshots.php

@@ -54,7 +54,7 @@ foreach ($Results as $Result) {
 
   $DisplayName = "<a href=\"torrents.php?id=$ID\" class=\"tooltip\" title=\"View torrent group\" ";
   if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)" ';
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
   }
   $DisplayName .= "dir=\"ltr\">$LangName</a>";
   if ($Year > 0) {

sections/bookmarks/torrents.php

@@ -248,7 +248,7 @@ foreach ($GroupIDs as $GroupID) {
     <li class="image_group_<?=$GroupID?>">
       <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
 <?  if ($WikiImage) { ?>
-        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
+        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
 <?  } else { ?>
         <div style="width: 107px; padding: 5px;"><?=$DisplayName?></div>
 <?  } ?>
@@ -260,7 +260,7 @@ foreach ($GroupIDs as $GroupID) {
 <?  if (!$WikiImage) {
       $WikiImage = STATIC_SERVER.'common/noartwork/nocover.png';
 } ?>
-        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
+        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
       </a>
     </div>
 

sections/collages/artist_collage.php

@@ -47,7 +47,7 @@ foreach ($Artists as $Artist) {
         <li class="image_group_<?=$Artist['ArtistID']?>">
           <a href="artist.php?id=<?=$Artist['ArtistID']?>">
 <?  if ($Artist['Image']) { ?>
-            <img class="tooltip" src="<?=ImageTools::process($Artist['Image'], true)?>" alt="<?=$Artist['Name']?>" title="<?=$Artist['Name']?>" width="118" />
+            <img class="tooltip" src="<?=ImageTools::process($Artist['Image'], 'thumb')?>" alt="<?=$Artist['Name']?>" title="<?=$Artist['Name']?>" width="118" />
 <?  } else { ?>
             <span style="width: 107px; padding: 5px;"><?=$Artist['Name']?></span>
 <?  } ?>

sections/collages/torrent_collage.php

@@ -71,7 +71,7 @@ foreach ($GroupIDs as $GroupID) {
 
   $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" ";
   if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)" ';
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover(event)" ';
   }
   $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
   $DisplayName .= "dir=\"ltr\">$GroupName</a>";
@@ -244,7 +244,7 @@ foreach ($GroupIDs as $GroupID) {
 <?  if (!$WikiImage) {
       $WikiImage = STATIC_SERVER.'common/noartwork/nocover.png';
     } ?>
-            <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <div class='tags'><?=$Tags?></div>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
+            <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <div class='tags'><?=$Tags?></div>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
           </a>
         </div>
 <?

sections/index/private.php

@@ -153,7 +153,7 @@ if (count($Freeleeches)) {
     $DisplayTime = '('.str_replace(['year','month','week','day','hour','min','Just now','s',' '],['y','M','w','d','h','m','0m'],time_diff($ExpiryTime, 1, false)).') ';
     $DisplayName = '<a href="torrents.php?torrentid='.$ID.'"';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= " onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($Image, true)."\" onmouseleave=\"ungetCover(event)\"";
+      $DisplayName .= " onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($Image, 'thumb')."\" onmouseleave=\"ungetCover(event)\"";
     }
     $DisplayName .= '>'.$Name.'</a>';
 ?>

sections/requests/request.php

@@ -117,7 +117,7 @@ $encoded_artist = urlencode($encoded_artist);
 <?
     if (!empty($Request['Image'])) {
 ?>
-          <img style="width: 100%;" src="<?=ImageTools::process($Request['Image'], true)?>" lightbox-img="<?=ImageTools::process($Request['Image'])?>" alt="<?=$FullName?>" class="lightbox-init" />
+          <img style="width: 100%;" src="<?=ImageTools::process($Request['Image'], 'thumb')?>" lightbox-img="<?=ImageTools::process($Request['Image'])?>" alt="<?=$FullName?>" class="lightbox-init" />
 <?    } else { ?>
           <img style="width: 100%;" src="<?=STATIC_SERVER?>common/noartwork/<?=$CategoryIcons[$Request['CategoryID'] - 1]?>" alt="<?=$CategoryName?>" class="tooltip" title="<?=$CategoryName?>" height="220" border="0" />
 <?    } ?>

sections/snatchlist/snatchlist.php

@@ -41,7 +41,7 @@ View::show_header('Snatch List');
 foreach ($Torrents as $Torrent) {
   $DisplayName = "<a href=\"torrents.php?id=$Torrent[ID]&torrentid=$Torrent[TorrentID]\" ";
   if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($Torrent['WikiImage'], true).'" onmouseleave="ungetCover(event)" ';
+    $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($Torrent['WikiImage'], 'thumb').'" onmouseleave="ungetCover(event)" ';
   }
   $DisplayName .= "dir=\"ltr\">$Torrent[Name]</a>";
 

sections/top10/torrents.php

@@ -466,7 +466,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 
     $DisplayName .= "<a href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID\" class=\"tooltip\" title=\"View torrent\" ";
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover()" ';
+      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover()" ';
     }
 
 

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, true)."\" onmouseleave=\"ungetCover(event)\" ";
+      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt, 'thumb')."\" onmouseleave=\"ungetCover(event)\" ";
     }
     $DisplayName .= "dir=\"ltr\">$GroupName</a>";
     if ($GroupYear) {
@@ -643,7 +643,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, true)."\" onmouseleave=\"ungetCover(event)\" ";
+      $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($CoverArt, 'thumb')."\" 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)?>" lightbox-img="<?=ImageTools::process($WikiImage)?>" alt="<?=$AltName?>" /></div>
+      <div><img width="100%" class="lightbox-init" src="<?=ImageTools::process($WikiImage, 'thumb')?>" 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) . '" lightbox-img="'.ImageTools::process($Image).'"';
+            $Src = 'src="" data-gazelle-temp-src="' . ImageTools::process($Image, 'thumb') . '" lightbox-img="'.ImageTools::process($Image).'"';
           } else {
-            $Src = 'src="' . ImageTools::process($Image, true) . '" lightbox-img="'.ImageTools::process($Image).'"';
+            $Src = 'src="' . ImageTools::process($Image, 'thumb') . '" lightbox-img="'.ImageTools::process($Image).'"';
           }
 ?>
           <img id="cover_<?=$Index?>" class="lightbox-init" width="100%" <?=$Src?> alt="<?=$Summary?>" />
@@ -778,7 +778,7 @@ if (count($PersonalCollages) > 0) {
 <?
     foreach($Screenshots as $Screenshot) {
       $SSURL = ImageTools::process($Screenshot['Image']);
-      $ThumbURL = ImageTools::process($Screenshot['Image'], true);
+      $ThumbURL = ImageTools::process($Screenshot['Image'], 'thumb');
       if (check_perms('users_mod')) {
         ?><img class='tooltip lightbox-init' title='<?=Users::format_username($Screenshot['UserID'], false, false, false)?> - <?=time_diff($Screenshot['Time'])?>' lightbox-img="<?=$SSURL?>" src="<?=$ThumbURL?>" /><?
       } else {

sections/torrents/editgroup.php

@@ -134,7 +134,7 @@ View::show_header('Edit torrent group', 'upload');
   }
 
   foreach($Screenshots as $i => $Screenshot) {
-    $SSURL = ImageTools::process($Screenshot['Image'], true);
+    $SSURL = ImageTools::process($Screenshot['Image'], 'thumb');
 ?>
             <div>
               <input type="text" size="45" id="ss_<?=$i?>" name="screenshots[]" value="<?=$Screenshot['Image']?>"/>

sections/torrents/notify.php

@@ -265,7 +265,7 @@ if (empty($Results)) {
       }
       $DisplayName .= "<a href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
       if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-         $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($GroupInfo['WikiImage'], true)."\" onmouseleave=\"ungetCover(event)\" ";
+         $DisplayName .= "onmouseover=\"getCover(event)\" data-cover=\"".ImageTools::process($GroupInfo['WikiImage'], 'thumb')."\" onmouseleave=\"ungetCover(event)\" ";
       }
       $DisplayName .= "class=\"tooltip\" title=\"View torrent\" dir=\"ltr\">" . $GroupInfo['Name'] . '</a>';
 

sections/torrents/user.php

@@ -509,7 +509,7 @@ foreach ($Categories as $CatKey => $CatName) {
     $DisplayName = Artists::display_artists($Artists);
     $DisplayName .= '<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$TorrentID.'" ';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover()" ';
+      $DisplayName .= 'onmouseover="getCover(event)" data-cover="'.ImageTools::process($WikiImage, 'thumb').'" onmouseleave="ungetCover()" ';
     }
     $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
     $DisplayName .= 'dir="ltr">'.$GroupName.'</a>';

sections/user/user.php

@@ -723,7 +723,7 @@ if (check_paranoia_here('snatched')) {
  ?>
       <div style='width: 100px;' class='collage_image' >
         <a href="torrents.php?id=<?=$RS['ID']?>">
-          <img class="tooltip" title="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" src="<?=ImageTools::process($RS['WikiImage'], true)?>" alt="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" width="100%" />
+          <img class="tooltip" title="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" src="<?=ImageTools::process($RS['WikiImage'], 'thumb')?>" alt="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" width="100%" />
         </a>
       </div>
 <?    } ?>
@@ -770,7 +770,7 @@ if (check_paranoia_here('uploads')) {
 ?>
       <div style='width: 100px;' class='collage_image' >
         <a href="torrents.php?id=<?=$RU['ID']?>">
-          <img class="tooltip" title="<?=$RU['Artist']?><?=$RUName?>" src="<?=ImageTools::process($RU['WikiImage'], true)?>" alt="<?=$RU['Artist']?><?=$RUName?>" width="100%" />
+          <img class="tooltip" title="<?=$RU['Artist']?><?=$RUName?>" src="<?=ImageTools::process($RU['WikiImage'], 'thumb')?>" alt="<?=$RU['Artist']?><?=$RUName?>" width="100%" />
         </a>
       </div>
 <?    } ?>
@@ -824,7 +824,7 @@ foreach ($Collages as $CollageInfo) {
 ?>
       <div class="collage_image">
         <a href="torrents.php?id=<?=$GroupID?>">
-          <img class="tooltip" title="<?=$Name?>" src="<?=ImageTools::process($C['WikiImage'], true)?>" alt="<?=$Name?>" width="100%" />
+          <img class="tooltip" title="<?=$Name?>" src="<?=ImageTools::process($C['WikiImage'], 'thumb')?>" alt="<?=$Name?>" width="100%" />
         </a>
       </div>
 <?  } ?>