Skip to content

Commit aa3ea24

Browse files
tbrehmtbrehm
committed
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.
1 parent eab5085 commit aa3ea24

File tree

106 files changed

+450
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+450
-208
lines changed

‎install/sql/incremental/upd_0003.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
2+
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;

‎install/sql/ispconfig3.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ CREATE TABLE `client` (
5353
`sys_perm_other` varchar(5) default NULL,
5454
`company_name` varchar(64) default NULL,
5555
`contact_name` varchar(64) default NULL,
56+
`customer_no` varchar(64) default NULL,
57+
`vat_id` varchar(64) default NULL,
5658
`street` varchar(255) default NULL,
5759
`zip` varchar(32) default NULL,
5860
`city` varchar(64) default NULL,
@@ -747,6 +749,7 @@ CREATE TABLE `software_package` (
747749
`package_type` enum('ispconfig','app','web') NOT NULL default 'app',
748750
`package_installable` enum('yes','no','key') NOT NULL default 'yes',
749751
`package_requires_db` enum('no','mysql') NOT NULL default 'no',
752+
`package_remote_functions` text,
750753
`package_key` varchar(255) NOT NULL,
751754
`package_config` text,
752755
PRIMARY KEY (`package_id`),

‎interface/web/admin/lib/lang/ar_package_install.lng‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
$wb["repo_name_txt"] = 'Repository';
3-
$wb["repo_url_txt"] = 'URL';
4-
$wb["repo_username_txt"] = 'User (optional)';
5-
$wb["repo_password_txt"] = 'Password (optional)';
6-
$wb["active_txt"] = 'Active';
7-
?>
2+
$wb['repo_name_txt'] = 'Repository';
3+
$wb['repo_url_txt'] = 'URL';
4+
$wb['repo_username_txt'] = 'User (optional)';
5+
$wb['repo_password_txt'] = 'Password (optional)';
6+
$wb['active_txt'] = 'Active';
7+
?>

‎interface/web/admin/lib/lang/ar_software_package_install.lng‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$wb["head_txt"] = 'Install software package';
3-
$wb["install_key_txt"] = 'Enter install key';
4-
$wb["btn_save_txt"] = 'Start Installation';
5-
$wb["btn_cancel_txt"] = 'Cancel';
6-
?>
2+
$wb['head_txt'] = 'Install software package';
3+
$wb['install_key_txt'] = 'Enter install key';
4+
$wb['btn_save_txt'] = 'Start Installation';
5+
$wb['btn_cancel_txt'] = 'Cancel';
6+
?>

‎interface/web/admin/lib/lang/ar_software_package_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description';
66
$wb['action_txt'] = 'Action';
77
$wb['toolsarea_head_txt'] = 'Packages';
88
$wb['repoupdate_txt'] = 'Update package list';
9+
$wb['package_id_txt'] = 'local App-ID';
910
?>

‎interface/web/admin/lib/lang/bg_package_install.lng‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
$wb["repo_name_txt"] = 'Repository';
3-
$wb["repo_url_txt"] = 'URL';
4-
$wb["repo_username_txt"] = 'User (optional)';
5-
$wb["repo_password_txt"] = 'Password (optional)';
6-
$wb["active_txt"] = 'Active';
7-
?>
2+
$wb['repo_name_txt'] = 'Repository';
3+
$wb['repo_url_txt'] = 'URL';
4+
$wb['repo_username_txt'] = 'User (optional)';
5+
$wb['repo_password_txt'] = 'Password (optional)';
6+
$wb['active_txt'] = 'Active';
7+
?>

‎interface/web/admin/lib/lang/bg_software_package_install.lng‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$wb["head_txt"] = 'Install software package';
3-
$wb["install_key_txt"] = 'Enter install key';
4-
$wb["btn_save_txt"] = 'Start Installation';
5-
$wb["btn_cancel_txt"] = 'Cancel';
6-
?>
2+
$wb['head_txt'] = 'Install software package';
3+
$wb['install_key_txt'] = 'Enter install key';
4+
$wb['btn_save_txt'] = 'Start Installation';
5+
$wb['btn_cancel_txt'] = 'Cancel';
6+
?>

‎interface/web/admin/lib/lang/bg_software_package_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description';
66
$wb['action_txt'] = 'Action';
77
$wb['toolsarea_head_txt'] = 'Packages';
88
$wb['repoupdate_txt'] = 'Update package list';
9+
$wb['package_id_txt'] = 'local App-ID';
910
?>

‎interface/web/admin/lib/lang/br_package_install.lng‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
$wb["repo_name_txt"] = 'Repository';
3-
$wb["repo_url_txt"] = 'URL';
4-
$wb["repo_username_txt"] = 'User (optional)';
5-
$wb["repo_password_txt"] = 'Password (optional)';
6-
$wb["active_txt"] = 'Active';
7-
?>
2+
$wb['repo_name_txt'] = 'Repository';
3+
$wb['repo_url_txt'] = 'URL';
4+
$wb['repo_username_txt'] = 'User (optional)';
5+
$wb['repo_password_txt'] = 'Password (optional)';
6+
$wb['active_txt'] = 'Active';
7+
?>

‎interface/web/admin/lib/lang/br_software_package_install.lng‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
2-
$wb["head_txt"] = 'Install software package';
3-
$wb["install_key_txt"] = 'Enter install key';
4-
$wb["btn_save_txt"] = 'Start Installation';
5-
$wb["btn_cancel_txt"] = 'Cancel';
6-
?>
2+
$wb['head_txt'] = 'Install software package';
3+
$wb['install_key_txt'] = 'Enter install key';
4+
$wb['btn_save_txt'] = 'Start Installation';
5+
$wb['btn_cancel_txt'] = 'Cancel';
6+
?>

0 commit comments

Comments
 (0)