seperated storage classes

4 files changed, 137 insertions, 62 deletions

diff --git a/paste/config.php b/paste/config.php
index 2a41d7b..66d655a 100644
--- a/paste/config.php
+++ b/paste/config.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 This software is licensed through a BSD-style License.
 http://www.opensource.org/licenses/bsd-license.php
@@ -51,4 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     'token_salt'    => 'saltsaltsalt',
   );
 
+require_once('include/storage/FileStorage.php');
+$storage = new MysqlStorage('mysql', 'rafb', 'rafb', 'paste', 'rafb');
 ?>
diff --git a/paste/include/storage/FileStorage.php b/paste/include/storage/FileStorage.php
new file mode 100644
index 0000000..a6ea0f2
--- /dev/null
+++ b/paste/include/storage/FileStorage.php
@@ -0,0 +1,71 @@
+<?php
+/*
+This software is licensed through a BSD-style License.
+http://www.opensource.org/licenses/bsd-license.php
+
+Copyright (c) 2009 Alexander Sulfrian
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+Neither the name of Jacob D. Cohen nor the names of his contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once('StorageEngine.php');
+
+class FileStorage extends StorageEngine
+{
+	private $storage_path;
+
+	function __construct($path) {
+		$this->storage_path = $path;
+	}
+
+	public function setContent($content)
+	{
+		global $config;
+
+		do {
+			$filename = sha1(date('r') . rand(1000));
+		} while (file_exists(realpath($storage_path . '/' , $filename)));
+
+		if ($config['short_results_path']) {
+			$urlbase = $config['short_results_path'];
+		} else {
+			$urlbase = $config['site_domain'] . $config['site_path'] . '/' . $config['results_dir'];
+		}
+		$content = $this->prepareContent($filename, $urlbase, $content);
+		$filename = $filename . ".html";
+
+		// write content
+		$outfile = realpath($storage_path . '/' , $filename);
+		$fp = fopen($outfile, "w");
+		fwrite($fp, $content);
+		fclose($fp);
+
+		return $pasteUrl;
+	}
+}
+
+?>
diff --git a/paste/include/createpage.inc b/paste/include/storage/MysqlStorage.php
index f1a16aa..239f113 100644
--- a/paste/include/createpage.inc
+++ b/paste/include/storage/MysqlStorage.php
@@ -1,9 +1,8 @@
-<?
+<?php
 /*
 This software is licensed through a BSD-style License.
 http://www.opensource.org/licenses/bsd-license.php
 
-Copyright (c) 2002 - 2009 Jacob D. Cohen
 Copyright (c) 2009 Alexander Sulfrian
 All rights reserved.
 
@@ -33,65 +32,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-abstract class StorageEngine
-{
-	abstract public function setContent($content);
-
-	public function generateToken($name)
-	{
-		global $config;
-
-		$ipAddr = $_SERVER["REMOTE_ADDR"];
-		return sha1($name . $ipAddr . $config['token_salt']);
-	}
-
-	public function prepareContent($name, $baseUrl, $content)
-	{
-		$content = preg_replace("/=\{this-paste-url\}/",
-					$baseUrl . '/' . $name, $content);
-
-		$content = preg_replace("/=\{remove-paste-url\}/", $baseUrl
-					. '/' . 'remove.php?id=' . $name
-					. '&t=' . $this->generateToken(),
-					$content);
-
-		return $content;
-	}
-}
-
-class FileStorage extends StorageEngine
-{
-	private $storage_path;
-
-	function __construct($path) {
-		$this->storage_path = $path;
-	}
-
-	public function setContent($content)
-	{
-		global $config;
-
-		do {
-			$filename = sha1(date('r') . rand(1000));
-		} while (file_exists(realpath($storage_path . '/' , $filename)));
-
-		if ($config['short_results_path']) {
-			$urlbase = $config['short_results_path'];
-		} else {
-			$urlbase = $config['site_domain'] . $config['site_path'] . '/' . $config['results_dir'];
-		}
-		$content = $this->prepareContent($filename, $urlbase, $content);
-		$filename = $filename . ".html";
-
-		// write content
-		$outfile = realpath($storage_path . '/' , $filename);
-		$fp = fopen($outfile, "w");
-		fwrite($fp, $content);
-		fclose($fp);
-
-		return $pasteUrl;
-	}
-}
+require_once('StorageEngine.php');
 
 class MysqlStorage extends StorageEngine
 {
diff --git a/paste/include/storage/StorageEngine.php b/paste/include/storage/StorageEngine.php
new file mode 100644
index 0000000..c32a7b6
--- /dev/null
+++ b/paste/include/storage/StorageEngine.php
@@ -0,0 +1,61 @@
+<?php
+/*
+This software is licensed through a BSD-style License.
+http://www.opensource.org/licenses/bsd-license.php
+
+Copyright (c) 2009 Alexander Sulfrian
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+Neither the name of Jacob D. Cohen nor the names of his contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+abstract class StorageEngine
+{
+	abstract public function setContent($content);
+
+	public function generateToken($name)
+	{
+		global $config;
+
+		$ipAddr = $_SERVER["REMOTE_ADDR"];
+		return sha1($name . $ipAddr . $config['token_salt']);
+	}
+
+	public function prepareContent($name, $baseUrl, $content)
+	{
+		$content = preg_replace("/=\{this-paste-url\}/",
+					$baseUrl . '/' . $name, $content);
+
+		$content = preg_replace("/=\{remove-paste-url\}/", $baseUrl
+					. '/' . 'remove.php?id=' . $name
+					. '&t=' . $this->generateToken(),
+					$content);
+
+		return $content;
+	}
+}
+
+?>