diff --git a/README.md b/README.md index 48291f98324c39f9acb42e12d8c307a18ef2145a..e5abe3eac3363a9a048b298e084bfc1fa509cddb 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/lib/lang/en_new_service.lng b/lib/lang/en_new_service.lng index d7ce19fa9bc6962585bbb738fa1ab830cc884488..fe8d0033451b2e71676a9f16c741e61bb6020586 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 701f850506b0025e74bbfa7b36fd62d22d769f9c..3385e1ff7bd9929122e50a0a27ba95899109548d 100644 --- a/new_service.php +++ b/new_service.php @@ -503,17 +503,24 @@ class page_action extends tform_actions { $remote->insert_query('../sites/form/shell_user.tform.php', $fields['client_id'], $ssh_params); } - + + $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($dbserver['server_name'], $db_user_params['database_user']), $phpmyadmin_url); + // results echo '
+

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

- + '; @@ -522,10 +529,12 @@ class page_action extends tform_actions { ' + + '; } if(isset($ftp_params)) { @@ -533,10 +542,12 @@ class page_action extends tform_actions { + + '; } if(isset($ssh_params)) { @@ -544,10 +555,12 @@ class page_action extends tform_actions { + + '; } if(isset($mailbox_passwords) and (bool)count($mailbox_passwords)) diff --git a/readme_images/result.png b/readme_images/result.png new file mode 100644 index 0000000000000000000000000000000000000000..4002e91e8daadfc891231d8bc98c1daf90798e9c Binary files /dev/null and b/readme_images/result.png differ
'.$fields['domain'].''.$fields['domain'].'
DB name/user DB passwordPhpMyAdmin
'.$db_user_params['database_user'].' '.$db_user_params['database_password'].''.$phpmyadmin_url.'
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'].'