From 87ed48f21bd4117629b8b6d4b1b9b535b0ef630e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 31 Mar 2011 20:24:25 +0200
Subject: [ticket/10110] Remove redis acm driver from develop-olympus

PHPBB3-10110
---
 phpBB/includes/acm/acm_redis.php | 155 ---------------------------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 phpBB/includes/acm/acm_redis.php

(limited to 'phpBB/includes/acm')

diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
deleted file mode 100644
index 8954b9d0e7..0000000000
--- a/phpBB/includes/acm/acm_redis.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// Include the abstract base
-if (!class_exists('acm_memory'))
-{
-	require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
-}
-
-if (!defined('PHPBB_ACM_REDIS_PORT'))
-{
-	define('PHPBB_ACM_REDIS_PORT', 6379);
-}
-
-if (!defined('PHPBB_ACM_REDIS_HOST'))
-{
-	define('PHPBB_ACM_REDIS_HOST', 'localhost');
-}
-
-if (!defined('PHPBB_ACM_REDIS'))
-{
-	//can define multiple servers with host1/port1,host2/port2 format
-	define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT);
-}
-
-/**
-* ACM for Redis
-*
-* Compatible with the php extension phpredis available
-* at https://github.com/nicolasff/phpredis
-*
-* @package acm
-*/
-class acm extends acm_memory
-{
-	var $extension = 'redis';
-
-	var $redis;
-
-	function acm()
-	{
-		// Call the parent constructor
-		parent::acm_memory();
-
-		$this->redis = new Redis();
-		foreach (explode(',', PHPBB_ACM_REDIS) as $server)
-		{
-			$parts = explode('/', $server);
-			$this->redis->connect(trim($parts[0]), trim($parts[1]));
-		}
-
-		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
-		{
-			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
-			{
-				global $acm_type;
-
-				trigger_error("Incorrect password for the ACM module $acm_type.", E_USER_ERROR);
-			}
-		}
-
-		$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
-		$this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix);
-
-		if (defined('PHPBB_ACM_REDIS_DB'))
-		{
-			if (!$this->redis->select(PHPBB_ACM_REDIS_DB))
-			{
-				global $acm_type;
-
-				trigger_error("Incorrect database for the ACM module $acm_type.", E_USER_ERROR);
-			}
-		}
-	}
-
-	/**
-	* Unload the cache resources
-	*
-	* @return void
-	*/
-	function unload()
-	{
-		parent::unload();
-
-		$this->redis->close();
-	}
-
-	/**
-	* Purge cache data
-	*
-	* @return void
-	*/
-	function purge()
-	{
-		$this->redis->flushDB();
-
-		parent::purge();
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		return $this->redis->get($var);
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		return $this->redis->setex($var, $ttl, $data);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		if ($this->redis->delete($var) > 0)
-		{
-			return true;
-		}
-		return false;
-	}
-}
-- 
cgit v1.2.1