From a2145a03e24ae4b888114c8db1c7cf0818a5ca43 Mon Sep 17 00:00:00 2001
From: h4775346 <englishh7366@gmail.com>
Date: Mon, 1 Jul 2024 19:29:15 +0300
Subject: [PATCH] Added (Check Duplicates Before Adding New User)

---
 index.php       |  4 ++--
 sas4-install.sh | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/index.php b/index.php
index 1e8976e..448b722 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 
-$file = "/etc/ppp/chap-secrets";
-//$file = "./chap-secrets";
+//$file = "/etc/ppp/chap-secrets";
+$file = "./chap-secrets";
 
 // Read the file into an array
 function readUsers($file) {
diff --git a/sas4-install.sh b/sas4-install.sh
index 864f777..0485483 100644
--- a/sas4-install.sh
+++ b/sas4-install.sh
@@ -1,22 +1,19 @@
 #!/bin/bash
 
 # Define variables
-REPO_URL="https://github.com/h4775346/l2tp-manager.git"
+DOWNLOAD_URL="https://downloads.pro-service.link/l2tp-manager.zip"
 TARGET_DIR="/opt/sas4/site/l2tp-manager/"
 APACHE_CONF="/etc/apache2/sites-enabled/sas4.conf"
+CHAP_SECRETS="/etc/ppp/chap-secrets"
 
-# Update package list and install necessary packages
-apt-get update
-apt-get install -y git unzip curl apache2
+# Create the target directory if it does not exist
+mkdir -p $TARGET_DIR
 
-# Clone the GitHub repository
-if [ ! -d "$TARGET_DIR" ]; then
-    git clone $REPO_URL $TARGET_DIR
-else
-    echo "Directory $TARGET_DIR already exists. Pulling the latest changes."
-    cd $TARGET_DIR
-    git pull
-fi
+# Download the ZIP file using curl
+curl -o /tmp/l2tp-manager.zip $DOWNLOAD_URL
+
+# Unzip the downloaded file into the target directory
+unzip -o /tmp/l2tp-manager.zip -d $TARGET_DIR
 
 # Define the Alias and Directory block
 ALIAS_BLOCK=$(cat <<EOT
@@ -35,7 +32,13 @@ if ! grep -q "/l2tp-manager/" $APACHE_CONF; then
     awk -v insert="$ALIAS_BLOCK" '/ProxyRequests off/ {print; print insert; next}1' $APACHE_CONF > /tmp/sas4.conf && mv /tmp/sas4.conf $APACHE_CONF
 fi
 
+# Allow writing to the chap-secrets file
+chmod 666 $CHAP_SECRETS
+
 # Restart Apache to apply the changes
 systemctl restart apache2
 
+# Cleanup
+rm /tmp/l2tp-manager.zip
+
 echo "l2tp-manager installed and Apache configuration updated."