Merge branch '0.8.7Beta' into master

CHANGELOG

@@ -60,6 +60,7 @@ Version 0.8.5
 - fixed bug module Queue #357
 - fixed renamed module Queue to queue [modules func]
 - fixed struct.error: argument for 's' must be a string [ARP poisoner] #326
+- change update for brump beta version 0.8.7
 
 Version 0.8.4
 -------------

core/loaders/master/github.py

@@ -62,6 +62,11 @@ def __init__(self,Version,Rlogger,localC,remoteC):
         self.localC     = localC
         self.remoteC    = remoteC
         self.Rchangelog = Rlogger
+        self.__branch   = '0.8.7Beta'
+
+    @property
+    def getBranch(self):
+        return  self.__branch
 
     def run(self):
         with open(self.remoteC,'w') as resp:
@@ -74,14 +79,14 @@ def UpdateRepository(self):
         if hasattr(self,'commit_update'):
             if self.commit_update['Updates'] != []:
                 if not path.isdir('.git/'):self.gitZipRepo()
-                call(['git','reset','--hard','origin/master'])
-                self.ProcessCall_(['git','pull','origin','master'])
+                call(['git','reset','--hard','origin/{}'.format(self.getBranch)])
+                self.ProcessCall_(['git','pull','origin',self.getBranch])
                 self.ProcessCall_(['pip', 'install', '-r', 'requirements.txt'])
 
     def NewVersionUpdate(self):
         if not path.isdir('.git/'):self.gitZipRepo()
-        call(['git','reset','--hard','origin/master'])
-        self.ProcessCall_(['git','pull','origin','master'])
+        call(['git','reset','--hard','origin/{}'.format(self.getBranch)])
+        self.ProcessCall_(['git','pull','origin',self.getBranch])
         self.ProcessCall_(['pip', 'install', '-r', 'requirements.txt'])
 
     def checkUpdate(self,Version):
@@ -112,7 +117,7 @@ def gitZipRepo(self):
         call(['git','init'])
         call(['git','remote', 'add', 'origin', C.SOURCE_URL])
         call(['git', 'fetch','--all'])
-        call(['git','reset','--hard','origin/master'])
+        call(['git','reset','--hard','origin/{}'.format(self.getBranch)])
         call(['pip', 'install', '-r', 'requirements.txt'])
 
     def status(self):

core/main.py

@@ -570,6 +570,25 @@ def SetupUI(self):
         self.Formbuttons.addWidget(self.btn_cancelar)
         self.hBoxbutton.addLayout(self.Formbuttons)
 
+        self.Main_  = QtGui.QVBoxLayout()
+        self.slipt = QtGui.QHBoxLayout()
+        self.slipt.addWidget(self.GroupAP)
+        self.slipt.addWidget(self.GroupApPassphrase)
+
+        self.donatelink = C.DONATE
+        self.donateLabel = ServiceNotify(C.DONATE_TXT,title='Support development',
+        link=self.donatelink,timeout=15000)
+        self.donatelink = C.DONATE
+        self.versionBeta = ServiceNotify('This is a beta version the WiFi-Pumpkin 0.8.7 '
+        ,title='Version <strong>beta</strong> ')
+        # set main page Tool
+        self.widget = QtGui.QWidget()
+        self.layout = QtGui.QVBoxLayout(self.widget)
+        self.layout.addWidget(self.donateLabel)
+        self.layout.addWidget(self.versionBeta)
+        self.layout.addWidget(self.TabInfoAP)
+        self.Main_.addWidget(self.widget)
+        self.ContentTabHome.addLayout(self.Main_)
 
     def show_arp_posion(self):
         ''' call GUI Arp Poison module '''

core/utility/constants.py

@@ -63,9 +63,15 @@
 TEMPLATE_PH     = 'templates/phishing/custom/index.html'
 TEMPLATE_CLONE  = 'templates/phishing/web_server/index.html'
 EXTRACT_TEMP    = 'cd templates/ && tar -xf fakeupdate.tar.gz'
+
 EXTRACT_WWW     = 'cd templates/ && tar -xf www.tar.gz'
-LCOMMITS        = 'https://raw.githubusercontent.com/yudevan/WiFi-Pumpkin/master/Core/config/commits/Lcommits.cfg'
-SOURCE_URL      = 'https://github.com/yudevan/WiFi-Pumpkin.git'
+LCOMMITS        = 'https://raw.githubusercontent.com/P0cL4bs/WiFi-Pumpkin/0.8.7Beta/core/config/commits/Lcommits.cfg'
+SOURCE_URL      = 'https://github.com/P0cL4bs/WiFi-Pumpkin.git'
+
+#settings template
+TEMP_CUSTOM = dir_path+'/templates/phishing/custom'
+TEMP_Win    = dir_path+'/templates/fakeupdate/Windows_Update'
+TEMP_Java   = dir_path+'/templates/fakeupdate/Java_Update'
 
 #plugins path
 FIRELAMB_EXEC  = 'plugins/external/firelamb/firelamb.py'