diff --git a/index.php b/index.php index fc929e02..8f5b4c8b 100644 --- a/index.php +++ b/index.php @@ -393,7 +393,7 @@ if ($action == 'forgotpwd') { if (isset($_POST['send']) && $_POST['send'] == 'send') { $loginname = \Froxlor\Validate\Validate::validate($_POST['loginname'], 'loginname'); $email = \Froxlor\Validate\Validate::validateEmail($_POST['loginemail'], 'email'); - $result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "` + $result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `customernumber`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`= :loginname AND `email`= :email"); Database::pexecute($result_stmt, array( @@ -481,6 +481,10 @@ if ($action == 'forgotpwd') { $replace_arr = array( 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($user), + 'NAME' => $user['name'], + 'FIRSTNAME' => $user['firstname'] ?? "", + 'COMPANY' => $user['company'] ?? "", + 'CUSTOMER_NO' => $user['customernumber'] ?? 0, 'USERNAME' => $loginname, 'LINK' => $activationlink ); diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php index cb815c92..8bb2616c 100644 --- a/lib/Froxlor/Api/Commands/Customers.php +++ b/lib/Froxlor/Api/Commands/Customers.php @@ -689,6 +689,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource 'name' => $name, 'company' => $company )), + 'CUSTOMER_NO' => $customernumber, 'USERNAME' => $loginname, 'PASSWORD' => $password, 'SERVER_HOSTNAME' => $srv_hostname, diff --git a/lib/Froxlor/Api/Commands/EmailAccounts.php b/lib/Froxlor/Api/Commands/EmailAccounts.php index 853bc8d2..0a06f524 100644 --- a/lib/Froxlor/Api/Commands/EmailAccounts.php +++ b/lib/Froxlor/Api/Commands/EmailAccounts.php @@ -192,7 +192,12 @@ class EmailAccounts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Reso $replace_arr = array( 'EMAIL' => $email_full, 'USERNAME' => $username, - 'PASSWORD' => $password + 'PASSWORD' => $password, + 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($customer), + 'NAME' => $customer['name'], + 'FIRSTNAME' => $customer['firstname'], + 'COMPANY' => $customer['company'], + 'CUSTOMER_NO' => $customer['customernumber'] ); // get the customers admin diff --git a/lib/Froxlor/Api/Commands/Ftps.php b/lib/Froxlor/Api/Commands/Ftps.php index 59b7906e..978b03b4 100644 --- a/lib/Froxlor/Api/Commands/Ftps.php +++ b/lib/Froxlor/Api/Commands/Ftps.php @@ -227,6 +227,10 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit $replace_arr = array( 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($customer), 'CUST_NAME' => \Froxlor\User::getCorrectUserSalutation($customer), // < keep this for compatibility + 'NAME' => $customer['name'], + 'FIRSTNAME' => $customer['firstname'], + 'COMPANY' => $customer['company'], + 'CUSTOMER_NO' => $customer['customernumber'], 'USR_NAME' => $username, 'USR_PASS' => $password, 'USR_PATH' => \Froxlor\FileDir::makeCorrectDir(str_replace($customer['documentroot'], "/", $path)) diff --git a/lib/Froxlor/Api/Commands/Mysqls.php b/lib/Froxlor/Api/Commands/Mysqls.php index f9fd1b41..417e13ed 100644 --- a/lib/Froxlor/Api/Commands/Mysqls.php +++ b/lib/Froxlor/Api/Commands/Mysqls.php @@ -125,6 +125,10 @@ class Mysqls extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt $replace_arr = array( 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($userinfo), 'CUST_NAME' => \Froxlor\User::getCorrectUserSalutation($userinfo), // < keep this for compatibility + 'NAME' => $userinfo['name'], + 'FIRSTNAME' => $userinfo['firstname'], + 'COMPANY' => $userinfo['company'], + 'CUSTOMER_NO' => $userinfo['customernumber'], 'DB_NAME' => $username, 'DB_PASS' => $password, 'DB_DESC' => $databasedescription, diff --git a/lib/Froxlor/Cron/Traffic/ReportsCron.php b/lib/Froxlor/Cron/Traffic/ReportsCron.php index f97df232..7afdd7b0 100644 --- a/lib/Froxlor/Cron/Traffic/ReportsCron.php +++ b/lib/Froxlor/Cron/Traffic/ReportsCron.php @@ -36,7 +36,7 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron if ((int) Settings::Get('system.report_trafficmax') > 0) { // Warn the customers at xx% traffic-usage $result_stmt = Database::prepare(" - SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, + SELECT `c`.`customerid`, `c`.`customernumber`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`traffic`, `c`.`email`, `c`.`def_language`, `a`.`name` AS `adminname`, `a`.`email` AS `adminmail`, (SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`) @@ -60,11 +60,15 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron $rep_userinfo = array( 'name' => $row['name'], 'firstname' => $row['firstname'], - 'company' => $row['company'] + 'company' => $row['company'], + 'customernumber' => $row['customernumber'] ); $replace_arr = array( 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($rep_userinfo), - 'NAME' => $row['name'], // < keep this for compatibility + 'NAME' => $rep_userinfo['name'], + 'FIRSTNAME' => $rep_userinfo['firstname'], + 'COMPANY' => $rep_userinfo['company'], + 'CUSTOMER_NO' => $rep_userinfo['customernumber'], 'TRAFFIC' => round(($row['traffic'] / 1024), 2), /* traffic is stored in KB, template uses MB */ 'TRAFFICUSED' => round(($row['traffic_used'] / 1024), 2), /* traffic is stored in KB, template uses MB */ 'USAGE_PERCENT' => round(($row['traffic_used'] * 100) / $row['traffic'], 2), @@ -168,8 +172,8 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron $replace_arr = array( 'NAME' => $row['name'], 'TRAFFIC' => round(($row['traffic'] / 1024), 2), /* traffic is stored in KB, template uses MB */ - 'TRAFFICUSED' => round(($row['traffic_used_total'] / 1024), 2), /* traffic is stored in KB, template uses MB */ - 'USAGE_PERCENT' => round(($row['traffic_used_total'] * 100) / $row['traffic'], 2), + 'TRAFFICUSED' => round(($row['traffic_used_total'] / 1024), 2), /* traffic is stored in KB, template uses MB */ + 'USAGE_PERCENT' => round(($row['traffic_used_total'] * 100) / $row['traffic'], 2), 'MAX_PERCENT' => Settings::Get('system.report_trafficmax') ); @@ -343,7 +347,7 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron * report about diskusage for customers */ $result_stmt = Database::query(" - SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, + SELECT `c`.`customerid`, `c`.`customernumber`,, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`diskspace`, `c`.`diskspace_used`, `c`.`email`, `c`.`def_language`, `a`.`name` AS `adminname`, `a`.`email` AS `adminmail` FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c` @@ -361,11 +365,15 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron $rep_userinfo = array( 'name' => $row['name'], 'firstname' => $row['firstname'], - 'company' => $row['company'] + 'company' => $row['company'], + 'customernumber' => $row['customernumber'] ); $replace_arr = array( 'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($rep_userinfo), - 'NAME' => $row['name'], // < keep this for compatibility + 'NAME' => $rep_userinfo['name'], + 'FIRSTNAME' => $rep_userinfo['firstname'], + 'COMPANY' => $rep_userinfo['company'], + 'CUSTOMER_NO' => $rep_userinfo['customernumber'], 'DISKAVAILABLE' => round(($row['diskspace'] / 1024), 2), /* traffic is stored in KB, template uses MB */ 'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */ 'USAGE_PERCENT' => round(($row['diskspace_used'] * 100) / $row['diskspace'], 2), diff --git a/lng/english.lng.php b/lng/english.lng.php index 1101ce30..5a1868a9 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -317,6 +317,7 @@ $lng['admin']['templates']['COMPANY'] = 'Replaces with the customer\'s company n $lng['admin']['templates']['USERNAME'] = 'Replaced with the customer\'s account username.'; $lng['admin']['templates']['PASSWORD'] = 'Replaced with the customer\'s account password.'; $lng['admin']['templates']['EMAIL'] = 'Replaced with the address of the POP3/IMAP account.'; +$lng['admin']['templates']['CUSTOMER_NO'] = 'Replaces with the customer number'; $lng['admin']['webserver'] = 'Webserver'; $lng['admin']['bindzonewarning'] = $lng['panel']['emptyfordefault'] . '
ATTENTION: If you use a zonefile you will have to manage all required records for all sub-zones manually as well.'; diff --git a/lng/german.lng.php b/lng/german.lng.php index ada5e836..9208d0e4 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -314,6 +314,7 @@ $lng['admin']['templates']['COMPANY'] = 'Wird mit dem Firmennamen des Kunden ers $lng['admin']['templates']['USERNAME'] = 'Wird mit dem Benutzernamen des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['PASSWORD'] = 'Wird mit dem Passwort des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['EMAIL'] = 'Wird mit der Adresse des neuen E-Mail-Kontos ersetzt.'; +$lng['admin']['templates']['CUSTOMER_NO'] = 'Wir mit der Kunden-Nummer ersetzt'; $lng['admin']['bindzonewarning'] = $lng['panel']['emptyfordefault'] . '
WARNUNG: Bei der Verwendung einer Zonendatei müssen alle benötigten Records aller Subdomains ebenfalls manuell verwaltet werden.'; /** diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl index 6f197624..7077f924 100644 --- a/templates/Sparkle/admin/templates/templates_add_2.tpl +++ b/templates/Sparkle/admin/templates/templates_add_2.tpl @@ -40,23 +40,27 @@ $header + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {FIRSTNAME} + {$lng['admin']['templates']['FIRSTNAME']} + + + {NAME} + {$lng['admin']['templates']['NAME']} + + + {COMPANY} + {$lng['admin']['templates']['COMPANY']} + + + {CUSTOMER_NO} + {$lng['admin']['templates']['CUSTOMER_NO']} + - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - {USERNAME} {$lng['admin']['templates']['USERNAME']} @@ -88,10 +92,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {USERNAME} {$lng['admin']['templates']['USERNAME']} @@ -138,10 +138,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {DB_NAME} {$lng['admin']['templates']['DB_NAME']} @@ -164,10 +160,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {USR_NAME} {$lng['admin']['templates']['USR_NAME']} diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl index d9a12501..875ef050 100644 --- a/templates/Sparkle/admin/templates/templates_edit.tpl +++ b/templates/Sparkle/admin/templates/templates_edit.tpl @@ -42,23 +42,27 @@ $header + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {FIRSTNAME} + {$lng['admin']['templates']['FIRSTNAME']} + + + {NAME} + {$lng['admin']['templates']['NAME']} + + + {COMPANY} + {$lng['admin']['templates']['COMPANY']} + + + {CUSTOMER_NO} + {$lng['admin']['templates']['CUSTOMER_NO']} + - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - {USERNAME} {$lng['admin']['templates']['USERNAME']} @@ -90,10 +94,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {USERNAME} {$lng['admin']['templates']['USERNAME']} @@ -140,10 +140,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {DB_NAME} {$lng['admin']['templates']['DB_NAME']} @@ -166,10 +162,6 @@ $header - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - {USR_NAME} {$lng['admin']['templates']['USR_NAME']} @@ -190,4 +182,3 @@ $header $footer -