From e122088a0eea47ea96719a7d28aae616b29d2bd7 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 25 Jan 2019 21:39:27 +0100 Subject: [PATCH 1/6] Add a friendly note when the wizzard is finished --- lib/lang/en_new_service.lng | 1 + new_service.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/lang/en_new_service.lng b/lib/lang/en_new_service.lng index d7ce19f..fe8d003 100644 --- a/lib/lang/en_new_service.lng +++ b/lib/lang/en_new_service.lng @@ -27,6 +27,7 @@ $wb['ns1_txt'] = 'NS 1'; $wb['ns2_txt'] = 'NS 2'; $wb['ip_txt'] = 'IP Address'; $wb['ipv6_txt'] = 'IPv6 Address'; +$wb['new_service_txt'] = 'Your new service is now being created. Please take note of these credentials, ISPconfig will not display them again.'; $wb['error_origin_empty'] = 'Origin empty.'; $wb['error_ns_empty'] = 'NS empty.'; $wb['error_mbox_empty'] = 'Mbox empty.'; diff --git a/new_service.php b/new_service.php index 701f850..8ac4b03 100644 --- a/new_service.php +++ b/new_service.php @@ -510,6 +510,7 @@ class page_action extends tform_actions {

New service

+

' . $app->tform->wordbook["new_service_txt"] . '

-- GitLab From 6dc24e8ee834fc8017427348cb024b2d64b74a17 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Wed, 27 Feb 2019 15:48:02 +0100 Subject: [PATCH 2/6] Add the server_name to the summary --- new_service.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/new_service.php b/new_service.php index 8ac4b03..b76c8c0 100644 --- a/new_service.php +++ b/new_service.php @@ -503,7 +503,9 @@ class page_action extends tform_actions { $remote->insert_query('../sites/form/shell_user.tform.php', $fields['client_id'], $ssh_params); } - + + $webserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['web_server_id']); + // results echo '
- + '; @@ -523,10 +525,12 @@ class page_action extends tform_actions { ' + + '; } if(isset($ftp_params)) { @@ -534,10 +538,12 @@ class page_action extends tform_actions { + + '; } if(isset($ssh_params)) { @@ -545,10 +551,12 @@ class page_action extends tform_actions { + + '; } if(isset($mailbox_passwords) and (bool)count($mailbox_passwords)) -- GitLab From 2f207d0b73325647fff9566d9efa2e9ca147fa9c Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Wed, 27 Feb 2019 15:55:39 +0100 Subject: [PATCH 3/6] Add extra result screenshot to README --- README.md | 2 ++ readme_images/result.png | Bin 0 -> 34089 bytes 2 files changed, 2 insertions(+) create mode 100644 readme_images/result.png diff --git a/README.md b/README.md index 48291f9..6f3e89f 100644 --- a/README.md +++ b/README.md @@ -34,3 +34,5 @@ Contributions are welcome, so please contribute your translations. Thank you. ![New service](https://git.ispconfig.org/ispconfig/module-wizard/raw/master/readme_images/new_service.png) ![Template](https://git.ispconfig.org/ispconfig/module-wizard/raw/master/readme_images/template.png) + +![Result](https//git.ispconfig.org/helmo/module-wizard/raw/master/readme_images/result.png) diff --git a/readme_images/result.png b/readme_images/result.png new file mode 100644 index 0000000000000000000000000000000000000000..4002e91e8daadfc891231d8bc98c1daf90798e9c GIT binary patch literal 34089 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 BM$`ZR literal 0 HcmV?d00001 -- GitLab From 2747172a88cc49a09bd034ac2376e9dc86701920 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Wed, 27 Feb 2019 16:12:17 +0100 Subject: [PATCH 4/6] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f3e89f..e5abe3e 100644 --- a/README.md +++ b/README.md @@ -35,4 +35,4 @@ Contributions are welcome, so please contribute your translations. Thank you. ![Template](https://git.ispconfig.org/ispconfig/module-wizard/raw/master/readme_images/template.png) -![Result](https//git.ispconfig.org/helmo/module-wizard/raw/master/readme_images/result.png) +![Result](https://git.ispconfig.org/helmo/module-wizard/raw/master/readme_images/result.png) -- GitLab From 3145908c90550e143a6a1745552fc32557428731 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 23 Aug 2020 21:42:06 +0200 Subject: [PATCH 5/6] Use phpmyadmin_url from global_config --- new_service.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/new_service.php b/new_service.php index b76c8c0..badc2e7 100644 --- a/new_service.php +++ b/new_service.php @@ -506,6 +506,10 @@ class page_action extends tform_actions { $webserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['web_server_id']); + $global_config = $app->getconf->get_global_config('sites'); + $phpmyadmin_url = $global_config['phpmyadmin_url']; + $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'), array($webserver['server_name'], $db_user_params['database_user']), $phpmyadmin_url); + // results echo ' - + '; } if(isset($ftp_params)) { -- GitLab From 09cc44d4ac593b989d249130651b2af2b4692960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristi=C3=A1n=20Feldsam?= Date: Sun, 23 Aug 2020 21:58:36 +0200 Subject: [PATCH 6/6] Update new_service.php --- new_service.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/new_service.php b/new_service.php index badc2e7..3385e1f 100644 --- a/new_service.php +++ b/new_service.php @@ -504,11 +504,11 @@ class page_action extends tform_actions { $remote->insert_query('../sites/form/shell_user.tform.php', $fields['client_id'], $ssh_params); } - $webserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['web_server_id']); + $dbserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['database_server_id']); $global_config = $app->getconf->get_global_config('sites'); $phpmyadmin_url = $global_config['phpmyadmin_url']; - $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'), array($webserver['server_name'], $db_user_params['database_user']), $phpmyadmin_url); + $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'), array($dbserver['server_name'], $db_user_params['database_user']), $phpmyadmin_url); // results echo ' -- GitLab
'.$fields['domain'].''.$fields['domain'].'
DB name/user DB passwordPhpMyAdmin
'.$db_user_params['database_user'].' '.$db_user_params['database_password'].'https://' . $webserver['server_name'] . '/phpmyadmin/
FTP user FTP passwordFTP Server
'.$ftp_params['username'].' '.$ftp_params['password'].''.$webserver['server_name'].'
SSH user SSH passwordSSH Server
'.$ssh_params['username'].' '.$ssh_params['password'].''.$webserver['server_name'].'
'.$db_user_params['database_user'].' '.$db_user_params['database_password'].'https://' . $webserver['server_name'] . '/phpmyadmin/'.$phpmyadmin_url.'