maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more and more checkstyle fixes

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 12:59:40 +01:00
parent 585d42f1b8
commit 35c631946d
48 changed files with 298 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Froxlor/Http/Directory.php
View File

@@ -36,7 +36,7 @@ class Directory
*
* @var string
*/
private $_dir = null;
private $dir = null;
/**
* class constructor, optionally set directory
@@ -45,7 +45,7 @@ class Directory
*/
public function __construct($dir = null)
{
$this->_dir = $dir;
$this->dir = $dir;
}
/**
@@ -57,7 +57,7 @@ class Directory
SELECT COUNT(`id`) as `usropts` FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `path` = :dir
");
$uo_res = Database::pexecute_first($uo_stmt, array(
'dir' => FileDir::makeCorrectDir($this->_dir)
'dir' => FileDir::makeCorrectDir($this->dir)
));
if ($uo_res != false && isset($uo_res['usropts'])) {
return ($uo_res['usropts'] > 0 ? true : false);
@@ -74,7 +74,7 @@ class Directory
SELECT COUNT(`id`) as `usrprot` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `path` = :dir
");
$up_res = Database::pexecute_first($up_stmt, array(
'dir' => FileDir::makeCorrectDir($this->_dir)
'dir' => FileDir::makeCorrectDir($this->dir)
));
if ($up_res != false && isset($up_res['usrprot'])) {
return ($up_res['usrprot'] > 0 ? true : false);
@@ -93,20 +93,20 @@ class Directory
*/
public function isConfigDir($ifexists = false)
{
if (is_null($this->_dir)) {
if (is_null($this->dir)) {
trigger_error(__CLASS__ . '::' . __FUNCTION__ . ' has been called with a null value', E_USER_WARNING);
return false;
}
if (file_exists($this->_dir)) {
if (is_dir($this->_dir)) {
if (file_exists($this->dir)) {
if (is_dir($this->dir)) {
$returnval = true;
} else {
$returnval = false;
}
} else {
if (! $ifexists) {
if (substr($this->_dir, - 1) == '/') {
if (substr($this->dir, - 1) == '/') {
$returnval = true;
} else {
$returnval = false;

4
lib/Froxlor/Http/LetsEncrypt/LeScript.php
View File

@@ -107,7 +107,7 @@ class LeScript
$response = $this->postNewReg();
if ($this->client->getLastCode() == 409) {
$this->log('The key was already registered. Using existing account.');
} else if ($this->client->getLastCode() == 201) {
} elseif ($this->client->getLastCode() == 201) {
$this->log('New account registered.');
} else {
throw new \RuntimeException("Account not initialized, probably due to rate limiting. Whole response: " . json_encode($response));
@@ -302,7 +302,7 @@ class LeScript
$this->log("Certificate generation pending, sleeping 1s");
sleep(1);
} else if ($this->client->getLastCode() == 200) {
} elseif ($this->client->getLastCode() == 200) {
$this->log("Got certificate! YAY!");
$certificates[] = $this->parsePemFromBody($result);

30
lib/Froxlor/Http/LetsEncrypt/LeScript_v2.php → lib/Froxlor/Http/LetsEncrypt/LeScriptV2.php
View File

@@ -31,7 +31,7 @@ use Froxlor\Settings;
// This file is copied from https://github.com/analogic/lescript
// and modified to work without files and integrate in Froxlor
class LeScript_v2
class LeScriptV2
{
// https://letsencrypt.org/repository/
@@ -49,9 +49,9 @@ class LeScript_v2
private $version;
private $_req_uris = array();
private $req_uris = array();
private $_acc_location = null;
private $acc_location = null;
public function __construct($logger, $version = '2')
{
@@ -67,10 +67,10 @@ class LeScript_v2
// get request-uris from /directory
$response = $this->client->get('/directory');
$this->_req_uris['newAccount'] = $response['newAccount'];
$this->_req_uris['newOrder'] = $response['newOrder'];
$this->_req_uris['newNonce'] = $response['newNonce'];
$this->_req_uris['revokeCert'] = $response['revokeCert'];
$this->req_uris['newAccount'] = $response['newAccount'];
$this->req_uris['newOrder'] = $response['newOrder'];
$this->req_uris['newNonce'] = $response['newNonce'];
$this->req_uris['revokeCert'] = $response['revokeCert'];
}
public function initAccount($certrow, $isFroxlorVhost = false)
@@ -80,7 +80,7 @@ class LeScript_v2
$this->customerId = (! $isFroxlorVhost ? $certrow['customerid'] : null);
$this->isFroxlorVhost = $isFroxlorVhost;
$this->isLeProduction = (Settings::Get('system.letsencryptca') == 'production');
$this->_acc_location = $certrow['leaccount'];
$this->acc_location = $certrow['leaccount'];
$leregistered = $certrow['leregistered'];
@@ -124,7 +124,7 @@ class LeScript_v2
} else {
throw new \RuntimeException("Account not initialized, probably due to rate limiting. Whole response: " . json_encode($response));
}
$this->_acc_location = $this->client->getLastLocation();
$this->acc_location = $this->client->getLastLocation();
$leregistered = 1;
$this->setLeRegisteredState($leregistered);
@@ -165,13 +165,13 @@ class LeScript_v2
}
// Send new-order request
$response = $this->signedRequest($this->_req_uris['newOrder'], array(
$response = $this->signedRequest($this->req_uris['newOrder'], array(
"identifiers" => $domains_in_order
), false);
if ($this->client->getLastCode() == 403) {
$this->log("Got status 403 - setting LE status to unregistered.");
$this->_acc_location = '';
$this->acc_location = '';
$this->setLeRegisteredState(0);
throw new \RuntimeException("Got 'unauthorized' response - we need to re-register at next run. Whole response: " . json_encode($response));
}
@@ -353,12 +353,12 @@ class LeScript_v2
if ($this->isLeProduction) {
if ($this->isFroxlorVhost) {
Settings::Set('system.leregistered', $state);
Settings::Set('system.leaccount', $this->_acc_location);
Settings::Set('system.leaccount', $this->acc_location);
} else {
$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `leregistered` = :registered, `leaccount` = :kid WHERE `customerid` = :customerid;");
Database::pexecute($upd_stmt, array(
'registered' => $state,
'kid' => $this->_acc_location,
'kid' => $this->acc_location,
'customerid' => $this->customerId
));
}
@@ -380,7 +380,7 @@ class LeScript_v2
}
$this->log('Sending registration to letsencrypt server');
return $this->signedRequest($this->_req_uris['newAccount'], array(
return $this->signedRequest($this->req_uris['newAccount'], array(
'termsOfServiceAgreed' => true
));
}
@@ -467,7 +467,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment');
);
} else {
// need account-url
$header["kid"] = $this->_acc_location;
$header["kid"] = $this->acc_location;
}
$protected = $header;

2
lib/Froxlor/Http/PhpConfig.php
View File

@@ -32,4 +32,4 @@ class PhpConfig
}
return $configs_array;
}
}
}