Update Modules for 2.6.0+ (Wave 1) (#71)

* Misc: Ignore JetBrains IDE files

* Modules: Update Modules for 2.6.0 (1)

* SiteSurvey: Actually install mdk3 dependency.

* Modules: Bump version numbers for updated modules
This commit is contained in:
Marc
2019-08-21 21:15:53 +01:00
committed by GitHub
parent 2ba1732389
commit e676793328
88 changed files with 309 additions and 465 deletions

View File

@@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class Responder extends Module
{
public function route()
@@ -56,9 +53,9 @@ class Responder extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("responder.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("responder.module.installed")));
}
protected function checkRunning($processName)
@@ -79,7 +76,7 @@ class Responder extends Module
private function handleDependencies()
{
if (!$this->checkDependency("python")) {
if (!$this->checkDeps("python")) {
$this->execBackground("/pineapple/modules/Responder/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@@ -131,7 +128,7 @@ class Responder extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/Responder.progress')) {
if (!$this->checkDependency("python")) {
if (!$this->checkDeps("python")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@@ -186,7 +183,7 @@ class Responder extends Module
private function refreshOutput()
{
if ($this->checkDependency("python")) {
if ($this->checkDeps("python")) {
if ($this->checkRunning("Responder.py")) {
if (file_exists("/pineapple/modules/Responder/dep/responder/logs/Responder-Session.log")) {
if ($this->request->filter != "") {

View File

@@ -6,5 +6,5 @@
"tetra"
],
"title": "Responder",
"version": "1.1"
"version": "1.2"
}

View File

@@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get responder.autostart.interface`

View File

@@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/Responder.progress ]] && {
exit 0
}

View File

@@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get responder.run.interface`