Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

Till Brehm · Till Brehm · commit 1e33ee2d8458 · 2016-04-06T18:50:55.000+02:00
Refs #3817 - Adds a CLIENTID token parsed only for the "Add Client" form from a Reseller

Makes the CLIENTID token available in the add/edit reseller limit tab

See merge request !307
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
@@ -206,7 +206,7 @@ function onShowEnd() {
 				if($reseller['customer_no_template'] != '') {
 					//* Set customer no default
 					$customer_no = $app->functions->intval($reseller['customer_no_start']+$reseller['customer_no_counter']);
-					$customer_no_string = str_replace('[CUSTOMER_NO]',$customer_no,$reseller['customer_no_template']);
+					$customer_no_string = str_replace(array('[CUSTOMER_NO]','[CLIENTID]'),array($customer_no, $reseller['client_id']),$reseller['customer_no_template']);
 					$app->tpl->setVar('customer_no',$customer_no_string);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ function onShowEnd() {`
`206`	`206`	`if($reseller['customer_no_template'] != '') {`
`207`	`207`	`//* Set customer no default`
`208`	`208`	`$customer_no = $app->functions->intval($reseller['customer_no_start']+$reseller['customer_no_counter']);`
`209`		`- $customer_no_string = str_replace('[CUSTOMER_NO]',$customer_no,$reseller['customer_no_template']);`
	`209`	`+ $customer_no_string = str_replace(array('[CUSTOMER_NO]','[CLIENTID]'),array($customer_no, $reseller['client_id']),$reseller['customer_no_template']);`
`210`	`210`	`$app->tpl->setVar('customer_no',$customer_no_string);`
`211`	`211`	`}`
`212`	`212`	`}`