From 507e1e5c14f7591ecfe3c3969a3be92691758c2f Mon Sep 17 00:00:00 2001
From: deltaxflux <deltax.fluxion@gmail.com>
Date: Mon, 12 Sep 2016 11:55:50 +0200
Subject: [PATCH] Merge Pull / FIx

---
 fluxion | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/fluxion b/fluxion
index 4909325..7257836 100755
--- a/fluxion
+++ b/fluxion
@@ -2,7 +2,7 @@
 
 ########## DEBUG Mode ##########
 ##			      ##
-if [ -z "$FLUX_DEBUG" ]; then FLUX_DEBUG=0
+if [ -z ${FLUX_DEBUG+x} ]; then FLUX_DEBUG=0
 else FLUX_DEBUG=1
 fi
 ##			      ##
@@ -171,6 +171,7 @@ function exitmode {
 	if [ "$WIFI" != "" ]; then
 		echo -e ""$weis"["$rot"-"$weis"] "$weis"$general_exitmode_2 "$verde"$WIFI"$transparent""
 		./airmon stop $WIFI &> $flux_output_device
+		macchanger -p $WIFI &> $flux_output_device
 	fi
 
 
@@ -709,6 +710,7 @@ function language {
 		echo -e "      "$blue"3)"$transparent" Romanian     "
 		echo -e "      "$blue"4)"$transparent" Turkish    "
 		echo -e "      "$blue"5)"$transparent" Spanish    "
+		echo -e "      "$blue"6)"$transparent" Chinese   "
 		echo "                                       "
 		echo -n "      #> "
 		read yn
@@ -719,6 +721,7 @@ function language {
 			3 ) romanian; break;;
 			4 ) turkish; break;;
 			5 ) spain; break;;
+			6 ) chinese; break;;
 			* ) echo "Unknown option. Please choose again"; conditional_clear ;;
 		  esac
 	done
@@ -1002,6 +1005,53 @@ function spain {
 	setinterface
 
 }
+
+function chinese {
+	
+	setinterface_error="没有检测到网卡 退出..."
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_choosescan="选择信道"
+	choosescan_option_1="所有信道 "
+	choosescan_option_2="指定信道"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	scanchan_option_1="单一信道"
+	scanchan_option_2="多个信道"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_scanchan="正在扫描目标"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_askAP="选择攻击选项"
+	askAP_option_1="伪装AP - Hostapd ("$red"推荐)"
+	askAP_option_3="WPS-SLAUGHTER - 暴力破解 WPS Pin"
+	askAP_option_4="暴力破解 - (需要握手包)"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_askauth="请选择验证密码方式"
+	askauth_option_2="提供的wpa (易错)"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_deauthforce="握手包检查"
+	deauthforce_option_1="aircrack-ng (Miss chance)"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_deauthMENU="*抓握手包*"
+	deauthMENU_option_1="检查握手包"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	header_webinterface="请选择"
+	header_ConnectionRESET="选择登陆界面"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	general_back="返回"
+	general_error_1="未找到"
+	general_case_error="未知选项. 请再次选择"
+	general_exitmode="清理并退出"
+	general_exitmode_3="关闭 "$grey"forwarding of packets"
+	general_exitmode_4="清理 "$grey"iptables"
+	general_exitmode_5="恢复 "$grey"tput"
+	general_exitmode_6="重启 "$grey"Network-Manager"
+	general_exitmode_7="清理完成!"
+	general_exitmode_8="感谢使用fluxion!"
+	# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+	selection_1="活动的客户端"
+	selection_2="选择一个目标. 重扫 按$red r$transparent"
+	setinterface
+}
 # Choose Interface
 function setinterface {
 	conditional_clear