Merge remote-tracking branch 'origin/0.9.31'

admin_customers.php

@@ -1192,7 +1192,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']));
 

admin_tickets.php

@@ -815,8 +815,22 @@ if ($page == 'tickets'
 				WHERE `customerid` = :cid'
 			);
 			$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-			$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+
-			$by .= getCorrectFullUserDetails($usr).'</a>';
+			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 = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customerid)).'" rel="external">';
+				$by .= $customer.$customerloginname.'</a>';
+			} 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 = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+
-				$by .= getCorrectFullUserDetails($usr).'</a>';
+				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 = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customerid)).'" rel="external">';
+					$by .= $customer.$customerloginname.'</a>';
+				} else {
+					$by = $customer;
+				}
 			}
 
 			$subject = $subticket->Get('subject');

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);
 		}

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?<br/><em style="color:red;font-weight:bold;">Hinweis: Der Zeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim</em>';
+$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain Keys (DKIM) System benutzen?<br/><em style="color:red;font-weight:bold;">Hinweis: Derzeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim</em>';
 $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';
@@ -1335,10 +1335,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';