hak5/nano-tetra-modules
1
0
Fork 0
mirror of https://github.com/hak5/nano-tetra-modules.git synced 2025-10-29 16:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged upstream

Browse Source
This commit is contained in:
sud0nick 2018-01-12 21:57:25 -05:00
commit fcca467ded
6 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CursedScreech/js/module.js
View File

@ -684,12 +684,19 @@ registerController('CursedScreechController', ['$api', '$scope', '$sce', '$inter
transformRequest: angular.identity,
headers: {'Content-Type': undefined}
}).then(function(response) {
<<<<<<< HEAD
var errors = {};
for (var key in response.data) {
if (response.data[key].success == "Failed") {
var msg = response.data[key].message + '\n';
if (!errors.hasOwnProperty(msg)) {
errors[msg] = true;
=======
for (var key in response) {
if (response.hasOwnProperty(key)) {
if (response.key == "Failed") {
alert("Failed to upload " + key);
>>>>>>> upstream/master
}
}
}

4
CursedScreech/module.info
View File

@ -6,5 +6,9 @@
"tetra"
],
"title": "CursedScreech",
<<<<<<< HEAD
"version": "1.4"
=======
"version": "1.3"
>>>>>>> upstream/master
}

7
PortalAuth/js/module.js
View File

@ -641,12 +641,19 @@ registerController('PortalAuthController', ['$api', '$scope', '$sce', '$interval
transformRequest: angular.identity,
headers: {'Content-Type': undefined}
}).then(function(response) {
<<<<<<< HEAD
var errors = {};
for (var key in response.data) {
if (response.data[key].success == "Failed") {
var msg = response.data[key].message + '\n';
if (!errors.hasOwnProperty(msg)) {
errors[msg] = true;
=======
for (var key in response) {
if (response.hasOwnProperty(key)) {
if (response.key == "Failed") {
alert("Failed to upload " + key);
>>>>>>> upstream/master
}
}
}

4
PortalAuth/module.info
View File

@ -6,5 +6,9 @@
"tetra"
],
"title": "Portal Auth",
<<<<<<< HEAD
"version": "1.6"
=======
"version": "1.5"
>>>>>>> upstream/master
}

3
nmap/api/module.php
View File

@ -61,6 +61,9 @@ class nmap extends Module
private function handleDependencies()
{
if (!file_exists("/usr/lib/libpcap.so.1.3") && file_exists("/usr/lib/libpcap.so")) {
symlink("/usr/lib/libpcap.so", "/usr/lib/libpcap.so.1.3");
}
if(!$this->checkDependency("nmap"))
{
$this->execBackground("/pineapple/modules/nmap/scripts/dependencies.sh install ".$this->request->destination);

2
nmap/module.info
View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "nmap",
"version": "1.4"
"version": "1.5"
}