From f6c77b0848ca7e504cfba795d40b1c6c5bb8b343 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 22 Feb 2010 05:15:07 +0100 Subject: added IdGeneratorEngine with Sha1Generator and ShortGenerator --- paste/config.php | 7 +++ paste/include/generator/IdGeneratorEngine.php | 38 ++++++++++++++++ paste/include/generator/Sha1Generator.php | 43 ++++++++++++++++++ paste/include/generator/ShortGenerator.php | 63 +++++++++++++++++++++++++++ paste/include/storage/FileStorage.php | 8 +++- paste/include/storage/MysqlStorage.php | 8 +++- 6 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 paste/include/generator/IdGeneratorEngine.php create mode 100644 paste/include/generator/Sha1Generator.php create mode 100644 paste/include/generator/ShortGenerator.php diff --git a/paste/config.php b/paste/config.php index 727952c..bfc92f3 100644 --- a/paste/config.php +++ b/paste/config.php @@ -35,6 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. require_once('include/storage/MysqlStorage.php'); require_once('include/storage/FileStorage.php'); +require_once('include/generator/Sha1Generator.php'); +require_once('include/generator/ShortGenerator.php'); $config = array( // This is the domain where this pastebin is running @@ -55,6 +57,11 @@ $config = array( 'storage' => NULL, // 'storage' => new MysqlStorage($host, $user, $password, $database, $table), // 'storage' => new FileStorage('results/'), + + // IdGeneratorEngine to generate ids + 'id_generator' => NULL, +// 'id_generator' => new Sha1Generator(), +// 'id_generator' => new ShortGenerator(), ); ?> 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 @@ + 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, -- cgit v1.2.3