Tiny DNS & URL
-Expert interface
- -- @@ -126,7 +149,3 @@ $checkedType = (isset($_REQUEST['type'])) ? $_REQUEST['type'] : $config['sddns']
'; - print_r($this->getMessages()); - echo ''; - } + protected function getOutput() { // TODO + if (count($this->getMessages()) > 0) { + echo '
'; + print_r($this->getMessages()); + echo ''; + } } } class GifOutput extends Output { + public function __construct() { parent::__construct('image/gif'); } @@ -140,6 +144,7 @@ class GifOutput extends Output { } class PlainLineOutput extends Output { + public function __construct($debug, $fields = array('index', 'time', 'type', 'description', 'data'), $delimiter = "\t", $lineDelimiter = "\n", $escape = true) { parent::__construct('text/plain', 'UTF-8', $debug); $this->fields = $fields; @@ -159,7 +164,7 @@ class PlainLineOutput extends Output { foreach ($this->fields as $fieldIndex => $field) { switch ($field) { case 'type': - fwrite($fd, $message['type']); + fwrite($fd, '[' . $message['type'] . ']'); break; case 'index': @@ -175,9 +180,7 @@ class PlainLineOutput extends Output { break; case 'data': - foreach ($message['data'] as $object) { - fwrite($fd, $this->delimiter . $object); - } + fwrite($fd, implode(', ', $message['data'])); break; default: fwrite($fd, $message[$field]); @@ -199,6 +202,7 @@ class PlainLineOutput extends Output { } class HtmlOutput extends Output { + public function __construct($debug) { parent::__construct('text/html', 'UTF-8', $debug); @@ -206,7 +210,8 @@ class HtmlOutput extends Output { } protected function getOutput() { - $site = Registry::get('site'); + global $site; + $columnCount = 0; $messages = $this->getMessages(); $html = ob_get_clean(); @@ -271,6 +276,7 @@ class HtmlOutput extends Output { } abstract class Output { + protected $messages = array(); public $debug = 0; public $format; @@ -282,7 +288,6 @@ abstract class Output { $this->encoding = $encoding; $this->debug = $debug; - if ($this->contentType != null) header('Content-type: ' . $this->contentType . (($this->encoding != null) ? '; charset=' . $this->encoding : '')); } @@ -300,8 +305,7 @@ abstract class Output { } for ($i = ($type == 'debug') ? 3 : 2; $i < $argc; $i++) { - if (empty($argv[$i])) - continue; + if (empty($argv[$i])) continue; if (!is_array($argv[$i])) { $message['data'][] = $argv[$i]; @@ -315,19 +319,16 @@ abstract class Output { } protected function getMessages($exclude = true, $args = null) { - $types = array('notice', 'success', 'error', 'exception', 'warning', 'data'); // 'debug'); + $types = array('notice', 'success', 'error', 'exception', 'warning', 'data', 'debug'); if ($args == null) - $args = array(); + $args = array(); - if ($exclude) - $types = array_diff($types, $args); - else - $types = $args; + $types = ($exclude) ? array_diff($types, $args) : $args; $messages = array(); foreach ($this->messages as $message) { - if (in_array($message['type'], $types) || ($message['type'] == 'debug' && $message['level'] <= $this->debug)) { + if (in_array($message['type'], $types) && ($message['type'] != 'debug' || $message['level'] <= $this->debug)) { $messages[] = $message; } } @@ -342,17 +343,13 @@ abstract class Output { break; case 'txt': - return new PlainLineOutput($debug, array('index', 'time', 'type', 'description', 'data'), "\t", "\n"); + return new PlainLineOutput($debug, array('type', 'description', 'data'), "\t", "\n"); break; case 'csv': return new PlainLineOutput($debug, array('time', 'type', 'description', 'data'), ";", "\n"); break; - case 'dyndns': - return new DynDnsOutput(); - break; - case 'png': return new GraphOutput($debug); break; @@ -374,27 +371,26 @@ abstract class Output { static function start($forced = null) { global $argc; - - $site = Registry::get('site'); + global $site; if (isset($forced)) $format = $forced; elseif (isset($argc)) $format = 'txt'; - elseif ($_SERVER['SERVER_NAME'] === 'members.dyndns.org') - $format = 'dyndns'; elseif (empty($_REQUEST['format']) || @$_REQUEST['format'] == 'php') $format = 'html'; else $format = $_REQUEST['format']; $output = self::getInstance($format, $site['debug']); - Registry::set('output', $output); // errorhandling set_exception_handler(array($output, 'exception_handler')); set_error_handler(array($output, 'error_handler'), E_ALL); + // shutdown + register_shutdown_function(array($output, 'send')); + // debugging $parameters = array(); foreach ($_REQUEST as $parName => $parValue) { @@ -408,16 +404,27 @@ abstract class Output { } function exception_handler($exception) { - $this->add('unhandled ' . get_class($exception), 'exception', (array) $exception); - $this->debug = 7; // increase verbosity in case of an exception - $this->send(); + if (is_subclass_of($exception, 'CustomException')) { + $this->add($exception->getMessage(), 'error', $exception->getData()); + } + else { + $this->debug = 7; // increase verbosity in case of an exception + $this->add(get_class($exception), 'exception', (array) $exception); + } + + switch (get_class($exception)) { + case 'CustomException': http_response_code(500); break; + case 'UserException': http_response_code(400); break; + case 'ValidationException': http_response_code(400); break; + case 'AuthentificationException': http_response_code(403); break; + default: $code = 500; break; + } + + exit(1); } function error_handler($errno, $errstr, $errfile, $errline) { - if (($errno & error_reporting()) == 0) { - return; - } - else { + if (($errno & error_reporting()) != 0) { switch ($errno) { case E_USER_WARNING: case E_WARNING: @@ -438,7 +445,7 @@ abstract class Output { $str = $type; break; } - $this->add($str . ' in script', $type, $errstr . ' in ' . $errfile . ':' . $errline); + $this->add($str, $type, $errstr . ' in ' . $errfile . ':' . $errline); } } @@ -448,5 +455,3 @@ abstract class Output { echo $this->getOutput(); } } - -?> diff --git a/include/record.php b/include/record.php index 3bdc50e..12a5f3a 100755 --- a/include/record.php +++ b/include/record.php @@ -25,32 +25,33 @@ */ class Record implements Object { + public $host, $ttl, $class, $type, $rdata; /* * Constructors */ public function __construct(Host $host, $ttl, $class, $type, $rdata) { - $config = Registry::get('config'); + global $config; $this->host = $host; if (is_int($ttl) && $ttl > 0 && $ttl <= $config['sddns']['max_ttl']) { $this->ttl = $ttl; } else { - throw new UserException('Invalid ttl: ' . $ttl); + throw new UserException('Invalid ttl', $ttl); } if (in_array($class, $config['sddns']['classes'])) { $this->class = $class; } else { - throw new UserException('Invalid class: ' . $class); + throw new UserException('invalid class', $class); } if (in_array($type, $config['sddns']['types'])) { $this->type = $type; } else { - throw new UserException('Invalid type: ' . $type); + throw new UserException('invalid type', $type); } $this->setRData($rdata); @@ -72,22 +73,31 @@ class Record implements Object { $this->rdata = $rdata; } } else { - throw new ValidationException('Invalid rdata: ' . $rdata); + throw new ValidationException('invalid rdata', $rdata); } } + public function setTtl($ttl) { + if (is_numeric($ttl)) { + $this->ttl = $ttl; + } + else { + throw new ValidationException('invalid ttl', $ttl); + } + } + + /* * Database */ public function add(Database $db, $lifetime) { - $config = Registry::get('config'); - $db = Registry::get('db'); + global $config; if ($this->host->isRegistred($db)) { $host = new DBHost($this->host->isRegistred($db), $db); } else { - throw new UserException('Unable to add record: Host is not registred!'); + throw new UserException('unable to add record: host is not registred!'); } $sql = 'INSERT INTO ' . $config['db']['tbl']['records'] . ' (host_id, ttl, class, type, rdata, created, last_accessed, lifetime, ip) VALUES ( @@ -144,7 +154,7 @@ class Record implements Object { } public function isRegistred(Database $db) { - $config = Registry::get('config'); + global $config; $sql = 'SELECT * FROM ' . $config['db']['tbl']['records'] . ' AS r @@ -200,7 +210,7 @@ class Record implements Object { } public function toHtml() { - $html = '' . $this->host->toHtml() . ' ' . $this->ttl . ' ' . $this->class . ' ' . $this->type . ''; + $html = '' . $this->host->toHtml() . ' ' . $this->ttl . ' ' . $this->class . ' ' . $this->type . ''; $html .= ' '; switch ($this->type) { @@ -211,7 +221,7 @@ class Record implements Object { case 'NS': case 'CNAME': - $html .= '' . $this->rdata . ''; + $html .= '' . $this->rdata . ''; break; default: @@ -223,4 +233,3 @@ class Record implements Object { } } -?> diff --git a/include/registry.php b/include/registry.php deleted file mode 100755 index 0dcdccc..0000000 --- a/include/registry.php +++ /dev/null @@ -1,108 +0,0 @@ - - * @link http://www.steffenvogel.de - */ -/* - * This file is part of sddns - * - * sddns is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * sddns is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with sddns. If not, see
+
-