From aa7d1d3f484791cabc2dfe624e0e2226b8431af7 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 12 Dec 2013 13:39:18 +0100 Subject: [PATCH 1/4] show customer name and loginname in ticket-archive if customer-exists Signed-off-by: Michael Kaufmann (d00p) --- admin_tickets.php | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/admin_tickets.php b/admin_tickets.php index 4dd410b6..d6f30f67 100644 --- a/admin_tickets.php +++ b/admin_tickets.php @@ -815,8 +815,22 @@ if ($page == 'tickets' WHERE `customerid` = :cid' ); $usr = Database::pexecute_first($usr_stmt, array('cid' => $cid)); - $by = ''; - $by .= getCorrectFullUserDetails($usr).''; + + if (isset($usr['loginname'])) { + $customer = getCorrectFullUserDetails($usr); + $customerloginname = ' ('.$usr['loginname'].')'; + $customerid = $usr['customerid']; + } else { + $customer = $lng['ticket']['nonexistingcustomer']; + $customerid = 0; + $customerloginname = ''; + } + if ($customerid != 0) { + $by = ''; + $by .= $customer.$customerloginname.''; + } else { + $by = $customer; + } } $subject = $mainticket->Get('subject'); @@ -849,8 +863,22 @@ if ($page == 'tickets' WHERE `customerid` = :cid' ); $usr = Database::pexecute_first($usr_stmt, array('cid' => $cid)); - $by = ''; - $by .= getCorrectFullUserDetails($usr).''; + + if (isset($usr['loginname'])) { + $customer = getCorrectFullUserDetails($usr); + $customerloginname = ' ('.$usr['loginname'].')'; + $customerid = $usr['customerid']; + } else { + $customer = $lng['ticket']['nonexistingcustomer']; + $customerid = 0; + $customerloginname = ''; + } + if ($customerid != 0) { + $by = ''; + $by .= $customer.$customerloginname.''; + } else { + $by = $customer; + } } $subject = $subticket->Get('subject'); From 06cff22caaa8c0100bcca296fad79eef408833a9 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 12 Dec 2013 14:27:24 +0100 Subject: [PATCH 2/4] allow custom sendmail_path value in php.ini when using php-fpm, fixes #1323 Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/phpinterface/class.phpinterface_fpm.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php index 1eae275c..be273494 100644 --- a/lib/classes/phpinterface/class.phpinterface_fpm.php +++ b/lib/classes/phpinterface/class.phpinterface_fpm.php @@ -74,6 +74,7 @@ class phpinterface_fpm { 'variables_order', 'gpc_order', 'date.timezone', + 'sendmail_path', 'session.gc_divisor', 'session.gc_probability' ), @@ -178,14 +179,11 @@ class phpinterface_fpm { if (!is_dir($tmpdir)) { $this->getTempDir(); } - //$slowlog = makeCorrectFile($this->_settings['system']['logfiles_directory'] . $this->_domain['loginname'] . '/php-fpm_slow.log'); $fpm_config.= 'env[TMP] = '.$tmpdir."\n"; $fpm_config.= 'env[TMPDIR] = '.$tmpdir."\n"; $fpm_config.= 'env[TEMP] = '.$tmpdir."\n"; - $fpm_config.= 'php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f '.$this->_domain['email']."\n"; - $openbasedir = ''; if ($this->_domain['loginname'] != 'froxlor.panel') { if ($this->_domain['openbasedir'] == '1') { @@ -256,6 +254,12 @@ class phpinterface_fpm { } } + // now check if 'sendmail_path' has not beed set in the custom-php.ini + // if not we use our fallback-default as usual + if (strpos($fpm_config, 'php_admin_value[sendmail_path]') === false) { + $fpm_config.= 'php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f '.$this->_domain['email']."\n"; + } + fwrite($fh, $fpm_config, strlen($fpm_config)); fclose($fh); } From fcaa2f8aa9d9ecf4ded7ed498cf9d1b24edd4b95 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Thu, 12 Dec 2013 23:07:18 +0100 Subject: [PATCH 3/4] fixed translation of 'traffic' for german Signed-off-by: Roman Schmerold (BNoiZe) --- lng/german.lng.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lng/german.lng.php b/lng/german.lng.php index 1f04bebf..74da98d1 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1539,10 +1539,10 @@ $lng['serversettings']['validate_domain'] = 'Validiere Domainnamen'; $lng['login']['combination_not_found'] = 'Kombination aus Benutzername und E-Mail Adresse stimmen nicht überein.'; $lng['customer']['generated_pwd'] = 'Passwortvorschlag'; $lng['customer']['usedmax'] = 'Benutzt / Max.'; -$lng['admin']['traffic'] = 'Datentransfer'; +$lng['admin']['traffic'] = 'Traffic'; $lng['admin']['customertraffic'] = 'Kunden'; $lng['traffic']['customer'] = 'Kunde'; -$lng['traffic']['trafficoverview'] = 'Übersicht Datentransfervolumen je'; +$lng['traffic']['trafficoverview'] = 'Übersicht Traffic je'; $lng['traffic']['months']['jan'] = 'Jan'; $lng['traffic']['months']['feb'] = 'Feb'; $lng['traffic']['months']['mar'] = 'Mär'; From 26b57e2d4d250feb4a4199a0d25f744720451f03 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 13 Dec 2013 07:15:13 +0100 Subject: [PATCH 4/4] fix sql-query (thx to anonymous report) in admin-customers; fix german language-string (thx to dnano91) Signed-off-by: Michael Kaufmann (d00p) --- admin_customers.php | 2 +- lng/german.lng.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_customers.php b/admin_customers.php index 18fd430a..9561a4fe 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -1305,7 +1305,7 @@ if ($page == 'customers' // set ip <-> domain connection $ins_stmt = Database::prepare(" - INSERT INTO `".TABLE_DOMAINTOIP."` SET `id_domain` = :domainid, `id_ipandports` = :ipid'" + INSERT INTO `".TABLE_DOMAINTOIP."` SET `id_domain` = :domainid, `id_ipandports` = :ipid" ); Database::pexecute($ins_stmt, array('domainid' => $domainid, 'ipid' => $settings['system']['defaultip'])); diff --git a/lng/german.lng.php b/lng/german.lng.php index 74da98d1..6b7bd115 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -807,7 +807,7 @@ $lng['admin']['allips'] = 'Alle IP\'s'; $lng['panel']['nosslipsavailable'] = 'Für diesen Server wurden noch keine SSL IP/Port Kombinationen eingetragen'; $lng['ticket']['by'] = 'von'; $lng['dkim']['use_dkim']['title'] = 'DKIM Support aktivieren?'; -$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain Keys (DKIM) System benutzen?
Hinweis: Der Zeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim'; +$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain Keys (DKIM) System benutzen?
Hinweis: Derzeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim'; $lng['error']['invalidmysqlhost'] = 'Ungültige MySQL Host Adresse: "%s"'; $lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'Webalizer und AWstats können nicht zur gleichen Zeit aktiviert werden, bitte wählen Sie eines aus'; $lng['serversettings']['webalizer_enabled'] = 'Nutze Webalizer Statistiken';