Revert "Revert "Update to 2.3.0""

Author: htr-tech

.imgs/logo.png renamed to .github/misc/logo.png

@@ -0,0 +1,47 @@
+name: 'Build & Push Docker Image'
+
+on:
+  schedule:
+    - cron: "0 0 * * 0" # Every Sunday
+  workflow_dispatch:
+
+env:
+  CI: true
+  DOCKER_BUILDKIT: 1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build Image
+        run: |
+          # Build Docker Image for DockerHub
+          docker build --tag htrtech/zphisher:latest .
+
+          # Tag Docker Image for GHCR
+          docker tag htrtech/zphisher:latest ghcr.io/htr-tech/zphisher:latest
+
+      - name: Login to GHCR
+        if: github.repository == 'htr-tech/zphisher' && github.ref == 'refs/heads/master'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to DockerHub
+        if: github.repository == 'htr-tech/zphisher' && github.ref == 'refs/heads/master'
+        uses: docker/login-action@v2
+        with:
+          username: "htrtech"
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Push
+        if: github.repository == 'htr-tech/zphisher' && github.ref == 'refs/heads/master'
+        run: |
+          # Push to DockerHub
+          docker push htrtech/zphisher:latest
+          # Push to GHCR
+          docker push ghcr.io/htr-tech/zphisher:latest

.imgs/wf.gif renamed to .github/misc/workflow.gif

@@ -0,0 +1,32 @@
+name: 'Lock Closed Issues'
+
+on:
+  schedule:
+    - cron: '0 0 * * 0' # Every Sunday
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Lock Issues
+        if: github.repository == 'htr-tech/zphisher' && github.ref == 'refs/heads/master'
+        uses: dessant/lock-threads@v3
+        with:
+          process-only: 'issues'
+          issue-inactive-days: '30'
+          exclude-any-issue-labels: 'enhancement'
+          add-issue-labels: 'archived'
+          remove-issue-labels: 'stale'
+          issue-lock-reason: 'resolved'
+          issue-comment: >
+            This issue has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs/questions.

.github/workflows/docker.yml

@@ -0,0 +1,28 @@
+name: Upload .DEB to Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build .DEB
+        run: |
+          sed -i 's/#PKG_NAME/PKG_NAME/' make-deb.sh
+          bash make-deb.sh # Build for Debian
+          bash make-deb.sh termux # Build for Termux
+          find -type f -name "*.deb" -exec sha256sum "{}" > SUMS.txt \;
+
+      - name: Upload to Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: "*.deb"
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: SUMS.txt

.github/workflows/lock.yml

@@ -1,12 +1,6 @@
-FROM debian:latest
+FROM alpine:latest
 LABEL MAINTAINER="https://github.com/htr-tech/zphisher"
-
 WORKDIR /zphisher/
 ADD . /zphisher
-
-RUN apt update && \
-    apt full-upgrade -y && \
-    apt install -y curl unzip wget && \
-    apt install --no-install-recommends -y php && \
-    apt clean
-CMD ["./zphisher.sh"]
+RUN apk add --no-cache bash ncurses curl unzip wget php 
+CMD "./zphisher.sh"

.github/workflows/release.yml

@@ -1,24 +1,26 @@
 <!-- Zphisher -->
 
 <p align="center">
-  <img src=".imgs/logo.png">
+  <img src=".github/misc/logo.png">
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/Version-2.2-green?style=for-the-badge">
+  <img src="https://img.shields.io/badge/Version-2.3.0-green?style=for-the-badge">
   <img src="https://img.shields.io/github/license/htr-tech/zphisher?style=for-the-badge">
   <img src="https://img.shields.io/github/stars/htr-tech/zphisher?style=for-the-badge">
   <img src="https://img.shields.io/github/issues/htr-tech/zphisher?color=red&style=for-the-badge">
   <img src="https://img.shields.io/github/forks/htr-tech/zphisher?color=teal&style=for-the-badge">
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/Author-HTR--Tech-cyan?style=flat-square">
-  <img src="https://img.shields.io/badge/Open%20Source-Yes-cyan?style=flat-square">
-  <img src="https://img.shields.io/badge/Written%20In-Bash-cyan?style=flat-square">
+  <img src="https://img.shields.io/badge/Author-htr--tech-blue?style=flat-square&edge_flat=false">
+  <img src="https://img.shields.io/badge/Open%20Source-Yes-darkgreen?style=flat-square&edge_flat=false">
+  <img src="https://img.shields.io/badge/Maintained%3F-Yes-lightblue?style=flat-square&edge_flat=false">
+  <img src="https://img.shields.io/badge/Written%20In-Bash-darkcyan?style=flat-square&edge_flat=false">
+  <img src="https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fhtr-tech%2Fzphisher&title=Visitors&edge_flat=false"/></a>
 </p>
 
-<p align="center">A beginners friendly, Automated phishing tool with 30+ templates.</p>
+<p align="center"><b>A beginners friendly, Automated phishing tool with 30+ templates.</b></p>
 
 ##
 
@@ -37,73 +39,133 @@ It only demonstrates "how phishing works". <b>You shall not misuse the informati
 ### Features
 
 - Latest and updated login pages.
-- Mask URL support 
 - Beginners friendly
-- Docker support (checkout `docker-legacy` branch)
 - Multiple tunneling options
   - Localhost
-  - Ngrok (With or without hotspot)
-  - Cloudflared (Alternative of Ngrok)
+  - Ngrok
+  - Cloudflared
+  - LocalXpose
+- Mask URL support 
+- Docker support
 
+##
 
 ### Installation
 
 - Just, Clone this repository -
-```
-$ git clone https://github.com/htr-tech/zphisher.git
-```
+  ```
+  git clone --depth=1 https://github.com/htr-tech/zphisher.git
+  ```
 
-- Change to cloned directory and run `zphisher.sh` -
-```
-$ cd zphisher
-$ bash zphisher.sh
-```
+- Now go to cloned directory and run `zphisher.sh` -
+  ```
+  $ cd zphisher
+  $ bash zphisher.sh
+  ```
+
+- On first launch, It'll install the dependencies and that's it. ***Zphisher*** is installed.
+
+##
 
-- On first launch, It'll install the dependencies and that's it. `Zphisher` is installed.
+### Installation via ".deb" file
+
+- Download `.deb` files from the [**Latest Release**](https://github.com/htr-tech/zphisher/releases/latest)
+- If you are using ***termux*** then download the `*_termux.deb`
+
+- Install the `.deb` file by executing
+  ```
+  apt install <your path to deb file>
+  ```
+  Or
+  ```
+  $ dpkg -i <your path to deb file>
+  $ apt install -f
+  ```
+
+##
 
 ### Run on Docker
-```
-$ docker pull htrtech/zphisher
-$ docker run --rm -it htrtech/zphisher
-```
 
-### Dependencies
+- Docker Image Mirror:
+  - **DockerHub** : 
+    ```
+    docker pull htrtech/zphisher
+    ```
+  - **GHCR** : 
+    ```
+    docker pull ghcr.io/htr-tech/zphisher:latest
+    ```
+
+- By using the wrapper script [**run-docker.sh**](https://raw.githubusercontent.com/htr-tech/zphisher/master/run-docker.sh)
+
+  ```
+  $ curl -LO https://raw.githubusercontent.com/htr-tech/zphisher/master/run-docker.sh
+  $ bash run-docker.sh
+  ```
+- Temporary Container
+
+  ```
+  docker run --rm -ti htrtech/zphisher
+  ```
+  - Remember to mount the `auth` directory.
 
-**`Zphisher`** requires following programs to run properly - 
-- `php`
-- `wget`
-- `curl`
+##
+
+<details>
+  <summary><h3>Dependencies</h3></summary>
+
+<b>Zphisher</b> requires following programs to run properly - 
 - `git`
+- `curl`
+- `php`
 
-> All the dependencies will be installed automatically when you run `Zphisher` for the first time.
+> All the dependencies will be installed automatically when you run **Zphisher** for the first time.
+</details>
 
-> Supported Platform : **`Termux`**, **`Ubuntu/Debian/Kali/Parrot`**, **`Arch Linux/Manjaro`**, **`Fedora`**
+<details>
+  <summary><h3>Tested on</h3></summary>
+
+- **Ubuntu**
+- **Debian**
+- **Arch**
+- **Manjaro**
+- **Fedora**
+- **Termux**
+</details>
 
 ##
 
-<h3 align="center">
-:: Workflow ::
-</h3>
+<h3 align="center"><i>:: Workflow ::</i></h3>
 <p align="center">
-<img src=".imgs/wf.gif"/>
+<img src=".github/misc/workflow.gif"/>
 </p>
 
-### Special Thanks :
-
-- [**Aditya Shakya**](https://github.com/adi1090x)
-- [**1RaY-1**](https://github.com/1RaY-1)
-- [**Yisus7u7**](https://github.com/Yisus7u7)
-- [**sepp0**](https://github.com/sepp0)
-- [**AliMilani**](https://github.com/AliMilani)
-- [**TheLinuxChoice**](https://twitter.com/linux_choice)
-- [**DarksecDevelopers**](https://github.com/DarksecDevelopers)
-- [**Moises Tapia**](https://github.com/MoisesTapia)
-
+##
 
-### Find Me on :
+### Find Me on:
 <p align="left">
-  <a href="https://github.com/htr-tech" target="_blank"><img src="https://img.shields.io/badge/Github-HTR--TECH-green?style=for-the-badge&logo=github"></a>
-  <a href="https://www.instagram.com/tahmid.rayat" target="_blank"><img src="https://img.shields.io/badge/IG-%40tahmid.rayat-red?style=for-the-badge&logo=instagram"></a>
-  <a href="https://m.me/tahmid.rayat.official" target="_blank"><img src="https://img.shields.io/badge/Chat-Messenger-blue?style=for-the-badge&logo=messenger"></a>
+  <a href="https://tahmidrayat.is-a.dev" target="_blank"><img src="https://img.shields.io/badge/Socials-grey?style=for-the-badge&logo=linktree"></a>
+  <a href="https://github.com/htr-tech" target="_blank"><img src="https://img.shields.io/badge/Github-blue?style=for-the-badge&logo=github"></a>
 </p>
 
+
+### *Thanks to all contributors*:
+
+<table>
+  <tr align="center">
+    <td><a href="https://github.com/1RaY-1"><img src="https://avatars.githubusercontent.com/u/78962948?s=100" /><br /><sub><b>1RaY-1</b></sub></a></td>
+    <td><a href="https://github.com/adi1090x"><img src="https://avatars.githubusercontent.com/u/26059688?s=100" /><br /><sub><b>Aditya Shakya</b></sub></a></td>
+    <td><a href="https://github.com/AliMilani"><img src="https://avatars.githubusercontent.com/u/59066012?s=100" /><br /><sub><b>Ali Milani</b></sub></a></td>
+    <td><a href="https://github.com/Meht-evaS"><img src="https://avatars.githubusercontent.com/u/57435273?s=100" /><br /><sub><b>AmnesiA</b></sub></a></td>
+    <td><a href="https://github.com/KasRoudra"><img src="https://avatars.githubusercontent.com/u/78908440?s=100" /><br /><sub><b>KasRoudra</b></sub></a></td>
+  </tr>
+  <tr align="center">
+   <td><a href="https://github.com/MoisesTapia"><img src="https://avatars.githubusercontent.com/u/28166400?s=100" /><br /><sub><b>Moises Tapia</b></sub></a></td>
+    <td><a href="https://github.com/BDhackers009"><img src="https://avatars.githubusercontent.com/u/67186139?s=100" /><br /><sub><b>Mustakim Ahmed</b></sub></a></td>
+    <td><a href="https://github.com/sepp0"><img src="https://avatars.githubusercontent.com/u/36642137?s=100" /><br /><sub><b>sepp0</b></sub></a></td>
+    <td><a href="https://github.com/TripleHat"><img src="https://avatars.githubusercontent.com/u/68332137?s=100" /><br /><sub><b>TripleHat</b></sub></a></td>
+    <td><a href="https://github.com/Yisus7u7"><img src="https://avatars.githubusercontent.com/u/64093255?s=100" /><br /><sub><b>Yisus7u7</b></sub></a></td>
+  </tr>
+<table>
+
+<!-- // -->