move submodules to vendor folder

diff --git a/.gitmodules b/.gitmodules
index 4ea04e0d7b73fd43a2bfb1dc969cf7f2b5d1f2e5..ba9b26614fd23b9c4e3fc6908371427af97f837b 100644 (file)
--- 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 5950fb67c8b41c303bf7e139e24d2470545dc7b7..a38dc6a3da0b8c2b9f72c63ecb30ea0c9fadf5eb 100644 (file)
--- 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 (submodule)
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 (submodule)
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 (submodule)
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 (submodule)
index 0000000..35480f1
--- /dev/null
+++ b/vendor/smarty
@@ -0,0 +1 @@
+Subproject commit 35480f10e7ce9b0fdaf23d3799d7b79463919b1e