From 01c0ad425f3b30f6b0f5a7b9fc7570687ec4f975 Mon Sep 17 00:00:00 2001
From: Stricted <info@stricted.de>
Date: Thu, 4 Jun 2015 14:01:47 +0200
Subject: [PATCH] move vendors to other folder

---
 .gitmodules                                      | 4 ++--
 lib/page/DomainAddPage.class.php                 | 4 ++++
 lib/page/IndexPage.class.php                     | 2 +-
 lib/page/RecordAddPage.class.php                 | 2 +-
 lib/page/RecordEditPage.class.php                | 2 +-
 lib/page/RecordListPage.class.php                | 2 +-
 lib/system/DNS.class.php                         | 4 ++--
 lib/{ => system}/api/idna/idna_convert.class.php | 2 +-
 lib/{ => system}/api/smarty                      | 0
 9 files changed, 13 insertions(+), 9 deletions(-)
 rename lib/{ => system}/api/idna/idna_convert.class.php (99%)
 rename lib/{ => system}/api/smarty (100%)

diff --git a/.gitmodules b/.gitmodules
index a0c0782..2defb5e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "lib/api/smarty"]
-	path = lib/api/smarty
+[submodule "lib/system/api/smarty"]
+	path = lib/system/api/smarty
 	url = https://github.com/smarty-php/smarty.git
diff --git a/lib/page/DomainAddPage.class.php b/lib/page/DomainAddPage.class.php
index dcf7694..24a8447 100644
--- a/lib/page/DomainAddPage.class.php
+++ b/lib/page/DomainAddPage.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace dns\page;
+use dns\system\api\idna\idna_convert;
 use dns\system\DNS;
 use dns\system\User;
 
@@ -17,11 +18,14 @@ class DomainAddPage extends AbstractPage {
 		}
 		if (isset($_POST['origin']) && isset($_POST['submit'])) {
 			if (!empty($_POST['origin'])) {
+				$idna = new idna_convert();
 				$origin = $_POST['origin'];
 				if (substr($origin, -1) != ".") {
 					$origin = $origin.".";
 				}
 				
+				$origin = $idna->encode($origin);
+				
 				$serial = date("Ymd")."01";
 				
 				$sql = "SELECT * FROM dns_soa WHERE origin = ?";
diff --git a/lib/page/IndexPage.class.php b/lib/page/IndexPage.class.php
index 6a79914..ce98011 100644
--- a/lib/page/IndexPage.class.php
+++ b/lib/page/IndexPage.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace dns\page;
-use dns\api\idna\idna_convert;
+use dns\system\api\idna\idna_convert;
 use dns\system\DNS;
 use dns\system\User;
 
diff --git a/lib/page/RecordAddPage.class.php b/lib/page/RecordAddPage.class.php
index ce7c6b8..91c817c 100644
--- a/lib/page/RecordAddPage.class.php
+++ b/lib/page/RecordAddPage.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace dns\page;
-use dns\api\idna\idna_convert;
+use dns\system\api\idna\idna_convert;
 use dns\system\DNS;
 use dns\system\User;
 
diff --git a/lib/page/RecordEditPage.class.php b/lib/page/RecordEditPage.class.php
index c9a0ae8..ae4283b 100644
--- a/lib/page/RecordEditPage.class.php
+++ b/lib/page/RecordEditPage.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace dns\page;
-use dns\api\idna\idna_convert;
+use dns\system\api\idna\idna_convert;
 use dns\system\DNS;
 use dns\system\User;
 
diff --git a/lib/page/RecordListPage.class.php b/lib/page/RecordListPage.class.php
index 36a97f1..c63ec61 100644
--- a/lib/page/RecordListPage.class.php
+++ b/lib/page/RecordListPage.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace dns\page;
-use dns\api\idna\idna_convert;
+use dns\system\api\idna\idna_convert;
 use dns\system\DNS;
 use dns\system\User;
 
diff --git a/lib/system/DNS.class.php b/lib/system/DNS.class.php
index 8072520..03e87ac 100644
--- a/lib/system/DNS.class.php
+++ b/lib/system/DNS.class.php
@@ -260,13 +260,13 @@ class DNS {
 			$tpl = self::getSession()->tpl;
 		}
 		
-		require_once(DNS_DIR.'/lib/api/smarty/libs/Smarty.class.php');
+		require_once(DNS_DIR.'/lib/system/api/smarty/libs/Smarty.class.php');
 		self::$tplObj = new \Smarty;
 		
 		self::getTPL()->setTemplateDir(DNS_DIR."/templates/".$tpl);
 		self::getTPL()->setCompileDir(DNS_DIR."/templates/compiled/".$tpl);
 		self::getTPL()->setPluginsDir(array(
-			DNS_DIR."/lib/api/smarty/libs/plugins",
+			DNS_DIR."/lib/system/api/smarty/libs/plugins",
 			DNS_DIR."/lib/template/plugins"
 		));
 		self::getTPL()->loadFilter('pre', 'hascontent');
diff --git a/lib/api/idna/idna_convert.class.php b/lib/system/api/idna/idna_convert.class.php
similarity index 99%
rename from lib/api/idna/idna_convert.class.php
rename to lib/system/api/idna/idna_convert.class.php
index 2190cfc..89db287 100644
--- a/lib/api/idna/idna_convert.class.php
+++ b/lib/system/api/idna/idna_convert.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace dns\api\idna;
+namespace dns\system\api\idna;
 
 // {{{ license
 
diff --git a/lib/api/smarty b/lib/system/api/smarty
similarity index 100%
rename from lib/api/smarty
rename to lib/system/api/smarty
-- 
2.20.1