Browse Source

Change device type check for wpc use

DSR! 2 years ago
parent
commit
ce847046e1

+ 1 - 1
src/pineapple/html/install-modal.html

@@ -20,7 +20,7 @@
                 <span>Generally, module support can be found at <a href="https://forums.hak5.org/forum/90-nano-tetra-modules/" target="_blank">forums.hak5.org.</a></span>
 
 
-                <span class="text-info" ng-show="(!selectedModule.sd && selectedModule.internal && device == 'nano')">
+                <span class="text-info" ng-show="(!selectedModule.sd && selectedModule.internal)">
                     Using an SD card instead of internal storage is strongly recommended.
                 </span>
 

+ 1 - 4
src/pineapple/modules/Advanced/module.html

@@ -159,10 +159,7 @@
                             <p>
                                 <hr>
                             </p>
-                            <p ng-if="device == 'tetra'">
-                                Warning: Firmware upgrades replace all data on the device. Please ensure any important non-system data has been backed up to external storage.
-                            </p>
-                            <p ng-if="device == 'nano'">
+                            <p>
                                 Warning: Firmware upgrades replace all data not stored on the SD card. Please ensure any important non-system data has been backed up to external storage.
                             </p>
                             <p>

+ 1 - 5
src/pineapple/modules/Configuration/js/module.js

@@ -44,11 +44,7 @@ registerController("ConfigurationGeneralController", ['$api', '$scope', '$timeou
 	});
 
 	$scope.resetPineapple = (function() {
-		if($scope.device === 'nano') {
-			$scope.resetMessage = "Are you sure you want to factory reset your WiFi Pineapple?\n\nThis will erase all data that has not been saved on the SD card.";
-		} else if($scope.device === 'tetra') {
-			$scope.resetMessage = "Are you sure you want to factory reset your WiFi Pineapple?\n\nThis will erase all data that has not been saved externally.";
-		}
+		$scope.resetMessage = "Are you sure you want to factory reset your WiFi Pineapple?\n\nThis will erase all data that has not been saved on the SD card.";
 
 		if (confirm($scope.resetMessage)) {
 			$api.request({

+ 2 - 2
src/pineapple/modules/Help/files/debug

@@ -36,8 +36,8 @@ echo "Performing site survey"
 echo "============SURVEY=========" >> $LOG
 echo -e "\tEnsuring pineapd is started"
 (/etc/init.d/pineapd start 2>&1) >> $LOG
-scan_type=0
-cat /proc/cpuinfo | grep TETRA && scan_type=2
+#scan_type=0
+scan_type=2
 echo -e "\tRunning scan type $scan_type for 15 seconds"
 (/usr/bin/pineap /tmp/pineap.conf run_scan 15 $scan_type 2>&1) >> $LOG
 sleep 2

+ 2 - 2
src/pineapple/modules/Help/module.html

@@ -43,7 +43,7 @@
                     </div>
                     <h5 class="panel-title" ng-show="debugStarted">Progress</h5>
                     <p>
-                        <textarea id="output" ng-show="debugStarted" id="debugGenerationOutput" class="form-control autoselect" rows="15" ng-model="output" readonly></textarea>
+                        <textarea id="output" ng-show="debugStarted" class="form-control autoselect" rows="15" ng-model="output" readonly></textarea>
                     </p>
                 </p>
             </div>
@@ -307,7 +307,7 @@ parent Access Point. If a Client is associated to an Access Point but idle, it m
         <div id="ReportingHelp" class="panel-collapse collapse" ng-controller="HelpController">
             <div class="panel-body">
                 <p>
-                    This feature enables the auditor to generate reports at a specified interval. The report may be sent via email and/or saved locally<span ng-if="device == 'nano'"> on a suitable SD card. See the Format SD Card option from the USB menu on the Advanced view to setup a new card</span>. Email Configuration must be complete in order for the Send Report via email function to operate successfully.
+                    This feature enables the auditor to generate reports at a specified interval. The report may be sent via email and/or saved locally on a suitable SD card. See the Format SD Card option from the USB menu on the Advanced view to setup a new card. Email Configuration must be complete in order for the Send Report via email function to operate successfully.
                 </p>
                 <p>
                     The Report Contents may contain: the PineAP Log with an option to clear after generating the report, a PineAP Site Survey similar to the Recon View with option to specify AP & Client scan duration, and PineAP Probing and Tracked Clients.

+ 2 - 2
src/pineapple/modules/Reporting/files/reporting

@@ -51,8 +51,8 @@ getSiteReport() {
         /etc/init.d/pineapd start
         sleep 3
         duration=$(uci get reporting.@settings[0].duration)
-        scan_type=0
-        cat /proc/cpuinfo | grep TETRA && scan_type=2
+        #scan_type=0
+        scan_type=2
         echo -e "\tRunning scan type $scan_type for 15 seconds"
         (/usr/bin/pineap /tmp/pineap.conf run_scan $duration $scan_type 2>&1) >> /tmp/reporting.log
         sleep 2