Module Updates for 2.6.0+ (Wave 1) (#69)

* Misc: Ignore JetBrains IDE files

* Modules: Update Modules for 2.6.0 (1)

* SiteSurvey: Actually install mdk3 dependency.
This commit is contained in:
Marc
2019-08-21 21:09:45 +01:00
committed by GitHub
parent cb24b654da
commit 0a3e973d99
68 changed files with 289 additions and 445 deletions

View File

@@ -1,6 +1,4 @@
<?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 OnlineHashCrack extends Module
{
@@ -49,9 +47,9 @@ class OnlineHashCrack extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("onlinehashcrack.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("onlinehashcrack.module.installed")));
}
protected function getDevice()
@@ -67,9 +65,9 @@ class OnlineHashCrack extends Module
private function handleDependencies()
{
if(!$this->checkDependency("curl"))
if(!$this->checkDeps("curl"))
{
$this->execBackground("/pineapple/modules/OnlineHashCrack/scripts/dependencies.sh install ".$this->request->destination);
$this->execBackground("/pineapple/modules/OnlineHashCrack/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
}
else
@@ -95,7 +93,7 @@ class OnlineHashCrack extends Module
{
if (!file_exists('/tmp/OnlineHashCrack.progress'))
{
if(!$this->checkDependency("curl"))
if(!$this->checkDeps("curl"))
{
$installed = false;
$install = "Not installed";