From aa3ea245dd208d5b80afdb6f8ef35c9d6409d7cd Mon Sep 17 00:00:00 2001 From: tbrehm Date: Sun, 26 Sep 2010 13:25:29 +0000 Subject: [PATCH] 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. --- install/sql/incremental/upd_0003.sql | 2 ++ install/sql/ispconfig3.sql | 3 ++ .../web/admin/lib/lang/ar_package_install.lng | 12 +++---- .../lib/lang/ar_software_package_install.lng | 10 +++--- .../lib/lang/ar_software_package_list.lng | 1 + .../web/admin/lib/lang/bg_package_install.lng | 12 +++---- .../lib/lang/bg_software_package_install.lng | 10 +++--- .../lib/lang/bg_software_package_list.lng | 1 + .../web/admin/lib/lang/br_package_install.lng | 12 +++---- .../lib/lang/br_software_package_install.lng | 10 +++--- .../lib/lang/br_software_package_list.lng | 1 + .../web/admin/lib/lang/cz_package_install.lng | 12 +++---- .../lib/lang/cz_software_package_install.lng | 10 +++--- .../lib/lang/cz_software_package_list.lng | 1 + .../web/admin/lib/lang/de_package_install.lng | 12 +++---- .../lib/lang/de_software_package_install.lng | 10 +++--- .../lib/lang/de_software_package_list.lng | 1 + interface/web/admin/lib/lang/en.lng | 2 +- .../lib/lang/en_software_package_list.lng | 3 +- .../web/admin/lib/lang/es_package_install.lng | 12 +++---- .../lib/lang/es_software_package_install.lng | 10 +++--- .../lib/lang/es_software_package_list.lng | 1 + .../web/admin/lib/lang/fi_package_install.lng | 12 +++---- .../lib/lang/fi_software_package_install.lng | 10 +++--- .../lib/lang/fi_software_package_list.lng | 1 + .../lib/lang/fr_software_package_list.lng | 1 + .../web/admin/lib/lang/hu_package_install.lng | 12 +++---- .../lib/lang/hu_software_package_install.lng | 10 +++--- .../lib/lang/hu_software_package_list.lng | 1 + .../web/admin/lib/lang/it_package_install.lng | 12 +++---- .../lib/lang/it_software_package_install.lng | 10 +++--- .../lib/lang/it_software_package_list.lng | 1 + .../web/admin/lib/lang/ja_package_install.lng | 12 +++---- .../lib/lang/ja_software_package_install.lng | 10 +++--- .../lib/lang/ja_software_package_list.lng | 1 + .../web/admin/lib/lang/nl_package_install.lng | 12 +++---- .../lib/lang/nl_software_package_install.lng | 10 +++--- .../lib/lang/nl_software_package_list.lng | 1 + .../web/admin/lib/lang/pl_package_install.lng | 12 +++---- .../lib/lang/pl_software_package_install.lng | 10 +++--- .../lib/lang/pl_software_package_list.lng | 1 + .../web/admin/lib/lang/pt_package_install.lng | 12 +++---- .../lib/lang/pt_software_package_install.lng | 10 +++--- .../lib/lang/pt_software_package_list.lng | 1 + .../web/admin/lib/lang/ro_package_install.lng | 12 +++---- .../lib/lang/ro_software_package_install.lng | 10 +++--- .../lib/lang/ro_software_package_list.lng | 1 + .../web/admin/lib/lang/ru_package_install.lng | 12 +++---- .../lib/lang/ru_software_package_install.lng | 10 +++--- .../lib/lang/ru_software_package_list.lng | 1 + .../web/admin/lib/lang/se_package_install.lng | 12 +++---- .../lib/lang/se_software_package_install.lng | 10 +++--- .../lib/lang/se_software_package_list.lng | 1 + .../web/admin/lib/lang/sk_package_install.lng | 12 +++---- .../lib/lang/sk_software_package_install.lng | 10 +++--- .../lib/lang/sk_software_package_list.lng | 1 + .../web/admin/lib/lang/tr_package_install.lng | 12 +++---- .../lib/lang/tr_software_package_install.lng | 10 +++--- .../lib/lang/tr_software_package_list.lng | 1 + .../web/admin/software_package_install.php | 32 +++++++++++++++++++ interface/web/admin/software_package_list.php | 5 +-- .../admin/templates/software_package_list.htm | 4 ++- interface/web/client/form/client.tform.php | 22 +++++++++++++ interface/web/client/form/reseller.tform.php | 22 +++++++++++++ interface/web/client/lib/lang/ar_client.lng | 3 ++ interface/web/client/lib/lang/ar_reseller.lng | 3 ++ interface/web/client/lib/lang/bg_client.lng | 3 ++ interface/web/client/lib/lang/bg_reseller.lng | 3 ++ interface/web/client/lib/lang/br_client.lng | 3 ++ interface/web/client/lib/lang/br_reseller.lng | 3 ++ interface/web/client/lib/lang/cz_client.lng | 3 ++ interface/web/client/lib/lang/cz_reseller.lng | 3 ++ interface/web/client/lib/lang/de_client.lng | 3 ++ interface/web/client/lib/lang/de_reseller.lng | 3 ++ interface/web/client/lib/lang/en_client.lng | 3 ++ interface/web/client/lib/lang/en_reseller.lng | 3 ++ interface/web/client/lib/lang/es_client.lng | 3 ++ interface/web/client/lib/lang/es_reseller.lng | 3 ++ interface/web/client/lib/lang/fi_client.lng | 3 ++ interface/web/client/lib/lang/fi_reseller.lng | 3 ++ interface/web/client/lib/lang/fr_client.lng | 3 ++ interface/web/client/lib/lang/fr_reseller.lng | 3 ++ interface/web/client/lib/lang/hu_client.lng | 3 ++ interface/web/client/lib/lang/hu_reseller.lng | 3 ++ interface/web/client/lib/lang/it_client.lng | 3 ++ interface/web/client/lib/lang/it_reseller.lng | 3 ++ interface/web/client/lib/lang/ja_client.lng | 3 ++ interface/web/client/lib/lang/ja_reseller.lng | 3 ++ interface/web/client/lib/lang/nl_client.lng | 3 ++ interface/web/client/lib/lang/nl_reseller.lng | 3 ++ interface/web/client/lib/lang/pl_client.lng | 3 ++ interface/web/client/lib/lang/pl_reseller.lng | 3 ++ interface/web/client/lib/lang/pt_client.lng | 3 ++ interface/web/client/lib/lang/pt_reseller.lng | 3 ++ interface/web/client/lib/lang/ro_client.lng | 3 ++ interface/web/client/lib/lang/ro_reseller.lng | 3 ++ interface/web/client/lib/lang/ru_client.lng | 3 ++ interface/web/client/lib/lang/ru_reseller.lng | 3 ++ interface/web/client/lib/lang/se_client.lng | 3 ++ interface/web/client/lib/lang/se_reseller.lng | 3 ++ interface/web/client/lib/lang/sk_client.lng | 3 ++ interface/web/client/lib/lang/sk_reseller.lng | 3 ++ interface/web/client/lib/lang/tr_client.lng | 3 ++ interface/web/client/lib/lang/tr_reseller.lng | 3 ++ .../client/templates/client_edit_address.htm | 15 +++++++-- .../templates/reseller_edit_address.htm | 13 ++++++-- 106 files changed, 450 insertions(+), 208 deletions(-) create mode 100644 install/sql/incremental/upd_0003.sql diff --git a/install/sql/incremental/upd_0003.sql b/install/sql/incremental/upd_0003.sql new file mode 100644 index 0000000000..bf058aae9e --- /dev/null +++ b/install/sql/incremental/upd_0003.sql @@ -0,0 +1,2 @@ +ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`; +ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 46c21baeb4..2825b1b777 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -53,6 +53,8 @@ CREATE TABLE `client` ( `sys_perm_other` varchar(5) default NULL, `company_name` varchar(64) default NULL, `contact_name` varchar(64) default NULL, + `customer_no` varchar(64) default NULL, + `vat_id` varchar(64) default NULL, `street` varchar(255) default NULL, `zip` varchar(32) default NULL, `city` varchar(64) default NULL, @@ -747,6 +749,7 @@ CREATE TABLE `software_package` ( `package_type` enum('ispconfig','app','web') NOT NULL default 'app', `package_installable` enum('yes','no','key') NOT NULL default 'yes', `package_requires_db` enum('no','mysql') NOT NULL default 'no', + `package_remote_functions` text, `package_key` varchar(255) NOT NULL, `package_config` text, PRIMARY KEY (`package_id`), diff --git a/interface/web/admin/lib/lang/ar_package_install.lng b/interface/web/admin/lib/lang/ar_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/ar_package_install.lng +++ b/interface/web/admin/lib/lang/ar_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/ar_software_package_install.lng b/interface/web/admin/lib/lang/ar_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/ar_software_package_install.lng +++ b/interface/web/admin/lib/lang/ar_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/ar_software_package_list.lng b/interface/web/admin/lib/lang/ar_software_package_list.lng index 87674c437e..f7a60d721f 100644 --- a/interface/web/admin/lib/lang/ar_software_package_list.lng +++ b/interface/web/admin/lib/lang/ar_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description'; $wb['action_txt'] = 'Action'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/bg_package_install.lng b/interface/web/admin/lib/lang/bg_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/bg_package_install.lng +++ b/interface/web/admin/lib/lang/bg_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/bg_software_package_install.lng b/interface/web/admin/lib/lang/bg_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/bg_software_package_install.lng +++ b/interface/web/admin/lib/lang/bg_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/bg_software_package_list.lng b/interface/web/admin/lib/lang/bg_software_package_list.lng index 87674c437e..f7a60d721f 100644 --- a/interface/web/admin/lib/lang/bg_software_package_list.lng +++ b/interface/web/admin/lib/lang/bg_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description'; $wb['action_txt'] = 'Action'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/br_package_install.lng b/interface/web/admin/lib/lang/br_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/br_package_install.lng +++ b/interface/web/admin/lib/lang/br_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/br_software_package_install.lng b/interface/web/admin/lib/lang/br_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/br_software_package_install.lng +++ b/interface/web/admin/lib/lang/br_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng index 38e61541d1..35510d7ea3 100644 --- a/interface/web/admin/lib/lang/br_software_package_list.lng +++ b/interface/web/admin/lib/lang/br_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Descrição'; $wb['action_txt'] = 'Acão'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/cz_package_install.lng +++ b/interface/web/admin/lib/lang/cz_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/cz_software_package_install.lng +++ b/interface/web/admin/lib/lang/cz_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng index 081cfca973..3936cdb497 100644 --- a/interface/web/admin/lib/lang/cz_software_package_list.lng +++ b/interface/web/admin/lib/lang/cz_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Popis'; $wb['action_txt'] = 'Akce'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/de_package_install.lng b/interface/web/admin/lib/lang/de_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/de_package_install.lng +++ b/interface/web/admin/lib/lang/de_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/de_software_package_install.lng +++ b/interface/web/admin/lib/lang/de_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng index b8b3538143..24ab07ad14 100644 --- a/interface/web/admin/lib/lang/de_software_package_list.lng +++ b/interface/web/admin/lib/lang/de_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Beschreibung'; $wb['action_txt'] = 'Aktion'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/en.lng b/interface/web/admin/lib/lang/en.lng index 0faa1c8f84..b07214eed6 100644 --- a/interface/web/admin/lib/lang/en.lng +++ b/interface/web/admin/lib/lang/en.lng @@ -31,7 +31,7 @@ $wb['New Language'] = 'New Language'; $wb['Export'] = 'Export'; $wb['Import'] = 'Import'; $wb['Language Editor'] = 'Language Editor'; -$wb['Software'] = 'Software'; +$wb['Software'] = 'Apps & Addons'; $wb['Repositories'] = 'Repositories'; $wb['Server Services'] = 'Server Services'; $wb['Interface Config'] = 'Interface Config'; diff --git a/interface/web/admin/lib/lang/en_software_package_list.lng b/interface/web/admin/lib/lang/en_software_package_list.lng index 87674c437e..29ad555875 100644 --- a/interface/web/admin/lib/lang/en_software_package_list.lng +++ b/interface/web/admin/lib/lang/en_software_package_list.lng @@ -1,9 +1,10 @@ diff --git a/interface/web/admin/lib/lang/es_package_install.lng b/interface/web/admin/lib/lang/es_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/es_package_install.lng +++ b/interface/web/admin/lib/lang/es_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/es_software_package_install.lng b/interface/web/admin/lib/lang/es_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/es_software_package_install.lng +++ b/interface/web/admin/lib/lang/es_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/es_software_package_list.lng b/interface/web/admin/lib/lang/es_software_package_list.lng index 9cfad40b28..b77a5d5a76 100644 --- a/interface/web/admin/lib/lang/es_software_package_list.lng +++ b/interface/web/admin/lib/lang/es_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Descripción'; $wb['action_txt'] = 'Acción'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/fi_package_install.lng b/interface/web/admin/lib/lang/fi_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/fi_package_install.lng +++ b/interface/web/admin/lib/lang/fi_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/fi_software_package_install.lng b/interface/web/admin/lib/lang/fi_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/fi_software_package_install.lng +++ b/interface/web/admin/lib/lang/fi_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng index 3e373ea447..9714b4d7d9 100755 --- a/interface/web/admin/lib/lang/fi_software_package_list.lng +++ b/interface/web/admin/lib/lang/fi_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Ohjelmapaketin kuvaus'; $wb['action_txt'] = 'Toiminto'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng index 898c053f1d..5bb0c2f0f6 100644 --- a/interface/web/admin/lib/lang/fr_software_package_list.lng +++ b/interface/web/admin/lib/lang/fr_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description'; $wb['action_txt'] = 'Action'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/hu_package_install.lng b/interface/web/admin/lib/lang/hu_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/hu_package_install.lng +++ b/interface/web/admin/lib/lang/hu_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/hu_software_package_install.lng b/interface/web/admin/lib/lang/hu_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/hu_software_package_install.lng +++ b/interface/web/admin/lib/lang/hu_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng index 78c782c4cb..495fe72858 100644 --- a/interface/web/admin/lib/lang/hu_software_package_list.lng +++ b/interface/web/admin/lib/lang/hu_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Leírás'; $wb['action_txt'] = 'Művelet'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/it_package_install.lng b/interface/web/admin/lib/lang/it_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/it_package_install.lng +++ b/interface/web/admin/lib/lang/it_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/it_software_package_install.lng b/interface/web/admin/lib/lang/it_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/it_software_package_install.lng +++ b/interface/web/admin/lib/lang/it_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng index 87674c437e..f7a60d721f 100644 --- a/interface/web/admin/lib/lang/it_software_package_list.lng +++ b/interface/web/admin/lib/lang/it_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description'; $wb['action_txt'] = 'Action'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/ja_package_install.lng b/interface/web/admin/lib/lang/ja_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/ja_package_install.lng +++ b/interface/web/admin/lib/lang/ja_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/ja_software_package_install.lng b/interface/web/admin/lib/lang/ja_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/ja_software_package_install.lng +++ b/interface/web/admin/lib/lang/ja_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/ja_software_package_list.lng b/interface/web/admin/lib/lang/ja_software_package_list.lng index 5bc9989a97..a1f5b65183 100644 --- a/interface/web/admin/lib/lang/ja_software_package_list.lng +++ b/interface/web/admin/lib/lang/ja_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = '説明'; $wb['action_txt'] = '操作'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/nl_package_install.lng b/interface/web/admin/lib/lang/nl_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/nl_package_install.lng +++ b/interface/web/admin/lib/lang/nl_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/nl_software_package_install.lng b/interface/web/admin/lib/lang/nl_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/nl_software_package_install.lng +++ b/interface/web/admin/lib/lang/nl_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng index 3a7a096478..326a15a650 100644 --- a/interface/web/admin/lib/lang/nl_software_package_list.lng +++ b/interface/web/admin/lib/lang/nl_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Omschrijving'; $wb['action_txt'] = 'Actie'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/pl_package_install.lng +++ b/interface/web/admin/lib/lang/pl_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/pl_software_package_install.lng +++ b/interface/web/admin/lib/lang/pl_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng index d58e67bd8a..82991fa09f 100644 --- a/interface/web/admin/lib/lang/pl_software_package_list.lng +++ b/interface/web/admin/lib/lang/pl_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Opis'; $wb['action_txt'] = 'Akcja'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/pt_package_install.lng b/interface/web/admin/lib/lang/pt_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/pt_package_install.lng +++ b/interface/web/admin/lib/lang/pt_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/pt_software_package_install.lng b/interface/web/admin/lib/lang/pt_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/pt_software_package_install.lng +++ b/interface/web/admin/lib/lang/pt_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/pt_software_package_list.lng b/interface/web/admin/lib/lang/pt_software_package_list.lng index d8f944a074..b544e9eee1 100644 --- a/interface/web/admin/lib/lang/pt_software_package_list.lng +++ b/interface/web/admin/lib/lang/pt_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Descrição'; $wb['action_txt'] = 'Acção'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/ro_package_install.lng b/interface/web/admin/lib/lang/ro_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/ro_package_install.lng +++ b/interface/web/admin/lib/lang/ro_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/ro_software_package_install.lng b/interface/web/admin/lib/lang/ro_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/ro_software_package_install.lng +++ b/interface/web/admin/lib/lang/ro_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/ro_software_package_list.lng b/interface/web/admin/lib/lang/ro_software_package_list.lng index 3185a9adf4..151cf8a3e5 100644 --- a/interface/web/admin/lib/lang/ro_software_package_list.lng +++ b/interface/web/admin/lib/lang/ro_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Descriere'; $wb['action_txt'] = 'Actiune'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/ru_package_install.lng b/interface/web/admin/lib/lang/ru_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/ru_package_install.lng +++ b/interface/web/admin/lib/lang/ru_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/ru_software_package_install.lng b/interface/web/admin/lib/lang/ru_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/ru_software_package_install.lng +++ b/interface/web/admin/lib/lang/ru_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng index fdf4aeaaca..2a453ee187 100644 --- a/interface/web/admin/lib/lang/ru_software_package_list.lng +++ b/interface/web/admin/lib/lang/ru_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Описание'; $wb['action_txt'] = 'Действие'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/se_package_install.lng b/interface/web/admin/lib/lang/se_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/se_package_install.lng +++ b/interface/web/admin/lib/lang/se_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/se_software_package_install.lng b/interface/web/admin/lib/lang/se_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/se_software_package_install.lng +++ b/interface/web/admin/lib/lang/se_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng index 87674c437e..f7a60d721f 100644 --- a/interface/web/admin/lib/lang/se_software_package_list.lng +++ b/interface/web/admin/lib/lang/se_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Description'; $wb['action_txt'] = 'Action'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/sk_package_install.lng b/interface/web/admin/lib/lang/sk_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/sk_package_install.lng +++ b/interface/web/admin/lib/lang/sk_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/sk_software_package_install.lng b/interface/web/admin/lib/lang/sk_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/sk_software_package_install.lng +++ b/interface/web/admin/lib/lang/sk_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/sk_software_package_list.lng b/interface/web/admin/lib/lang/sk_software_package_list.lng index 45b13e6f63..6e200b78fc 100644 --- a/interface/web/admin/lib/lang/sk_software_package_list.lng +++ b/interface/web/admin/lib/lang/sk_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Popis'; $wb['action_txt'] = 'Akcia'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/lib/lang/tr_package_install.lng b/interface/web/admin/lib/lang/tr_package_install.lng index 7968b000fd..574dd11629 100644 --- a/interface/web/admin/lib/lang/tr_package_install.lng +++ b/interface/web/admin/lib/lang/tr_package_install.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['repo_name_txt'] = 'Repository'; +$wb['repo_url_txt'] = 'URL'; +$wb['repo_username_txt'] = 'User (optional)'; +$wb['repo_password_txt'] = 'Password (optional)'; +$wb['active_txt'] = 'Active'; +?> diff --git a/interface/web/admin/lib/lang/tr_software_package_install.lng b/interface/web/admin/lib/lang/tr_software_package_install.lng index 7986035adf..5c8b756434 100644 --- a/interface/web/admin/lib/lang/tr_software_package_install.lng +++ b/interface/web/admin/lib/lang/tr_software_package_install.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['head_txt'] = 'Install software package'; +$wb['install_key_txt'] = 'Enter install key'; +$wb['btn_save_txt'] = 'Start Installation'; +$wb['btn_cancel_txt'] = 'Cancel'; +?> diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng index 03a16262e7..5caf6ef936 100644 --- a/interface/web/admin/lib/lang/tr_software_package_list.lng +++ b/interface/web/admin/lib/lang/tr_software_package_list.lng @@ -6,4 +6,5 @@ $wb['package_description_txt'] = 'Açıklama'; $wb['action_txt'] = 'Eylem'; $wb['toolsarea_head_txt'] = 'Packages'; $wb['repoupdate_txt'] = 'Update package list'; +$wb['package_id_txt'] = 'local App-ID'; ?> diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php index 3013eb169d..97bf1bf402 100644 --- a/interface/web/admin/software_package_install.php +++ b/interface/web/admin/software_package_install.php @@ -89,10 +89,42 @@ if($install_server_id > 0 && $package_name != '' && ($package['package_installab 'database_password' => md5(mt_rand()), 'database_host' => 'localhost'); $package_config_str = $app->ini_parser->get_ini_string($package_config_array); + $package['package_config'] = $package_config_str; $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id',$package['package_id']); } } + //* If the packages requires a remote user + if($package['package_remote_functions'] != '') { + + if(trim($package['package_config']) != '') { + $package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config'])); + } + + if(!isset($package_config_array['remote_api'])) { + $remote_user = 'ispapp'.$package['package_id']; + $remote_password = md5(mt_rand()); + $remote_functions = $app->db->quote($package['package_remote_functions']); + + $package_config_array['remote_api'] = array( + 'remote_hostname' => $_SERVER['HTTP_HOST'], + 'remote_user' => $remote_user, + 'remote_password' => $remote_password + ); + + $package_config_str = $app->ini_parser->get_ini_string($package_config_array); + $package['package_config'] = $package_config_str; + $app->db->datalogUpdate('software_package', "package_config = '".$app->db->quote($package_config_str)."'", 'package_id',$package['package_id']); + + $sql = "INSERT INTO `remote_user` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `remote_username`, `remote_password`, `remote_functions`) VALUES + (1, 1, 'riud', 'riud', '', '$remote_user', '$remote_password', '$remote_functions');"; + + $app->db->query($sql); + + } + + } + //* Add the record to start the install process $insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$install_server_id', '$software_update_id','installing')"; $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id'); diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php index 0a534e3496..72d1817f0e 100644 --- a/interface/web/admin/software_package_list.php +++ b/interface/web/admin/software_package_list.php @@ -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']); } diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index e8710bf17a..2c16c583da 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -21,6 +21,7 @@ + @@ -29,12 +30,13 @@ {tmpl_var name="installed"} {tmpl_var name="package_title"} {tmpl_var name="package_description"} + ispapp{tmpl_var name="package_id"} - + diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 5627ace31d..f4777ae539 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -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', diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index 1c5c5616f8..1ce70416ef 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -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', diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index b68f4697ed..fdf0028840 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 32dcab5737..6e03f7f785 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index de93d7e24d..35879716bc 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 6d93435ac8..d53452d391 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 4aa728a11c..9c5164328e 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 89ee52013b..9d5f1b7184 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 140611be94..a17f716a21 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 87be2b8c5d..f383b90b2e 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index e309a290af..aa8578048b 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index 62075573a7..66c1b8eba0 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index 9bcd6a8008..411818e340 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 326b4c3c94..b69ed03b79 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 7f3422827f..88d85f25e0 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index f0c93440a7..ec00932d13 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index f0cec4d5a7..52f0bdc240 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'Le nombre de clients doit être plus grand $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'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 1fb9a2452a..b8060b8ba1 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index a670843b10..a7b497bff6 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 56eebb3a63..81b5681785 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index a7a154aa92..62f31c066e 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'クライアント数は1以上で指定 $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'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index f81e2aab0e..8010aa0bff 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 9e67d2147b..c4089ae383 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'Het aantal klanten moet groter zijn dan 0. $wb['limit_web_quota_txt'] = 'Website schijfruimte'; $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'; ?> diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 89fb091daa..88315498de 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 1cebf80cde..1cb16721a9 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'Liczba klientów musi być > 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'; ?> diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index f252ee6514..008e679619 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 388ff1affb..5994e3d5f5 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -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'] = 'Traffic Quota must be a number.'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['vat_id_txt'] = 'VAT ID'; +$wb['required_fields_txt'] = '* Required fields'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 0d14e95eb2..0d7fa943ca 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index e23c46c6af..550cd1501f 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Квота трафика'; $wb['limit_trafficquota_error_notint'] = 'Квота трафика должна быть числом.'; $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'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 4ffdc62c19..e987c40f39 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'Число клиентов должно $wb['limit_web_quota_txt'] = 'Квота Web'; $wb['limit_traffic_quota_txt'] = 'Квота трафика'; $wb['limit_trafficquota_error_notint'] = 'Квота трафика должна быть числом.'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['vat_id_txt'] = 'VAT ID'; +$wb['required_fields_txt'] = '* Required fields'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 460344ab64..7820dd3665 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 3ed50609f1..318be86de2 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 5d2d672dbf..cfb8574fc3 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -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'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index cc083c7d29..48de829201 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; $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'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index f015ee5dd0..0f7f78a87f 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -95,4 +95,7 @@ $wb['limit_traffic_quota_txt'] = 'Trafik Kotası'; $wb['limit_trafficquota_error_notint'] = 'Trafik kotası sayı olmak zorunda.'; $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'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index ef644b1f72..8a6703cbe9 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -93,4 +93,7 @@ $wb['limit_client_error_positive'] = 'Müşteri sayısı sıfırdan büyük olma $wb['limit_web_quota_txt'] = 'Web Kotası'; $wb['limit_traffic_quota_txt'] = 'Trafik Kotası'; $wb['limit_trafficquota_error_notint'] = 'Trafik kotası sayı olmak zorunda.'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['vat_id_txt'] = 'VAT ID'; +$wb['required_fields_txt'] = '* Required fields'; ?> diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 6d2625028c..485d0f121f 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -8,13 +8,17 @@
-
+
- +
+
+ + +
- +
@@ -84,10 +88,15 @@
+
+ + +
+ {tmpl_var name='required_fields_txt'} diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm index 493a930224..08c79998f6 100644 --- a/interface/web/client/templates/reseller_edit_address.htm +++ b/interface/web/client/templates/reseller_edit_address.htm @@ -10,11 +10,15 @@
- +
+
+ + +
- +
@@ -84,10 +88,15 @@
+
+ + +
+ {tmpl_var name='required_fields_txt'} -- GitLab