diff --git a/install/sql/incremental/upd_0003.sql b/install/sql/incremental/upd_0003.sql new file mode 100644 index 0000000000000000000000000000000000000000..bf058aae9edcb714effd6f9198fd6e8934e1af28 --- /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 46c21baeb4bd9a504611e6798cbd405023157760..2825b1b77788b721eb0ff33021b2e2fe3502df95 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 87674c437e735163843e0e657a8d0fc84ee842b1..f7a60d721fee5d0bbabf8a077cba364206f22729 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 87674c437e735163843e0e657a8d0fc84ee842b1..f7a60d721fee5d0bbabf8a077cba364206f22729 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 38e61541d1ab8a12c9f2edcbde6b5437102e584f..35510d7ea3940b1efb907467e9b46ba080123baf 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 081cfca973c4cfd2d2521fe4699b0d0e1d4f6e7d..3936cdb497177e292d6adf8ff28c9631be85e30d 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 b8b353814315c1710b0848f5b267232436ffdd04..24ab07ad14f493faa343736e5c7ded89e484ef25 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 0faa1c8f846ec62ec26d84872eabb4bc962f3629..b07214eed66230ea94873882fdcd3e1e003bf439 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 87674c437e735163843e0e657a8d0fc84ee842b1..29ad555875a9cb2b4b3ae57fc287dd2a8b91741a 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 9cfad40b28ebe0e78595ee0a5c959fa5f9320199..b77a5d5a76fe70cce98af7a4d530a5c97b962df3 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 3e373ea447444506e80f97967749bc552bc4ce84..9714b4d7d977c9fdc2a87d3d834ba1d255687b95 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 898c053f1d1c69440d8353da1edcb55c96939c46..5bb0c2f0f6f1a6e67e1d7cae128b1b28c989e376 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 78c782c4cb14247b0bc27e854c61780ed6ddcc56..495fe72858f844213eb3f981330aba0a0f68bebd 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 87674c437e735163843e0e657a8d0fc84ee842b1..f7a60d721fee5d0bbabf8a077cba364206f22729 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 5bc9989a978714b579e554bb330ea4b5b8776558..a1f5b651837deabe80b059186b422c16b15175ca 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 3a7a0964780f77a6ca1f17d6e138fa3837cd89c6..326a15a65046608959b1d019a3d7eedeeb17ab7a 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 d58e67bd8ab3ba98f358e4dbb2b1b199c73293ea..82991fa09f343087909ebb799fb76264283facb1 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 d8f944a074024a419c053f9f10e6eca4437eafe7..b544e9eee11776446c384045c0d7ff85d0b27a04 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 3185a9adf4051bdb8ae0b06bed22673bfd790b8d..151cf8a3e5221c7828c41d8a3208d8a9ae5174f4 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 fdf4aeaaca4f5a5e71d76df227a44cca13d5226d..2a453ee18753f15a95a5c74ad484c5a81a0a2f1e 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 87674c437e735163843e0e657a8d0fc84ee842b1..f7a60d721fee5d0bbabf8a077cba364206f22729 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 45b13e6f6301276e56fc819553d1ed919904b0cc..6e200b78fcf7d21efca402f175e05bcf6a7bf217 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 7968b000fddc0b703bdeb64d4faf940401899a33..574dd1162989badc8499f5af31451a43673bf4da 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 7986035adf5c58597f6cac5d66ad388771d9ea62..5c8b756434ce27d67e479a96383bbee01bce4f1f 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 03a16262e7b12d946e5e35fd2a202a378e977eee..5caf6ef9366da39fdc1e0382ef0de8a78e2721e2 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 3013eb169d85570d5d024047efc498453b08e8f1..97bf1bf402cbb27882c166c6ab09071b60391f57 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 0a534e3496934bc2bbc56263e581100b2c685c19..72d1817f0e9b2b6517da2d255f855b455c8ecde3 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 e8710bf17ae9885c68f83ce90e75c423155b236a..2c16c583da6060e68ec74bb06717143627c40375 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -21,6 +21,7 @@