';
+ $actions .= '
';
+
+ if ($output instanceof HtmlOutput) $output->add(get_class($row), 'data', $row->host, $row, $actions);
+ else $output->add(get_class($row), 'data', $row->host, $row);
break;
case 'hosts':
+ $params = 'host=' . $row->toPunycode() . '&zone=' . $row->zone->name;
+ $actions = '';
+ $actions .= '';
+
+ if ($output instanceof HtmlOutput) $output->add(get_class($row), 'data', $row, $actions);
+ else $output->add(get_class($row), 'data', $row);
+ break;
+ case 'records':
+ $params = 'host=' . $row->host->toPunycode() . '&zone=' . $row->host->zone->name . '&type=' . $row->type . '&class=' . $row->class . '&rdata=' . $row->rdata;
+ $actions = '';
+ $actions .= '';
+
+ if ($output instanceof HtmlOutput) $output->add(get_class($row), 'data', $row, $actions);
+ else $output->add(get_class($row), 'data', $row);
+ break;
case 'logs':
case 'queries':
- case 'records':
default:
- $output->add('', 'data', $row);
+ $output->add('data', 'data', $row);
}
}
}
diff --git a/delete.php b/delete.php
index 4e467ca..59f6a54 100755
--- a/delete.php
+++ b/delete.php
@@ -2,25 +2,24 @@
require_once 'include/init.php';
$output = Output::start();
-
$pw = @$_REQUEST['pw'];
if (array_key_exists($_REQUEST['zone'], $config['sddns']['zones'])) {
$zone = $config['sddns']['zones'][$_REQUEST['zone']];
-
+
if (!empty($_REQUEST['host'])) {
if ($host = reset(DBHost::get($db, array('host' => $_REQUEST['host'], 'zone' => $zone)))) {
if ($host->checkPassword($pw) || isAuthentificated()) {
if (isset($_REQUEST['class']) && in_array($_REQUEST['class'], $config['sddns']['classes']))
$class = $_REQUEST['class'];
-
+
if (isset($_REQUEST['type']) && in_array($_REQUEST['type'], $config['sddns']['types'])) {
$type = $_REQUEST['type'];
-
+
if (isset($_REQUEST['rdata']) && Record::isRData($_REQUEST['rdata'], $type))
$rdata = $_REQUEST['rdata'];
}
-
+
if (@$type == 'URL' || empty($type)) {
$uris = DBUri::get($db, array('zone' => $zone, 'host' => $host));
foreach ($uris as $uri) {
@@ -28,7 +27,7 @@ if (array_key_exists($_REQUEST['zone'], $config['sddns']['zones'])) {
$output->add('uri deleted from db', 'success', $uri);
}
}
-
+
if (@$type != 'URL' || empty($type)) {
$records = DBRecord::get($db, array('zone' => $zone, 'host' => $host, 'type' => @$type, 'class' => @$class, 'rdata' => @$rdata));
foreach ($records as $record) {
@@ -36,7 +35,7 @@ if (array_key_exists($_REQUEST['zone'], $config['sddns']['zones'])) {
$output->add('record deleted from db', 'success', $record);
}
}
-
+
$zone->cleanup($db);
$zone->sync($db);
}
diff --git a/expert.php b/expert.php
index c3b427d..c58508a 100755
--- a/expert.php
+++ b/expert.php
@@ -84,12 +84,13 @@ $checkedType = (isset($_REQUEST['type'])) ? $_REQUEST['type'] : $config['sddns']
simple mode - + admin - '; ?> usage - wiki - bookmarklet - diff --git a/images/delete.png b/images/delete.png new file mode 100644 index 0000000..08f2493 Binary files /dev/null and b/images/delete.png differ diff --git a/images/edit.png b/images/edit.png new file mode 100644 index 0000000..af486c9 Binary files /dev/null and b/images/edit.png differ diff --git a/include/db.php b/include/db.php index 768e220..95b9b03 100755 --- a/include/db.php +++ b/include/db.php @@ -64,15 +64,15 @@ abstract class DBResultSet implements Iterator { public function valid() { return (bool) is_array($this->current()); } - + public function first() { return (isset($this->_rows[0])) ? $this->_rows[0] : null; } - + public function last() { return $this->_rows[$this->_num_rows - 1]; } - + public function count() { return $this->_num_rows; } @@ -141,4 +141,4 @@ abstract class Database implements IDatabase { protected $statements = array(); } -?> \ No newline at end of file +?> diff --git a/include/functions.php b/include/functions.php index 5e39300..000118f 100755 --- a/include/functions.php +++ b/include/functions.php @@ -2,7 +2,7 @@ function isAuthentificated() { $config = Registry::get('config'); - $htpasswd = file('../.htpasswd'); + $htpasswd = file('/var/www/nulll/.htpasswd'); foreach ($htpasswd as $line) { list($user, $crypt) = explode(':', $line); diff --git a/include/host.php b/include/host.php index 57016dd..dac0386 100755 --- a/include/host.php +++ b/include/host.php @@ -2,16 +2,16 @@ class Host implements Object { private $punycode; - public $zone; + public $zone; public $generated; - + /* * Constructor & Factory */ public function __construct($hostname, Zone $zone, $generated = false) { $hostname = strtolower($hostname); if (self::isValid(idn_to_ascii($hostname))) { - $this->punycode = idn_to_ascii($hostname); + $this->punycode = idn_to_ascii($hostname); $this->zone = $zone; $this->generated = $generated; } @@ -22,7 +22,7 @@ class Host implements Object { throw new UserException('Invalid hostname: ' . idn_to_ascii($hostname)); } } - + public static function unique(Zone $zone, Database $db) { $config = Registry::get('config'); @@ -32,25 +32,25 @@ class Host implements Object { generated = TRUE && zone = \'' . $db->escape($zone->name) . '\' ORDER BY id DESC'; - + $result = $db->query($sql, 1); $first = $result->first(); $last_id = base_convert($first['hostname'], 36, 10); while ($result->count() > 0 || !Host::isValid(base_convert($last_id, 10, 36))) { - + $sql = 'SELECT hostname FROM ' . $config['db']['tbl']['hosts'] . ' WHERE hostname = \'' . base_convert(++$last_id, 10, 36) . '\' && zone = \'' . $db->escape($zone->name) . '\''; - + $result = $db->query($sql, 1); } return new self(base_convert($last_id, 10, 36), $zone, true); } - + /* * Checks */ @@ -58,7 +58,7 @@ class Host implements Object { $hostExpr = '[a-z0-9](?:[a-z0-9\-]*[a-z0-9])?'; return preg_match('/^(?:\*|(\*\.)?(' . $hostExpr . '\.)*(' . $hostExpr . '))$/i', $hostname); } - + public function isRegistred(Database $db) { $config = Registry::get('config'); @@ -71,7 +71,7 @@ class Host implements Object { return ($result->count() > 0) ? $host['id'] : false; } - + /* * Database */ @@ -86,35 +86,35 @@ class Host implements Object { ' . (int) $this->generated . ')'; $db->execute($sql); - + return new DBHost($db->lastId(), $db); } - + /* * Output */ public function toUnicode() { return idn_to_utf8($this->punycode); } - + public function toPunycode() { return $this->punycode; } - + public function __toString() { return $this->toPunycode() . '.' . $this->zone->name; } - + public function toXml(DOMDocument $doc) { $xmlHost = $doc->createElement('host'); $xmlHost->appendChild($doc->createElement('hostname', $this->toPunycode())); $xmlHost->appendChild($doc->createElement('idn', $this->toUnicode())); $xmlHost->appendChild($this->zone->toXml($doc)); - + return $xmlHost; } - + public function toHtml() { return '' . $this->toUnicode() . '.' . $this->zone->name . ''; } diff --git a/include/mysql.php b/include/mysql.php index 93c573f..71e3abd 100755 --- a/include/mysql.php +++ b/include/mysql.php @@ -42,11 +42,11 @@ class MySql extends Database { $this->connect($host, $user, $pw); $this->select($db); } - + function __destruct() { $this->close(); } - + /** * @brief create database connection * @param string $host IP or domain of the database host @@ -60,7 +60,7 @@ class MySql extends Database { error_reporting($__er); throw new MySqlException(); } - + error_reporting($__er); } @@ -90,6 +90,8 @@ class MySql extends Database { * @return mixed */ public function execute($sql) { + if ($output = Registry::get('output')) $output->add('db query', 'debug', 8, $sql); + if (!($result = mysql_unbuffered_query($sql, $this->resource))) throw new MySqlException(); return $result; @@ -107,7 +109,7 @@ class MySql extends Database { $sql .= sprintf(' LIMIT %d, %d', $offset, $limit); return new MySqlResult($this->execute($sql)); } - + /** * @brief mysql escape * @param string $sql query @@ -115,11 +117,11 @@ class MySql extends Database { public function escape($sql) { return mysql_real_escape_string($sql, $this->resource); } - + public function lastId() { return mysql_insert_id($this->resource); } - + public function affectedRows() { return mysql_affected_rows($this->resource); } diff --git a/include/output.php b/include/output.php index be42a5a..b5ade11 100755 --- a/include/output.php +++ b/include/output.php @@ -1,5 +1,21 @@ getMessages()); + + $json = array(); + + foreach ($this->getMessages() as $index => $message) { + + } + } +} + class XmlOutput extends Output { public function __construct($debug) { parent::__construct('text/xml', 'UTF-8', $debug); @@ -327,6 +343,9 @@ abstract class Output { return new GifOutput(); break; + case 'json': + return new JsonOutput($debug); + case 'html': case 'php': default: @@ -339,7 +358,7 @@ abstract class Output { global $argc; $site = Registry::get('site'); - + if (isset($forced)) $format = $forced; elseif (isset($argc)) diff --git a/include/zone.php b/include/zone.php index 8706b2c..32bd7d9 100755 --- a/include/zone.php +++ b/include/zone.php @@ -2,7 +2,7 @@ class Zone extends NameServer implements Object { public $name; - public $key; + private $key; function __construct($nserver, $name, $key, $nsport = 53) { parent::__construct($nserver, $nsport); @@ -42,7 +42,7 @@ class Zone extends NameServer implements Object { LEFT JOIN ' . $config['db']['tbl']['hosts'] . ' AS h ON h.id = u.host_id WHERE - ((u.last_accessed + INTERVAL u.lifetime SECOND) < NOW()&& + ((u.last_accessed + INTERVAL u.lifetime SECOND) < NOW() && h.zone = \'' . $db->escape($this->name) . '\') || h.id IS NULL'; $db->execute($sql); diff --git a/update.php b/update.php index 1f0879a..52f0ce7 100755 --- a/update.php +++ b/update.php @@ -68,12 +68,12 @@ if (!empty($zone)) { $records[0]->lastAccessed = time(); $records[0]->update(); $output->add('record updated in db', 'success', $records[0]); - + for ($i = 1; $i < count($records); $i++) { $records[$i]->delete(); $output->add('record deleted from db', 'warning', $records[$i]); } - + $zone->cleanup($db); $zone->sync($db); }