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

add sql-query of last statement to sql-debug for debugging purposes; fix default-ssl-ip setting and allow 'none' value

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-21 12:16:50 +01:00
parent 5480fcbf5d
commit b56414ed0e
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/database/class.Database.php
View File

@@ -71,7 +71,7 @@ class Database {
try { try {
$stmt->execute($params); $stmt->execute($params);
} catch (PDOException $e) { } catch (PDOException $e) {
self::_showerror($e, $showerror, $json_response); self::_showerror($e, $showerror, $json_response, $stmt);
} }
} }
@@ -309,7 +309,7 @@ class Database {
* @param PDOException $error * @param PDOException $error
* @param bool $showerror if set to false, the error will be logged but we go on * @param bool $showerror if set to false, the error will be logged but we go on
*/ */
private static function _showerror($error, $showerror = true, $json_response = false) { private static function _showerror($error, $showerror = true, $json_response = false, PDOStatement $stmt = null) {
global $userinfo, $theme, $linker; global $userinfo, $theme, $linker;
// include userdata.inc.php // include userdata.inc.php
@@ -374,6 +374,8 @@ class Database {
if ($showerror) { if ($showerror) {
if (empty($sql['debug'])) { if (empty($sql['debug'])) {
$error_trace = ''; $error_trace = '';
} elseif (!is_null($stmt)) {
$error_trace .= "<br><br>".$stmt->queryString;
} }
// fallback // fallback

3
lib/functions/froxlor/function.getIpPortCombinations.php
View File

@@ -64,5 +64,6 @@ function getIpPortCombinations($ssl = false) {
} }
function getSslIpPortCombinations() { function getSslIpPortCombinations() {
return getIpPortCombinations(true); global $lng;
return array('' => $lng['panel']['none_value']) + getIpPortCombinations(true);
} }

30
lib/functions/settings/function.storeSettingDefaultIp.php
View File

@@ -95,23 +95,35 @@ function storeSettingDefaultSslIp($fieldname, $fielddata, $newfieldvalue) {
if (count($ids) > 0) { if (count($ids) > 0) {
$defaultips_new = explode(',', $newfieldvalue); $defaultips_new = explode(',', $newfieldvalue);
if (!empty($defaultips_old) && !empty($newfieldvalue))
{
$in_value = $defaultips_old . ", " . $newfieldvalue;
} elseif (!empty($defaultips_old) && empty($newfieldvalue))
{
$in_value = $defaultips_old;
} else {
$in_value = $newfieldvalue;
}
// Delete the existing mappings linking to default IPs // Delete the existing mappings linking to default IPs
$del_stmt = Database::prepare(" $del_stmt = Database::prepare("
DELETE FROM `" . TABLE_DOMAINTOIP . "` DELETE FROM `" . TABLE_DOMAINTOIP . "`
WHERE `id_domain` IN (" . implode(', ', $ids) . ") WHERE `id_domain` IN (" . implode(', ', $ids) . ")
AND `id_ipandports` IN (" . $defaultips_old . ", " . $newfieldvalue . ") AND `id_ipandports` IN (" . $in_value . ")
"); ");
Database::pexecute($del_stmt); Database::pexecute($del_stmt);
// Insert the new mappings if (count($defaultips_new) > 0) {
$ins_stmt = Database::prepare(" // Insert the new mappings
INSERT INTO `" . TABLE_DOMAINTOIP . "` $ins_stmt = Database::prepare("
SET `id_domain` = :domainid, `id_ipandports` = :ipandportid INSERT INTO `" . TABLE_DOMAINTOIP . "`
"); SET `id_domain` = :domainid, `id_ipandports` = :ipandportid
");
foreach ($ids as $id) { foreach ($ids as $id) {
foreach ($defaultips_new as $defaultip_new) { foreach ($defaultips_new as $defaultip_new) {
Database::pexecute($ins_stmt, array('domainid' => $id, 'ipandportid' => $defaultip_new)); Database::pexecute($ins_stmt, array('domainid' => $id, 'ipandportid' => $defaultip_new));
}
} }
} }
} }

1
lng/english.lng.php
View File

@@ -2119,3 +2119,4 @@ $lng['admin']['plans']['use_plan'] = 'Apply plan';
$lng['question']['plan_reallydelete'] = 'Do you really want to delete the hosting plan %s?'; $lng['question']['plan_reallydelete'] = 'Do you really want to delete the hosting plan %s?';
$lng['admin']['notryfiles']['title'] = 'No autogenerated try_files'; $lng['admin']['notryfiles']['title'] = 'No autogenerated try_files';
$lng['admin']['notryfiles']['description'] = 'Say yes here if you want to specify a custom try_files directive in specialsettings (needed for some wordpress plugins for example).'; $lng['admin']['notryfiles']['description'] = 'Say yes here if you want to specify a custom try_files directive in specialsettings (needed for some wordpress plugins for example).';
$lng['panel']['none_value'] = 'None';

1
lng/german.lng.php
View File

@@ -1769,3 +1769,4 @@ $lng['admin']['plans']['use_plan'] = 'Plan übernehmen';
$lng['question']['plan_reallydelete'] = 'Wollen Sie den Hosting-Plan "%s" wirklich löschen?'; $lng['question']['plan_reallydelete'] = 'Wollen Sie den Hosting-Plan "%s" wirklich löschen?';
$lng['admin']['notryfiles']['title'] = 'Keine generierte try_files Anweisung'; $lng['admin']['notryfiles']['title'] = 'Keine generierte try_files Anweisung';
$lng['admin']['notryfiles']['description'] = 'Wähle "Ja", wenn eine eigene try_files Direktive in den "eigenen Vhost Einstellungen" angegeben werden soll (z.B. nötig für manche Wordpress Plugins).'; $lng['admin']['notryfiles']['description'] = 'Wähle "Ja", wenn eine eigene try_files Direktive in den "eigenen Vhost Einstellungen" angegeben werden soll (z.B. nötig für manche Wordpress Plugins).';
$lng['panel']['none_value'] = 'Keine';