5 files changed, 158 insertions, 2 deletions
diff --git a/paste/include/generator/IdGeneratorEngine.php b/paste/include/generator/IdGeneratorEngine.php
new file mode 100644
index 0000000..9c74376
--- /dev/null
+++ b/paste/include/generator/IdGeneratorEngine.php
@@ -0,0 +1,38 @@
+<?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 IdGeneratorEngine
+{
+	abstract public function generateId();
+}
diff --git a/paste/include/generator/Sha1Generator.php b/paste/include/generator/Sha1Generator.php
new file mode 100644
index 0000000..919e9c7
--- /dev/null
+++ b/paste/include/generator/Sha1Generator.php
@@ -0,0 +1,43 @@
+<?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('IdGeneratorEngine.php');
+
+class Sha1Generator extends IdGeneratorEngine
+{
+	public function generateId()
+	{
+		return sha1(date('r') . rand(1000, getrandmax()));
+	}
+}
diff --git a/paste/include/generator/ShortGenerator.php b/paste/include/generator/ShortGenerator.php
new file mode 100644
index 0000000..320ff10
--- /dev/null
+++ b/paste/include/generator/ShortGenerator.php
@@ -0,0 +1,63 @@
+<?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('IdGeneratorEngine.php');
+
+class ShortGenerator extends IdGeneratorEngine
+{
+	//const $codeset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	//readable character set excluded (0,O,1,l)
+	const codeset = "23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ";
+
+	static private function bcFloor($x)
+	{
+		return bcmul($x, '1', 0);
+	}
+
+	public function generateId()
+	{
+		$base = strlen(self::codeset);
+		$converted = '';
+
+		// id source (time + random)
+		$n = intval(time() . rand(1000, getrandmax()));
+
+		while ($n > 0) {
+			$converted = substr(self::codeset, bcmod($n, $base), 1) . $converted;
+			$n = self::bcFloor(bcdiv($n, $base));
+		}
+
+		return $converted;
+	}
+}
diff --git a/paste/include/storage/FileStorage.php b/paste/include/storage/FileStorage.php
index 5ee2b77..e1fc72c 100644
--- a/paste/include/storage/FileStorage.php
+++ b/paste/include/storage/FileStorage.php
@@ -46,8 +46,14 @@ class FileStorage extends StorageEngine
 	{
 		global $config;
 
+		if (!is_subclass_of($config['id_generator'], 'IdGeneratorEngine'))
+		{
+			header('HTTP/1.0 503 Service Unavailable');
+			die('Invalid config');
+		}
+
 		do {
-			$filename = sha1(date('r') . rand(1000, getrandmax()));
+			$filename = $config['id_generator']->generateId();
 		} while (file_exists($this->storage_path . '/' . $filename));
 
 		if ($config['short_results_path']) {
diff --git a/paste/include/storage/MysqlStorage.php b/paste/include/storage/MysqlStorage.php
index 14aefa6..8e16536 100644
--- a/paste/include/storage/MysqlStorage.php
+++ b/paste/include/storage/MysqlStorage.php
@@ -78,7 +78,13 @@ INDEX (nick)
 	{
 		global $config;
 
-		$name = sha1(date('r') . rand(1000, getrandmax()));
+		if (!is_subclass_of($config['id_generator'], 'IdGeneratorEngine'))
+		{
+			header('HTTP/1.0 503 Service Unavailable');
+			die('Invalid config');
+		}
+
+		$name = $config['id_generator']->generateId();
 		if ($stmt = $this->mysql->prepare(
 			    'INSERT INTO ' . $this->table . '
                              (pid, nick, language, content,