From 8acb6ae01e2c097c8039b352c8283bed7bbbd859 Mon Sep 17 00:00:00 2001
From: Shish <webmaster@shishnet.org>
Date: Sun, 4 Jan 2009 06:40:35 -0800
Subject: [PATCH] classy

---
 core/config.class.php | 54 ++-----------------------------------------
 1 file changed, 2 insertions(+), 52 deletions(-)

diff --git a/core/config.class.php b/core/config.class.php
index c99e37ea..a0ddcbe3 100644
--- a/core/config.class.php
+++ b/core/config.class.php
@@ -80,14 +80,14 @@ abstract class BaseConfig implements Config {
  * A class for easy access to the 'config' table, can always be accessed
  * through "global $config;"
  */
-class DatabaseConfig {
+class DatabaseConfig extends BaseConfig {
 	var $values = array();
 	var $database = null;
 
 	/*
 	 * Load the config table from a database
 	 */
-	public function Config($database) {
+	public function DatabaseConfig($database) {
 		$this->database = $database;
 		$this->values = $this->database->db->GetAssoc("SELECT name, value FROM config");
 	}
@@ -109,55 +109,5 @@ class DatabaseConfig {
 			$this->database->db->CommitTrans();
 		}
 	}
-
-	public function set_int($name, $value) {
-		$this->values[$name] = parse_shorthand_int($value);
-		$this->save($name);
-	}
-	public function set_string($name, $value) {
-		$this->values[$name] = $value;
-		$this->save($name);
-	}
-	public function set_bool($name, $value) {
-		$this->values[$name] = (($value == 'on' || $value === true) ? 'Y' : 'N');
-		$this->save($name);
-	}
-
-	public function set_default_int($name, $value) {
-		if(is_null($this->get($name))) {
-			$this->values[$name] = parse_shorthand_int($value);
-		}
-	}
-	public function set_default_string($name, $value) {
-		if(is_null($this->get($name))) {
-			$this->values[$name] = $value;
-		}
-	}
-	public function set_default_bool($name, $value) {
-		if(is_null($this->get($name))) {
-			$this->values[$name] = (($value == 'on' || $value === true) ? 'Y' : 'N');
-		}
-	}
-
-	public function get_int($name, $default=null) {
-		// deprecated -- ints should be stored as ints now
-		return parse_shorthand_int($this->get($name, $default));
-	}
-	public function get_string($name, $default=null) {
-		return $this->get($name, $default);
-	}
-	public function get_bool($name, $default=null) {
-		// deprecated -- bools should be stored as Y/N now
-		return ($this->get($name, $default) == 'Y' || $this->get($name, $default) == '1');
-	}
-
-	private function get($name, $default=null) {
-		if(isset($this->values[$name])) {
-			return $this->values[$name];
-		}
-		else {
-			return $default;
-		}
-	}
 }
 ?>