From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/tools/dns_import_tupa.php | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/interface/web/tools/dns_import_tupa.php b/interface/web/tools/dns_import_tupa.php
index 2e2cbcb..fe931a7 100644
--- a/interface/web/tools/dns_import_tupa.php
+++ b/interface/web/tools/dns_import_tupa.php
@@ -56,19 +56,22 @@
$msg .= 'Connecting to external database...<br />';
//* Backup DB login details
- $conf_bak['db_host'] = $conf['db_host'];
+ /*$conf_bak['db_host'] = $conf['db_host'];
$conf_bak['db_database'] = $conf['db_database'];
$conf_bak['db_user'] = $conf['db_user'];
- $conf_bak['db_password'] = $conf['db_password'];
+ $conf_bak['db_password'] = $conf['db_password'];*/
//* Set external Login details
- $conf['db_host'] = $_POST['dbhost'];
- $conf['db_database'] = $_POST['dbname'];
- $conf['db_user'] = $_POST['dbuser'];
- $conf['db_password'] = $_POST['dbpassword'];
+ $conf['imp_db_host'] = $_POST['dbhost'];
+ $conf['imp_db_database'] = $_POST['dbname'];
+ $conf['imp_db_user'] = $_POST['dbuser'];
+ $conf['imp_db_password'] = $_POST['dbpassword'];
+ $conf['imp_db_charset'] = $conf['db_charset'];
+ $conf['imp_db_new_link'] = $conf['db_new_link'];
+ $conf['imp_db_client_flags'] = $conf['db_client_flags'];
//* create new db object
- $exdb = new db();
+ $exdb = new db('imp');
$server_id = 1;
$sys_userid = 1;
@@ -79,7 +82,7 @@
}
//* Connect to DB
- if($exdb->connect()) {
+ if($exdb !== false) {
$domains = $exdb->queryAllRecords("SELECT * FROM domains WHERE type = 'MASTER'");
if(is_array($domains)) {
foreach($domains as $domain) {
@@ -138,10 +141,10 @@
}
//* restore db login details
- $conf['db_host'] = $conf_bak['db_host'];
+ /*$conf['db_host'] = $conf_bak['db_host'];
$conf['db_database'] = $conf_bak['db_database'];
$conf['db_user'] = $conf_bak['db_user'];
- $conf['db_password'] = $conf_bak['db_password'];
+ $conf['db_password'] = $conf_bak['db_password'];*/
}
--
Gitblit v1.9.1