Add compatibility with php-memcached

classes/cache.class.php

@@ -12,7 +12,7 @@ however, this class has page caching functions superior to those of
 memcache.
 
 Also, Memcache::get and Memcache::set have been wrapped by
-CACHE::get_value and CACHE::cache_value. get_value uses the same argument
+Cache::get_value and Cache::cache_value. get_value uses the same argument
 as get, but cache_value only takes the key, the value, and the duration
 (no zlib).
 
@@ -24,14 +24,18 @@ memcached -d -m 8192 -l 10.10.0.1 -t8 -C
 
 |*************************************************************************/
 
-if (!extension_loaded('memcache')) {
+if (!extension_loaded('memcache') && !extension_loaded('memcached')) {
   die('Memcache Extension not loaded.');
 }
 
-class CACHE extends Memcache {
-  /**
-   * Torrent Group cache version
-   */
+if (class_exists('Memcached')) {
+  class MemcacheCompat extends Memcached {}
+} else {
+  class MemcacheCompat extends Memcache {}
+}
+
+class Cache extends MemcacheCompat {
+  // Torrent Group cache version
   const GROUP_VERSION = 5;
 
   public $CacheHits = [];
@@ -57,9 +61,14 @@ class CACHE extends Memcache {
   public $InternalCache = true;
 
   function __construct($Servers) {
+    if (is_subclass_of($this, 'Memcached')) parent::__construct();
     $this->Servers = $Servers;
     foreach ($Servers as $Server) {
-      $this->addServer($Server['host'], $Server['port'], true, $Server['buckets']);
+      if (is_subclass_of($this, 'Memcache')) {
+        $this->addServer($Server['host'], $Server['port'], true, $Server['buckets']);
+      } else {
+        $this->addServer(str_replace('unix://', '', $Server['host']), $Server['port'], $Server['buckets']);
+      }
     }
   }
 
@@ -79,7 +88,9 @@ class CACHE extends Memcache {
     if (empty($Key)) {
       trigger_error("Cache insert failed for empty key");
     }
-    if (!$this->set($Key, $Value, 0, $Duration)) {
+    $SetParams = [$Key, $Value, 0, $Duration];
+    if (is_subclass_of($this, 'Memcached')) unset($SetParams[2]);
+    if (!$this->set(...$SetParams)) {
       trigger_error("Cache insert failed for key $Key");
     }
     if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
@@ -98,7 +109,9 @@ class CACHE extends Memcache {
 
   public function replace_value($Key, $Value, $Duration = 2592000) {
     $StartTime = microtime(true);
-    $this->replace($Key, $Value, false, $Duration);
+    $ReplaceParams = [$Key, $Value, false, $Duration];
+    if (is_subclass_of($this, 'Memcached')) unset($ReplaceParams[2]);
+    $this->replace(...$ReplaceParams);
     if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
       $this->CacheHits[$Key] = $Value;
     }

classes/script_start.php

@@ -66,7 +66,7 @@ $Debug->handle_errors();
 $Debug->set_flag('Debug constructed');
 
 $DB = new DB_MYSQL;
-$Cache = new CACHE(MEMCACHED_SERVERS);
+$Cache = new Cache(MEMCACHED_SERVERS);
 
 // Autoload classes.
 require(SERVER_ROOT.'/classes/classloader.php');

classes/torrents.class.php

@@ -57,7 +57,7 @@ class Torrents {
         continue;
       }
       $Data = G::$Cache->get_value($Key . $GroupID, true);
-      if (!empty($Data) && is_array($Data) && $Data['ver'] == CACHE::GROUP_VERSION) {
+      if (!empty($Data) && is_array($Data) && $Data['ver'] == Cache::GROUP_VERSION) {
         unset($NotFound[$GroupID]);
         $Found[$GroupID] = $Data['d'];
       }
@@ -126,7 +126,7 @@ class Torrents {
       }
 
       foreach ($NotFound as $GroupID => $GroupInfo) {
-        G::$Cache->cache_value($Key . $GroupID, array('ver' => CACHE::GROUP_VERSION, 'd' => $GroupInfo), 0);
+        G::$Cache->cache_value($Key . $GroupID, array('ver' => Cache::GROUP_VERSION, 'd' => $GroupInfo), 0);
       }
 
       $Found = $NotFound + $Found;

feeds.php

@@ -16,8 +16,8 @@ require 'classes/config.php'; // The config contains all site-wide configuration
 require(SERVER_ROOT.'/classes/misc.class.php'); // Require the misc class
 require(SERVER_ROOT.'/classes/cache.class.php'); // Require the caching class
 require(SERVER_ROOT.'/classes/feed.class.php'); // Require the feeds class
-$Cache = NEW CACHE(MEMCACHED_SERVERS); // Load the caching class
-$Feed = NEW FEED; // Load the time class
+$Cache = new Cache(MEMCACHED_SERVERS); // Load the caching class
+$Feed = new FEED; // Load the time class
 
 function check_perms() {
   return false;

sections/peerupdate/index.php

@@ -54,7 +54,7 @@ while ($TorrentID) {
   if ($LastGroupID != $GroupID) {
     $CachedData = $Cache->get_value("torrent_group_$GroupID");
     if ($CachedData !== false) {
-      if (isset($CachedData['ver']) && $CachedData['ver'] == CACHE::GROUP_VERSION) {
+      if (isset($CachedData['ver']) && $CachedData['ver'] == Cache::GROUP_VERSION) {
         $CachedStats = &$CachedData['d']['Torrents'];
       }
     } else {