Skip to content
GitLab
Commit aa3ea245 authored by tbrehm's avatar tbrehm
Browse files

Implemented: FS#1325 - Option to create remoting user automatically during... 

Implemented: FS#1325 - Option to create remoting user automatically during package installation from repository
Implemented: VAT-ID and customer No. fields for client and reseller.
parent eab50855
Hide whitespace changes
Inline Side-by-side
interface/web/admin/software_package_list.php
View file @ aa3ea245
......@@ -57,17 +57,18 @@ if(is_array($repos) && isset($_GET['action']) && $_GET['action'] == 'repoupdate'
$package_type = $app->db->quote($p['type']);
$package_installable = $app->db->quote($p['installable']);
$package_requires_db = $app->db->quote($p['requires_db']);
$package_remote_functions = $app->db->quote($p['remote_functions']);
if(empty($tmp['package_id'])) {
//$sql = "INSERT INTO software_package (software_repo_id, package_name, package_title, package_description,package_type,package_installable,package_requires_db) VALUES ($software_repo_id, '$package_name', '$package_title', '$package_description','$package_type','$package_installable','$package_requires_db')";
//$app->db->query($sql);
$insert_data = "(software_repo_id, package_name, package_title, package_description,package_type,package_installable,package_requires_db) VALUES ($software_repo_id, '$package_name', '$package_title', '$package_description','$package_type','$package_installable','$package_requires_db')";
$insert_data = "(software_repo_id, package_name, package_title, package_description,package_type,package_installable,package_requires_db,package_remote_functions) VALUES ($software_repo_id, '$package_name', '$package_title', '$package_description','$package_type','$package_installable','$package_requires_db','$package_remote_functions')";
$app->db->datalogInsert('software_package', $insert_data, 'package_id');
$packages_added++;
} else {
//$sql = "UPDATE software_package SET software_repo_id = $software_repo_id, package_title = '$package_title', package_description = '$package_description', package_type = '$package_type', package_installable = '$package_installable', package_requires_db = '$package_requires_db' WHERE package_name = '$package_name'";
//$app->db->query($sql);
$update_data = "software_repo_id = $software_repo_id, package_title = '$package_title', package_description = '$package_description', package_type = '$package_type', package_installable = '$package_installable', package_requires_db = '$package_requires_db'";
$update_data = "software_repo_id = $software_repo_id, package_title = '$package_title', package_description = '$package_description', package_type = '$package_type', package_installable = '$package_installable', package_requires_db = '$package_requires_db', package_remote_functions = '$package_remote_functions'";
//echo $update_data;
$app->db->datalogUpdate('software_package', $update_data, 'package_id',$tmp['package_id']);
}
......
interface/web/admin/templates/software_package_list.htm
View file @ aa3ea245
......@@ -21,6 +21,7 @@
<th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
<th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
</tr>
</thead>
<tbody>
......@@ -29,12 +30,13 @@
<td class="tbl_col_installed">{tmpl_var name="installed"}</td>
<td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
<td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
<td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
</tr>
</tmpl_loop>
</tbody>
<tfoot>
<tr>
<td class="tbl_footer tbl_paging" colspan="3"></td>
<td class="tbl_footer tbl_paging" colspan="4"></td>
</tr>
</tfoot>
</table>
......
interface/web/client/form/client.tform.php
View file @ aa3ea245
......@@ -106,6 +106,17 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
'customer_no' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'separator' => '',
'width' => '30',
'maxlength' => '255',
'rows' => '',
'cols' => ''
),
'username' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......@@ -283,6 +294,17 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
'vat_id' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'separator' => '',
'width' => '30',
'maxlength' => '255',
'rows' => '',
'cols' => ''
),
'notes' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
......
interface/web/client/form/reseller.tform.php
View file @ aa3ea245
......@@ -95,6 +95,17 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
'customer_no' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'separator' => '',
'width' => '30',
'maxlength' => '255',
'rows' => '',
'cols' => ''
),
'username' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......@@ -272,6 +283,17 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
'vat_id' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'separator' => '',
'width' => '30',
'maxlength' => '255',
'rows' => '',
'cols' => ''
),
'notes' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
......
interface/web/client/lib/lang/ar_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/ar_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/bg_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/bg_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/br_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Cota de Tráfego';
$wb['limit_trafficquota_error_notint'] = 'A cota de tráfego precisa ser um número..';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/br_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'O número de clientes precisa ser > 0';
$wb['limit_web_quota_txt'] = 'Cota Web';
$wb['limit_traffic_quota_txt'] = 'Cota de Tráfego';
$wb['limit_trafficquota_error_notint'] = 'a cota de tráfego deve ser um número.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/cz_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/cz_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_web_quota_txt'] = 'Web kvóta';
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/de_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/de_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_trafficquota_error_notint'] = 'Traffic Quota muss eine Zahl sein.';
$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/en_client.lng
View file @ aa3ea245
......@@ -98,4 +98,7 @@ $wb["limit_client_error"] = 'The max. number of clients is reached.';
$wb["limit_web_quota_txt"] = 'Web Quota';
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';
$wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
$wb["customer_no_txt"] = 'Customer No.';
$wb["vat_id_txt"] = 'VAT ID';
$wb["required_fields_txt"] = '* Required fields';
?>
interface/web/client/lib/lang/en_reseller.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb["limit_client_error_positive"] = 'The number of clients must be > 0';
$wb["limit_web_quota_txt"] = 'Web Quota';
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';
$wb["limit_trafficquota_error_notint"] = 'Traffic Quota must be a number.';
$wb["customer_no_txt"] = 'Customer No.';
$wb["vat_id_txt"] = 'VAT ID';
$wb["required_fields_txt"] = '* Required fields';
?>
interface/web/client/lib/lang/es_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/es_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'The number of clients must be > 0';
$wb['limit_web_quota_txt'] = 'Web Quota';
$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/fi_client.lng
View file @ aa3ea245
......@@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Liikenneraja';
$wb['limit_trafficquota_error_notint'] = 'Liikennerajan pitää olle numeerinen.';
$wb['limit_webdav_user_txt'] = 'Webdav-käyttäjien enimmäismäärä';
$wb['limit_webdav_user_error_notint'] = 'Webdav-käyttäjien rajan pitää olla numeerinen.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
interface/web/client/lib/lang/fi_reseller.lng
View file @ aa3ea245
......@@ -93,4 +93,7 @@ $wb['limit_web_quota_txt'] = 'WWW-levytila';
$wb['limit_traffic_quota_txt'] = 'Liikenneraja';
$wb['limit_trafficquota_error_notint'] = 'Liikennerajan pitää olla numeerinen.';
$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment