From: Stricted <info@stricted.net>
Date: Mon, 20 Jun 2016 19:13:32 +0000 (+0200)
Subject: move submodules to vendor folder
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8b5af9ceca91c80ffdd85db343e930a5df369c3;p=GitHub%2FStricted%2FDomain-Control-Panel.git

move submodules to vendor folder
---

diff --git a/.gitmodules b/.gitmodules
index 4ea04e0..ba9b266 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "lib/system/api/smarty"]
-	path = lib/system/api/smarty
-	url = https://github.com/smarty-php/smarty.git
-[submodule "lib/system/api/idna-convert"]
-	path = lib/system/api/idna-convert
+[submodule "vendor/idna-convert"]
+	path = vendor/idna-convert
 	url = https://github.com/phlylabs/idna-convert.git
+[submodule "vendor/smarty"]
+	path = vendor/smarty
+	url = https://github.com/smarty-php/smarty.git
diff --git a/lib/system/DNS.class.php b/lib/system/DNS.class.php
index 5950fb6..a38dc6a 100644
--- a/lib/system/DNS.class.php
+++ b/lib/system/DNS.class.php
@@ -115,7 +115,7 @@ class DNS {
 			else if ($abbreviation == "Mso") {
 				array_shift($namespaces);
 				
-				$classPath = DNS_DIR.'/lib/system/api/idna-convert/src/'.implode('/', $namespaces).'.php';
+				$classPath = DNS_DIR.'/vendor/idna-convert/src/'.implode('/', $namespaces).'.php';
 				if (file_exists($classPath)) {
 					require_once($classPath);
 				}
@@ -319,11 +319,11 @@ class DNS {
 			$tpl = self::getSession()->tpl;
 		}
 		
-		if (!file_exists(DNS_DIR.'/lib/system/api/smarty/libs/Smarty.class.php')) {
+		if (!file_exists(DNS_DIR.'/vendor/smarty/libs/Smarty.class.php')) {
 			throw new SystemException('Unable to find Smarty');
 		}
 		
-		require_once(DNS_DIR.'/lib/system/api/smarty/libs/Smarty.class.php');
+		require_once(DNS_DIR.'/vendor/smarty/libs/Smarty.class.php');
 		self::$tplObj = new \Smarty;
 		
 		if (!empty(self::$module)) {
diff --git a/lib/system/api/idna-convert b/lib/system/api/idna-convert
deleted file mode 160000
index a6dfb6f..0000000
--- a/lib/system/api/idna-convert
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a6dfb6f87611e3a89d2eec4924a0f51db755c573
diff --git a/lib/system/api/smarty b/lib/system/api/smarty
deleted file mode 160000
index 35480f1..0000000
--- a/lib/system/api/smarty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35480f10e7ce9b0fdaf23d3799d7b79463919b1e
diff --git a/vendor/idna-convert b/vendor/idna-convert
new file mode 160000
index 0000000..a6dfb6f
--- /dev/null
+++ b/vendor/idna-convert
@@ -0,0 +1 @@
+Subproject commit a6dfb6f87611e3a89d2eec4924a0f51db755c573
diff --git a/vendor/smarty b/vendor/smarty
new file mode 160000
index 0000000..35480f1
--- /dev/null
+++ b/vendor/smarty
@@ -0,0 +1 @@
+Subproject commit 35480f10e7ce9b0fdaf23d3799d7b79463919b1e