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

Merge pull request #336 from nachtgeist/public

Browse Source 
fix DB update + some LE-related fixes
This commit is contained in:
Michael Kaufmann
2016-03-08 08:37:41 +01:00
parent 7ec62401e7 65fd6ac191
commit 1c80118117
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -3158,7 +3158,7 @@ if (isFroxlorVersion('0.9.35-rc1')) {
showUpdateStep("Adding new setting to enable/disable Let's Encrypt"); showUpdateStep("Adding new setting to enable/disable Let's Encrypt");
$enable_letsencrypt = isset($_POST['enable_letsencrypt']) ? (int)$_POST['enable_letsencrypt'] : "1"; $enable_letsencrypt = isset($_POST['enable_letsencrypt']) ? (int)$_POST['enable_letsencrypt'] : "1";
Settings::AddNew("system.leenabled", $enable_letsencrypt); Settings::AddNew("system.leenabled", $enable_letsencrypt);
Database::query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `active` = '".$enable_letsencrypt."' WHERE `cronfile` = 'letsencrypt'"); Database::query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `isactive` = '".$enable_letsencrypt."' WHERE `cronfile` = 'letsencrypt'");
lastStepStatus(0); lastStepStatus(0);
} }

8
lib/classes/ssl/class.lescript.php
View File

@@ -145,8 +145,14 @@ class lescript
// simple self check // simple self check
if($payload !== trim(@file_get_contents($uri))) { if($payload !== trim(@file_get_contents($uri))) {
$errmsg = json_encode(error_get_last());
if ($errmsg != "null") {
$errmsg = "; PHP error: " . $errmsg;
} else {
$errmsg = "";
}
@unlink($tokenPath); @unlink($tokenPath);
throw new \RuntimeException("Please check $uri - token not available"); throw new \RuntimeException("Please check $uri - token not available" . $errmsg);
} }
$this->log("Sending request to challenge"); $this->log("Sending request to challenge");

3
scripts/jobs/cron_letsencrypt.php
View File

@@ -36,7 +36,8 @@ $upddom_stmt = Database::prepare("
"); ");
$changedetected = 0; $changedetected = 0;
while ($certrow = $certificates_stmt->fetch(PDO::FETCH_ASSOC)) { $certrows = $certificates_stmt->fetchAll(PDO::FETCH_ASSOC);
foreach($certrows AS $certrow) {
// set logger to corresponding loginname for the log to appear in the users system-log // set logger to corresponding loginname for the log to appear in the users system-log
$cronlog = FroxlorLogger::getInstanceOf(array('loginname' => $certrow['loginname'])); $cronlog = FroxlorLogger::getInstanceOf(array('loginname' => $certrow['loginname']));