Fixed whitespace errors, removed unneccessary tables
This commit is contained in:
parent
107bfc7c67
commit
a105edc4ab
|
@ -149,8 +149,6 @@ if(isset($input->action) && $input->action == "getSoa") {
|
||||||
$retval['retry'] = $content[4];
|
$retval['retry'] = $content[4];
|
||||||
$retval['expire'] = $content[5];
|
$retval['expire'] = $content[5];
|
||||||
$retval['ttl'] = $content[6];
|
$retval['ttl'] = $content[6];
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Action for getting SOA Serial
|
//Action for getting SOA Serial
|
||||||
|
|
|
@ -38,7 +38,6 @@ if(isset($input->action) && $input->action == "addUser") {
|
||||||
$db->beginTransaction();
|
$db->beginTransaction();
|
||||||
|
|
||||||
$stmt = $db->prepare("INSERT INTO users(name,password,type) VALUES (:name,:password,:type)");
|
$stmt = $db->prepare("INSERT INTO users(name,password,type) VALUES (:name,:password,:type)");
|
||||||
|
|
||||||
$stmt->bindValue(':name', $input->name, PDO::PARAM_STR);
|
$stmt->bindValue(':name', $input->name, PDO::PARAM_STR);
|
||||||
$stmt->bindValue(':password', $passwordHash, PDO::PARAM_STR);
|
$stmt->bindValue(':password', $passwordHash, PDO::PARAM_STR);
|
||||||
$stmt->bindValue(':type', $input->type, PDO::PARAM_STR);
|
$stmt->bindValue(':type', $input->type, PDO::PARAM_STR);
|
||||||
|
|
114
api/install.php
114
api/install.php
|
@ -94,58 +94,7 @@ CREATE TABLE IF NOT EXISTS options (
|
||||||
|
|
||||||
DELETE FROM options where name='schema_version';
|
DELETE FROM options where name='schema_version';
|
||||||
|
|
||||||
INSERT INTO options(name,value) VALUES ('schema_version', 4);
|
INSERT INTO options(name,value) VALUES ('schema_version', 3);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS supermasters (
|
|
||||||
ip VARCHAR(64) NOT NULL,
|
|
||||||
nameserver VARCHAR(255) NOT NULL,
|
|
||||||
account VARCHAR(40) NOT NULL,
|
|
||||||
PRIMARY KEY (ip, nameserver)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS comments (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
type VARCHAR(10) NOT NULL,
|
|
||||||
modified_at INT NOT NULL,
|
|
||||||
account VARCHAR(40) NOT NULL,
|
|
||||||
comment VARCHAR(64000) NOT NULL,
|
|
||||||
PRIMARY KEY (id),
|
|
||||||
KEY comments_domain_id_idx (domain_id),
|
|
||||||
KEY comments_name_type_idx (name,type),
|
|
||||||
KEY comments_order_idx (domain_id, modified_at)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS domainmetadata (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
kind VARCHAR(32),
|
|
||||||
content TEXT,
|
|
||||||
PRIMARY KEY (id),
|
|
||||||
KEY domainmetadata_idx (domain_id, kind)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS cryptokeys (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
flags INT NOT NULL,
|
|
||||||
active BOOL,
|
|
||||||
content TEXT,
|
|
||||||
PRIMARY KEY(id),
|
|
||||||
KEY domainidindex (domain_id)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS tsigkeys (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
name VARCHAR(255),
|
|
||||||
algorithm VARCHAR(50),
|
|
||||||
secret VARCHAR(255),
|
|
||||||
PRIMARY KEY (id),
|
|
||||||
UNIQUE KEY namealgoindex (name, algorithm)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
";
|
";
|
||||||
|
|
||||||
$sql["pgsql"]="
|
$sql["pgsql"]="
|
||||||
|
@ -231,66 +180,9 @@ CREATE TABLE IF NOT EXISTS options (
|
||||||
|
|
||||||
DELETE FROM options where name='schema_version';
|
DELETE FROM options where name='schema_version';
|
||||||
|
|
||||||
INSERT INTO options(name,value) VALUES ('schema_version', 4);
|
INSERT INTO options(name,value) VALUES ('schema_version', 3);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS supermasters (
|
|
||||||
ip INET NOT NULL,
|
|
||||||
nameserver VARCHAR(255) NOT NULL,
|
|
||||||
account VARCHAR(40) NOT NULL,
|
|
||||||
PRIMARY KEY(ip, nameserver)
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS comments (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
type VARCHAR(10) NOT NULL,
|
|
||||||
modified_at INT NOT NULL,
|
|
||||||
account VARCHAR(40) DEFAULT NULL,
|
|
||||||
comment VARCHAR(65535) NOT NULL,
|
|
||||||
CONSTRAINT domain_exists
|
|
||||||
FOREIGN KEY(domain_id) REFERENCES domains(id)
|
|
||||||
ON DELETE CASCADE,
|
|
||||||
CONSTRAINT c_lowercase_name CHECK (((name)::TEXT = LOWER((name)::TEXT)))
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS comments_domain_id_idx ON comments (domain_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS comments_name_type_idx ON comments (name, type);
|
|
||||||
CREATE INDEX IF NOT EXISTS comments_order_idx ON comments (domain_id, modified_at);
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS domainmetadata (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
domain_id INT REFERENCES domains(id) ON DELETE CASCADE,
|
|
||||||
kind VARCHAR(32),
|
|
||||||
content TEXT
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS domainidmetaindex ON domainmetadata(domain_id);
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS cryptokeys (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
domain_id INT REFERENCES domains(id) ON DELETE CASCADE,
|
|
||||||
flags INT NOT NULL,
|
|
||||||
active BOOL,
|
|
||||||
content TEXT
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS domainidindex ON cryptokeys(domain_id);
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS tsigkeys (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
name VARCHAR(255),
|
|
||||||
algorithm VARCHAR(50),
|
|
||||||
secret VARCHAR(255),
|
|
||||||
CONSTRAINT c_lowercase_name CHECK (((name)::TEXT = LOWER((name)::TEXT)))
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX IF NOT EXISTS namealgoindex ON tsigkeys(name, algorithm);
|
|
||||||
";
|
";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$db = new PDO("$input->type:dbname=$input->database;host=$input->host;port=$input->port", $input->user, $input->password);
|
$db = new PDO("$input->type:dbname=$input->database;host=$input->host;port=$input->port", $input->user, $input->password);
|
||||||
}
|
}
|
||||||
|
|
113
api/upgrade.php
113
api/upgrade.php
|
@ -56,7 +56,6 @@ if(isset($input->action) && $input->action == "requestUpgrade") {
|
||||||
";
|
";
|
||||||
$sql["pgsql"] = "INSERT INTO options(name,value) VALUES ('schema_version', 1);";
|
$sql["pgsql"] = "INSERT INTO options(name,value) VALUES ('schema_version', 1);";
|
||||||
$queries = explode(";", $sql[$dbType]);
|
$queries = explode(";", $sql[$dbType]);
|
||||||
|
|
||||||
$db->beginTransaction();
|
$db->beginTransaction();
|
||||||
|
|
||||||
foreach ($queries as $query) {
|
foreach ($queries as $query) {
|
||||||
|
@ -100,7 +99,6 @@ if(isset($input->action) && $input->action == "requestUpgrade") {
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->commit();
|
$db->commit();
|
||||||
|
|
||||||
}
|
}
|
||||||
if($currentVersion < 3) {
|
if($currentVersion < 3) {
|
||||||
$sql["mysql"] = "
|
$sql["mysql"] = "
|
||||||
|
@ -118,117 +116,7 @@ if(isset($input->action) && $input->action == "requestUpgrade") {
|
||||||
UPDATE options SET value=3 WHERE name='schema_version';
|
UPDATE options SET value=3 WHERE name='schema_version';
|
||||||
";
|
";
|
||||||
$sql["pgsql"] = "UPDATE options SET value=3 WHERE name='schema_version';";
|
$sql["pgsql"] = "UPDATE options SET value=3 WHERE name='schema_version';";
|
||||||
$queries = explode(";", $sql[$dbType]);
|
|
||||||
|
|
||||||
$db->beginTransaction();
|
|
||||||
|
|
||||||
foreach ($queries as $query) {
|
|
||||||
if (preg_replace('/\s+/', '', $query) != '') {
|
|
||||||
$db->exec($query);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$db->commit();
|
|
||||||
|
|
||||||
}
|
|
||||||
if($currentVersion < 4) {
|
|
||||||
$sql["mysql"] = "
|
|
||||||
CREATE TABLE IF NOT EXISTS supermasters (
|
|
||||||
ip VARCHAR(64) NOT NULL,
|
|
||||||
nameserver VARCHAR(255) NOT NULL,
|
|
||||||
account VARCHAR(40) NOT NULL,
|
|
||||||
PRIMARY KEY (ip, nameserver)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS comments (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
type VARCHAR(10) NOT NULL,
|
|
||||||
modified_at INT NOT NULL,
|
|
||||||
account VARCHAR(40) NOT NULL,
|
|
||||||
comment VARCHAR(64000) NOT NULL,
|
|
||||||
PRIMARY KEY (id),
|
|
||||||
KEY comments_domain_id_idx (domain_id),
|
|
||||||
KEY comments_name_type_idx (name,type),
|
|
||||||
KEY comments_order_idx (domain_id, modified_at)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS cryptokeys (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
domain_id INT NOT NULL,
|
|
||||||
flags INT NOT NULL,
|
|
||||||
active BOOL,
|
|
||||||
content TEXT,
|
|
||||||
PRIMARY KEY(id),
|
|
||||||
KEY domainidindex (domain_id)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS tsigkeys (
|
|
||||||
id INT AUTO_INCREMENT,
|
|
||||||
name VARCHAR(255),
|
|
||||||
algorithm VARCHAR(50),
|
|
||||||
secret VARCHAR(255),
|
|
||||||
PRIMARY KEY (id),
|
|
||||||
UNIQUE KEY namealgoindex (name, algorithm)
|
|
||||||
) Engine=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
DELETE FROM permissions
|
|
||||||
WHERE user IN (
|
|
||||||
SELECT id FROM user
|
|
||||||
LEFT OUTER JOIN (
|
|
||||||
SELECT MIN(U.id) AS minid, U.name
|
|
||||||
FROM user AS U
|
|
||||||
GROUP BY U.name
|
|
||||||
) as KeepRows ON user.id = KeepRows.minid
|
|
||||||
WHERE KeepRows.minid IS NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE permissions ADD userid INT NOT NULL;
|
|
||||||
|
|
||||||
UPDATE permissions SET userid = user;
|
|
||||||
|
|
||||||
ALTER TABLE permissions DROP FOREIGN KEY permissions_ibfk_2;
|
|
||||||
|
|
||||||
ALTER TABLE permissions DROP user;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id int(11) NOT NULL,
|
|
||||||
name varchar(50) NOT NULL,
|
|
||||||
password varchar(200) NOT NULL,
|
|
||||||
type varchar(20) NOT NULL,
|
|
||||||
PRIMARY KEY (id)
|
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
|
||||||
|
|
||||||
INSERT INTO users (id, name, password, type) SELECT id, name, password, type FROM user;
|
|
||||||
|
|
||||||
DELETE FROM users
|
|
||||||
WHERE users.id IN (
|
|
||||||
SELECT user.id FROM user
|
|
||||||
LEFT OUTER JOIN (
|
|
||||||
SELECT MIN(U.id) AS minid, U.name
|
|
||||||
FROM user AS U
|
|
||||||
GROUP BY U.name
|
|
||||||
) as KeepRows ON user.id = KeepRows.minid
|
|
||||||
WHERE KeepRows.minid IS NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE users ADD CONSTRAINT UNIQUE KEY user_name_index (name);
|
|
||||||
|
|
||||||
ALTER TABLE users MODIFY COLUMN id int(11) NOT NULL AUTO_INCREMENT;
|
|
||||||
|
|
||||||
ALTER TABLE permissions ADD CONSTRAINT permissions_ibfk_2 FOREIGN KEY (userid) REFERENCES users (id) ON DELETE CASCADE;
|
|
||||||
|
|
||||||
DROP TABLE user;
|
|
||||||
|
|
||||||
UPDATE domains SET name=LOWER(name);
|
|
||||||
|
|
||||||
UPDATE records SET name=LOWER(name);
|
|
||||||
|
|
||||||
UPDATE options SET value=4 WHERE name='schema_version';
|
|
||||||
";
|
|
||||||
$sql["pgsql"] = "UPDATE options SET value=4 WHERE name='schema_version';";
|
|
||||||
$queries = explode(";", $sql[$dbType]);
|
$queries = explode(";", $sql[$dbType]);
|
||||||
|
|
||||||
$db->beginTransaction();
|
$db->beginTransaction();
|
||||||
|
@ -241,6 +129,7 @@ if(isset($input->action) && $input->action == "requestUpgrade") {
|
||||||
|
|
||||||
$db->commit();
|
$db->commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
$retval['status'] = "success";
|
$retval['status'] = "success";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -93,8 +93,8 @@ limitations under the License.
|
||||||
<?php
|
<?php
|
||||||
if($_SESSION['type'] == "admin") {
|
if($_SESSION['type'] == "admin") {
|
||||||
echo '<div class="row text-center">';
|
echo '<div class="row text-center">';
|
||||||
echo '<a class="btn btn-primary" href="add-domain.php#NATIVE">Add NATIVE</a>';
|
echo '<a class="btn btn-success" href="add-domain.php#MASTER">Add MASTER</a>';
|
||||||
echo '<a class="btn btn-success margin-left-20" href="add-domain.php#MASTER">Add MASTER</a>';
|
echo '<a class="btn btn-primary margin-left-20" href="add-domain.php#NATIVE">Add NATIVE</a>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -70,7 +70,7 @@ limitations under the License.
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="soa-mail" class="control-label">Email</label>
|
<label for="soa-mail" class="control-label">Email</label>
|
||||||
<input type="email" class="form-control" id="soa-mail" placeholder="Email" autocomplete="off" tabindex="2">
|
<input type="text" class="form-control" id="soa-mail" placeholder="Email" autocomplete="off" data-regex="^.+@[^.]+(\.[^.]+)*$" tabindex="2">
|
||||||
</div>
|
</div>
|
||||||
<button disabled type="submit" class="btn btn-primary" tabindex="7">Save</button>
|
<button disabled type="submit" class="btn btn-primary" tabindex="7">Save</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function getExpectedVersion() {
|
function getExpectedVersion() {
|
||||||
return 4;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkVersion($db) {
|
function checkVersion($db) {
|
||||||
|
@ -29,12 +29,12 @@ function checkVersion($db) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getVersion($db) {
|
function getVersion($db) {
|
||||||
|
|
||||||
$stmt = $db->prepare("SELECT value FROM options WHERE name='schema_version' LIMIT 1");
|
$stmt = $db->prepare("SELECT value FROM options WHERE name='schema_version' LIMIT 1");
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
$version = $stmt->fetchColumn();
|
$version = $stmt->fetchColumn();
|
||||||
if (!$version) {
|
if (!$version) {
|
||||||
$version = 0;
|
$version = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $version;
|
return $version;
|
||||||
}
|
}
|
Loading…
Reference in a new issue