Slim down image tools

Some minor functionality will need to be reimplemented later
Not a priority though

classes/imagetools.class.php

@@ -5,184 +5,13 @@
  * Thumbnail aide, mostly
  */
 class ImageTools {
-  /**
-   * Store processed links to avoid repetition
-   * @var array 'URL' => 'Parsed URL'
-   */
-  private static $Storage = [];
-
-  /**
-   * We use true as an extra property to make the domain an array key
-   * @var array $Hosts Array of image hosts
-   */
-  private static $Hosts = array(
-//    'imgur.com' => true,
-    'whatimg.com' => true
-  );
-
-  /**
-   * Blacklisted sites
-   * @var array $Blacklist Array of blacklisted hosts
-   */
-  private static $Blacklist = array(
-    'tinypic.com'
-  );
-
-  /**
-   * Array of image hosts that provide thumbnailing
-   * @var array $Thumbs
-   */
-  private static $Thumbs = array(
-//    'i.imgur.com' => true,
-    'whatimg.com' => true
-  );
-
-  /**
-   * Array of extensions
-   * @var array $Extensions
-   */
-  private static $Extensions = array(
-    'jpg' => true,
-    'jpeg' => true,
-    'png' => true,
-    'gif' => true,
-  );
-
-  /**
-   * Array of user IDs whose avatars have been checked for size
-   * @var array $CheckedAvatars
-   */
-  private static $CheckedAvatars = [];
-  private static $CheckedAvatars2 = [];
-
-  /**
-   * Array of user IDs whose donor icons have been checked for size
-   * @var array $CheckedDonorIcons
-   */
-  private static $CheckedDonorIcons = [];
-
-  /**
-   * Checks from our list of valid hosts
-   * @param string $Host Domain/host to check
-   * @return boolean
-   */
-  public static function valid_host($Host) {
-    return !empty(self::$Hosts[$Host]) && self::$Hosts[$Host] === true;
-  }
-
-  /**
-   * Checks if a link's host is (not) good, otherwise displays an error.
-   * @param string $Url Link to an image
-   * @return boolean
-   */
-  public static function blacklisted($Url, $ShowError = true) {
-    foreach (self::$Blacklist as &$Value) {
-      $Blacklisted = stripos($Url, $Value);
-      if ($Blacklisted !== false) {
-        $ParsedUrl = parse_url($Url);
-        if ($ShowError) {
-          error($ParsedUrl['host'] . ' is not an allowed image host. Please use a different host.');
-        }
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Checks to see if a link has a thumbnail
-   * @param string $Url Link to an image
-   * @return string|false Matched host or false
-   */
-  private static function thumbnailable($Url) {
-    $ParsedUrl = parse_url($Url);
-    return !empty(self::$Thumbs[$ParsedUrl['host']]);
-  }
-
-  /**
-   * Checks an extension
-   * @param string $Ext Extension to check
-   * @return boolean
-   */
-  private static function valid_extension($Ext) {
-//    return @self::$Extensions[$Ext] === true;
-    return !empty(self::$Extensions[$Ext]) && (self::$Extensions[$Ext] === true);
-  }
-
-  /**
-   * Stores a link with a (thumbnail) link
-   * @param type $Link
-   * @param type $Processed
-   */
-  private static function store($Link, $Processed) {
-    self::$Storage[$Link] = $Processed;
-  }
-
-  /**
-   * Retrieves an entry from our storage
-   * @param type $Link
-   * @return boolean|string Returns false if no match
-   */
-  private static function get_stored($Link) {
-    if (isset(self::$Storage[$Link])) {
-      return self::$Storage[$Link];
-    }
-    return false;
-  }
-
-  /**
-   * Checks if URL points to a whatimg thumbnail.
-   */
-  private static function has_whatimg_thumb($Url) {
-    return (strpos($Url, '_thumb') !== false);
-  }
-
-  /**
-   * Cleans up imgur URL if it already has a modifier attached to the end of it.
-   */
-  private static function clean_imgur_url($Url) {
-    $Extension = pathinfo($Url, PATHINFO_EXTENSION);
-    $Full = preg_replace('/\.[^.]*$/', '', $Url);
-    $Base = substr($Full, 0, strrpos($Full, '/'));
-    $Path = substr($Full, strrpos($Full, '/') + 1);
-    if (strlen($Path) == 6) {
-      $Last = $Path[strlen($Path) - 1];
-      if ($Last == 'm' || $Last == 'l' || $Last == 's' || $Last == 'h' || $Last == 'b') {
-        $Path = substr($Path, 0, -1);
-      }
-    }
-    return "$Base/$Path.$Extension";
-  }
-
-  /**
-   * Replaces the extension.
-   */
-  private static function replace_extension($String, $Extension) {
-    return preg_replace('/\.[^.]*$/', $Extension, $String);
-  }
 
   /**
    * Create image proxy URL
    * @param string $Url image URL
-   * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
-   * @param bool/string/number $UserID - user ID for avatars and donor icons
    * @return image proxy URL
    */
-  public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) {
-    if ($UserID) {
-      $ExtraInfo = "&userid=$UserID";
-      if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) {
-        $ExtraInfo .= "&type=$CheckSize";
-        self::$CheckedAvatars[$UserID] = true;
-      } elseif ($CheckSize === 'avatar2' && !isset(self::$CheckedAvatars2[$UserID])) {
-        $ExtraInfo .= "&type=$CheckSize";
-        self::$CheckedAvatars2[$UserID] = true;
-      } elseif ($CheckSize === 'donoricon' && !isset(self::$CheckedDonorIcons[$UserID])) {
-        $ExtraInfo .= "&type=$CheckSize";
-        self::$CheckedDonorIcons[$UserID] = true;
-      }
-    }
-
+  public static function proxy_url($Url) {
     if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.IMAGE_DOMAIN.')\//', $Url) || $Url[0]=='/') {
       if (strpos($Url, '?') === false) $Url .= '?';
       return $Url;
@@ -195,56 +24,28 @@ class ImageTools {
    * Determine the image URL. This takes care of the image proxy and thumbnailing.
    * @param string $Url
    * @param bool $Thumb
-   * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
-   * @param bool/string/number $UserID - user ID for avatars and donor icons
    * @return string
    */
-  public static function process($Url, $Thumb = false, $CheckSize = false, $UserID = false) {
-    if (empty($Url)) {
-      return '';
-    }
-
-    if ($Found = self::get_stored($Url . ($Thumb ? '_thumb' : ''))) {
-      return $Found;
-    }
-
-    $ProcessedUrl = $Url;
-    if ($Thumb) {
-      $Extension = pathinfo($Url, PATHINFO_EXTENSION);
-      if (self::thumbnailable($Url) && self::valid_extension($Extension)) {
-        if (strpos($Url, 'whatimg') !== false && !self::has_whatimg_thumb($Url)) {
-          $ProcessedUrl = self::replace_extension($Url, '_thumb.' . $Extension);
-        } elseif (strpos($Url, 'imgur') !== false) {
-          $ProcessedUrl = self::replace_extension(self::clean_imgur_url($Url), 'm.' . $Extension);
-        }
-      }
-    }
-
-    $ExtraInfo = '';
-    if (check_perms('site_proxy_images')) {
-      $ProcessedUrl = self::proxy_url($ProcessedUrl, $CheckSize, $UserID, $ExtraInfo);
-    }
-    self::store($Url . ($Thumb ? '_thumb' : ''), $ProcessedUrl);
-    return $ProcessedUrl . $ExtraInfo;
+  public static function process($Url = '', $Thumb = false) {
+    // TODO: Thumbnailing
+    return $Url ? self::proxy_url($Url) : '';
   }
 
   /**
-   * Cover art thumbnail in browse, on artist pages etc.
-   * @global array $CategoryIcons
-   * @param string $Url
-   * @param int $CategoryID
+   * Checks if a link's host is (not) good, otherwise displays an error.
+   * @param string $Url Link to an image
+   * @return boolean
    */
-  public static function cover_thumb($Url, $CategoryID) {
-    global $CategoryIcons;
-    if ($Url) {
-      $Src = self::process($Url, true);
-      $Lightbox = self::process($Url);
-    } else {
-      $Src = STATIC_SERVER . 'common/noartwork/' . $CategoryIcons[$CategoryID - 1];
-      $Lightbox = $Src;
+  public static function blacklisted($Url, $ShowError = true) {
+    $Blacklist = ['tinypic.com'];
+    foreach ($Blacklist as $Value) {
+      if (stripos($Url, $Value) !== false) {
+        if ($ShowError) {
+          error($Value . ' is not an allowed image host. Please use a different host.');
+        }
+        return true;
+      }
     }
-?>
-    <img src="<?=$Src?>" width="90" height="90" alt="Cover" class="lightbox-init" lightbox-img="<?=$Lightbox?>" />
-<?
+    return false;
   }
 }

classes/users.class.php

@@ -412,7 +412,7 @@ class Users {
           $IconLink = display_str($DonorRewards['CustomIconLink']);
         }
         if ($EnabledRewards['HasCustomDonorIcon'] && !empty($DonorRewards['CustomIcon'])) {
-          $IconImage = ImageTools::process($DonorRewards['CustomIcon'], false, 'donoricon', $UserID);
+          $IconImage = ImageTools::process($DonorRewards['CustomIcon']);
         } else {
           if ($SpecialRank === MAX_SPECIAL_RANK) {
             $DonorHeart = 6;
@@ -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, false, 'avatar', $UserID);
+    $Avatar = ImageTools::process($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'], false, 'avatar2', $UserID) . '"';
+      $SecondAvatar = ' data-gazelle-second-avatar="' . ImageTools::process($Rewards['SecondAvatar']) . '"';
     }
     // case 1 is avatars disabled
     switch ($Setting) {

sections/index/feat_album.php

@@ -24,7 +24,7 @@ if (is_number($FeaturedAlbum['GroupID'])) {
       </div>
       <div class="center pad">
         <a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" class="tooltip" title="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>">
-          <img src="<?=ImageTools::process($FeaturedAlbum['WikiImage'], true)?>" alt="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" />
+          <img src="<?=ImageTools::process($FeaturedAlbum['WikiImage'])?>" alt="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" />
         </a>
       </div>
       <div class="center pad">

sections/tools/finances/donor_rewards.php

@@ -80,7 +80,7 @@ View::show_header($Title);
       </td>
       <td style="word-wrap: break-word;">
 <?    if (!empty($User['CustomIcon'])) { ?>
-        <img src="<?=ImageTools::process($User['CustomIcon'], false, 'donoricon', $User['UserID'])?>" width="15" height="13" alt="" />
+        <img src="<?=ImageTools::process($User['CustomIcon'])?>" width="15" height="13" alt="" />
 <?    } ?>
       </td>
       <td style="word-wrap: break-word;">

sections/torrents/add_cover_art.php

@@ -24,7 +24,7 @@ for ($i = 0; $i < count($Images); $i++) {
   $Image = $Images[$i];
   $Summary = $Summaries[$i];
 
-  if (ImageTools::blacklisted($Image, true) || !preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
+  if (ImageTools::blacklisted($Image) || !preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
     continue;
   }
 

sections/torrents/details.php

@@ -777,7 +777,7 @@ if (count($PersonalCollages) > 0) {
       <div class="body torrent_screenshots hidden">
 <?
     foreach($Screenshots as $Screenshot) {
-      $SSURL = ImageTools::process($Screenshot['Image'], false);
+      $SSURL = ImageTools::process($Screenshot['Image']);
       if (check_perms('users_mod')) {
         ?><img class='tooltip lightbox-init' title='<?=Users::format_username($Screenshot['UserID'], false, false, false)?> - <?=time_diff($Screenshot['Time'])?>' src="<?=$SSURL?>" /><?
       } else {