From dddc208bbb1917b8b499cf92816119f1818ed59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Thu, 26 Jan 2023 01:17:03 -0300
Subject: [PATCH 01/13] Add path option to createChild function

---
 cli/cyberPanel.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cli/cyberPanel.py b/cli/cyberPanel.py
index 734136e70..7c34ece6e 100755
--- a/cli/cyberPanel.py
+++ b/cli/cyberPanel.py
@@ -75,14 +75,13 @@ class cyberPanel:
             logger.writeforCLI(str(msg), "Error", stack()[0][3])
             self.printStatus(0, str(msg))
 
-    def createDomain(self, masterDomain, domainName, owner, php, ssl, dkim, openBasedir):
+    def createDomain(self, masterDomain, domainName, owner, php, ssl, dkim, openBasedir, path):
         try:
 
-            path = '/home/' + masterDomain + '/public_html/' + domainName
+            complete_path = '/home/' + masterDomain + '/' + path
             phpSelection = 'PHP ' + php
 
-            result = virtualHostUtilities.createDomain(masterDomain, domainName, phpSelection, path, ssl, dkim,
-                                                       openBasedir, owner, 0)
+            result = virtualHostUtilities.createDomain(masterDomain, domainName, phpSelection, complete_path, ssl, dkim, openBasedir, owner, 0)
 
             if result[0] == 1:
                 self.printStatus(1, 'None')
@@ -920,8 +919,13 @@ def main():
             openBasedir = int(args.openBasedir)
         else:
             openBasedir = 0
+            
+        if args.path:
+            path = args.path
+        else:
+            path = "public_html/" + args.childDomain
 
-        cyberpanel.createDomain(args.masterDomain, args.childDomain, args.owner, args.php, ssl, dkim, openBasedir)
+        cyberpanel.createDomain(args.masterDomain, args.childDomain, args.owner, args.php, ssl, dkim, openBasedir, path)
     elif args.function == "deleteChild":
 
         completeCommandExample = 'cyberpanel deleteChild --childDomain cyberpanel.net'

From 74a6f0312e2b52927c173f6b9beaea5b03c1b1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:15:31 -0300
Subject: [PATCH 02/13] Update cyberpanel_upgrade.sh

---
 cyberpanel_upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 4779a2f5c..8d76a764e 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -271,7 +271,7 @@ fi
 
 Pre_Upgrade_Setup_Git_URL() {
   if [[ $Server_Country != "CN" ]] ; then
-    Git_User="usmannasir"
+    Git_User="NNetworkBR"
     Git_Content_URL="https://raw.githubusercontent.com/${Git_User}/cyberpanel"
     Git_Clone_URL="https://github.com/${Git_User}/cyberpanel.git"
   else
@@ -553,7 +553,7 @@ fi
 
 Pre_Upgrade_Setup_Git_URL() {
 if [[ $Server_Country != "CN" ]] ; then
-  Git_User="usmannasir"
+  Git_User="NNetworkBR"
   Git_Content_URL="https://raw.githubusercontent.com/${Git_User}/cyberpanel"
   Git_Clone_URL="https://github.com/${Git_User}/cyberpanel.git"
 else

From 6899ba169fbd817f3525df952c8a2a85244dc2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:16:39 -0300
Subject: [PATCH 03/13] Update preUpgrade.sh

---
 preUpgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preUpgrade.sh b/preUpgrade.sh
index a1cdbad7e..b4c1a15f9 100644
--- a/preUpgrade.sh
+++ b/preUpgrade.sh
@@ -3,6 +3,6 @@
 BRANCH_NAME=v$(curl -s https://cyberpanel.net/version.txt | sed -e 's|{"version":"||g' -e 's|","build":|.|g'| sed 's:}*$::')
 
 rm -f /usr/local/cyberpanel_upgrade.sh
-wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
+wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
 chmod 700 /usr/local/cyberpanel_upgrade.sh
 /usr/local/cyberpanel_upgrade.sh

From af43ae0c307b15099daaa0861bba4a331d131cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:18:12 -0300
Subject: [PATCH 04/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c18ea068a..386f3bf49 100755
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ sh <(curl https://cyberpanel.net/install.sh || wget -O - https://cyberpanel.net/
 
 
 ```
-sh <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh)
+sh <(curl https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/preUpgrade.sh)
 ```
 
 # Resources

From bc7ceb59fa177443cb2e1e492f10a21e9ee2bb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:23:59 -0300
Subject: [PATCH 05/13] Update preUpgrade.sh

---
 preUpgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/preUpgrade.sh b/preUpgrade.sh
index b4c1a15f9..f2828a869 100644
--- a/preUpgrade.sh
+++ b/preUpgrade.sh
@@ -3,6 +3,7 @@
 BRANCH_NAME=v$(curl -s https://cyberpanel.net/version.txt | sed -e 's|{"version":"||g' -e 's|","build":|.|g'| sed 's:}*$::')
 
 rm -f /usr/local/cyberpanel_upgrade.sh
-wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
+#wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
+wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/cyberpanel_upgrade.sh 2>/dev/null
 chmod 700 /usr/local/cyberpanel_upgrade.sh
 /usr/local/cyberpanel_upgrade.sh

From 4a14ab6dfc3e06890b719400e245b1f1e31d4117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:28:37 -0300
Subject: [PATCH 06/13] Update cyberpanel_upgrade.sh

---
 cyberpanel_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 8d76a764e..7cda1c01d 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -471,7 +471,7 @@ fi
 Download_Requirement() {
 for i in {1..50};
   do
-  wget -O /usr/local/requirments.txt "${Git_Content_URL}/${Branch_Name}/requirments.txt"
+  wget -O /usr/local/requirments.txt "${Git_Content_URL}/stable/requirments.txt"
   if grep -q "Django==" /usr/local/requirments.txt ; then
     break
   else

From 93a48236bc633142a4686358d101d5b3d52bc790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 06:38:30 -0300
Subject: [PATCH 07/13] Update cyberpanel_upgrade.sh

---
 cyberpanel_upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 7cda1c01d..c40ecb276 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -29,7 +29,8 @@ Temp_Value=$(curl --silent --max-time 30 -4 https://cyberpanel.net/version.txt)
 Panel_Version=${Temp_Value:12:3}
 Panel_Build=${Temp_Value:25:1}
 
-Branch_Name="v${Panel_Version}.${Panel_Build}"
+#Branch_Name="v${Panel_Version}.${Panel_Build}"
+Branch_Name="stable"
 Base_Number="1.9.3"
 
 Git_User=""

From dd080f5334357e1b2f6cb022af54e8193638cd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:21:59 -0300
Subject: [PATCH 08/13] Revert "Update cyberpanel_upgrade.sh"

This reverts commit 74a6f0312e2b52927c173f6b9beaea5b03c1b1cd.
---
 cyberpanel_upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index c40ecb276..b7efd4fda 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -272,7 +272,7 @@ fi
 
 Pre_Upgrade_Setup_Git_URL() {
   if [[ $Server_Country != "CN" ]] ; then
-    Git_User="NNetworkBR"
+    Git_User="usmannasir"
     Git_Content_URL="https://raw.githubusercontent.com/${Git_User}/cyberpanel"
     Git_Clone_URL="https://github.com/${Git_User}/cyberpanel.git"
   else
@@ -554,7 +554,7 @@ fi
 
 Pre_Upgrade_Setup_Git_URL() {
 if [[ $Server_Country != "CN" ]] ; then
-  Git_User="NNetworkBR"
+  Git_User="usmannasir"
   Git_Content_URL="https://raw.githubusercontent.com/${Git_User}/cyberpanel"
   Git_Clone_URL="https://github.com/${Git_User}/cyberpanel.git"
 else

From 4784dccf336bd2c984245cde46627c593e9073fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:22:05 -0300
Subject: [PATCH 09/13] Revert "Update cyberpanel_upgrade.sh"

This reverts commit 4a14ab6dfc3e06890b719400e245b1f1e31d4117.
---
 cyberpanel_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index b7efd4fda..4c260200b 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -472,7 +472,7 @@ fi
 Download_Requirement() {
 for i in {1..50};
   do
-  wget -O /usr/local/requirments.txt "${Git_Content_URL}/stable/requirments.txt"
+  wget -O /usr/local/requirments.txt "${Git_Content_URL}/${Branch_Name}/requirments.txt"
   if grep -q "Django==" /usr/local/requirments.txt ; then
     break
   else

From 3afbe1851281a0db09ac922b7ee18c8d36bceb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:22:08 -0300
Subject: [PATCH 10/13] Revert "Update cyberpanel_upgrade.sh"

This reverts commit 93a48236bc633142a4686358d101d5b3d52bc790.
---
 cyberpanel_upgrade.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 4c260200b..4779a2f5c 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -29,8 +29,7 @@ Temp_Value=$(curl --silent --max-time 30 -4 https://cyberpanel.net/version.txt)
 Panel_Version=${Temp_Value:12:3}
 Panel_Build=${Temp_Value:25:1}
 
-#Branch_Name="v${Panel_Version}.${Panel_Build}"
-Branch_Name="stable"
+Branch_Name="v${Panel_Version}.${Panel_Build}"
 Base_Number="1.9.3"
 
 Git_User=""

From 867afc711eda018bad906d52c8fc149f98428e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:23:19 -0300
Subject: [PATCH 11/13] Revert "Update README.md"

This reverts commit af43ae0c307b15099daaa0861bba4a331d131cc3.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 386f3bf49..c18ea068a 100755
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ sh <(curl https://cyberpanel.net/install.sh || wget -O - https://cyberpanel.net/
 
 
 ```
-sh <(curl https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/preUpgrade.sh)
+sh <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh)
 ```
 
 # Resources

From a3a7d0704585b5f3fe52e7140d980567ead44449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:24:43 -0300
Subject: [PATCH 12/13] Revert "Update preUpgrade.sh"

This reverts commit bc7ceb59fa177443cb2e1e492f10a21e9ee2bb43.
---
 preUpgrade.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/preUpgrade.sh b/preUpgrade.sh
index f2828a869..b4c1a15f9 100644
--- a/preUpgrade.sh
+++ b/preUpgrade.sh
@@ -3,7 +3,6 @@
 BRANCH_NAME=v$(curl -s https://cyberpanel.net/version.txt | sed -e 's|{"version":"||g' -e 's|","build":|.|g'| sed 's:}*$::')
 
 rm -f /usr/local/cyberpanel_upgrade.sh
-#wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
-wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/stable/cyberpanel_upgrade.sh 2>/dev/null
+wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
 chmod 700 /usr/local/cyberpanel_upgrade.sh
 /usr/local/cyberpanel_upgrade.sh

From ebe92f7060a1ab0d6cc502280094c1027ac8718c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nilberto=20C=C3=A9sar?= <nilbertocs@gmail.com>
Date: Sat, 4 Mar 2023 07:25:03 -0300
Subject: [PATCH 13/13] Revert "Update preUpgrade.sh"

This reverts commit 6899ba169fbd817f3525df952c8a2a85244dc2ac.
---
 preUpgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preUpgrade.sh b/preUpgrade.sh
index b4c1a15f9..a1cdbad7e 100644
--- a/preUpgrade.sh
+++ b/preUpgrade.sh
@@ -3,6 +3,6 @@
 BRANCH_NAME=v$(curl -s https://cyberpanel.net/version.txt | sed -e 's|{"version":"||g' -e 's|","build":|.|g'| sed 's:}*$::')
 
 rm -f /usr/local/cyberpanel_upgrade.sh
-wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/NNetworkBR/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
+wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
 chmod 700 /usr/local/cyberpanel_upgrade.sh
 /usr/local/cyberpanel_upgrade.sh