commit 16de74e22032c2da7ebb1cdfde38066f54158df0 from: mischa date: Sun Sep 04 14:31:50 2022 UTC Create_ -> Add_ commit - 71b5e665b02807b07ff223a1014432f503ace7c4 commit + 16de74e22032c2da7ebb1cdfde38066f54158df0 blob - 6cd3c924c8c9115e37db5c52c24c0daf19ee9cac blob + 49c73dac4f362120e7d47f803c36defcb3299192 --- add-alias.php +++ add-alias.php @@ -49,11 +49,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $goto = filter_var($goto, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['aliases'] != 0 && $list_domains[$domain_key]['alias_count'] >= $list_domains[$domain_key]['aliases']) { - $message = $LANG['Create_alias_address_text_error2']; + $message = $LANG['Add_alias_address_text_error2']; } if (empty($address) || empty($goto)) { - $message = $LANG['Create_alias_address_text_error1']; + $message = $LANG['Add_alias_address_text_error1']; } if ($domain_exist && empty($message)) { @@ -65,11 +65,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(3, $domain, PDO::PARAM_STR); $sth->execute(); logging($admin, $domain, $LANG['Logging_alias_add'], "$from -> $goto"); - $message = $LANG['Create_alias_result_succes'] . "
($from -> $goto)
"; + $message = $LANG['Add_alias_result_succes'] . "
($from -> $goto)
"; $address = ''; $goto = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from -> $goto)
"; + $message = $LANG['Add_alias_result_error'] . "
($from -> $goto)
"; } } } blob - febb098681cdbbd7aaf654218c2292f7d93ac4de blob + 7c33a7c5a634641cd662b9a8648202996dbb3590 --- add-mailbox.php +++ add-mailbox.php @@ -48,15 +48,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $from = filter_var($username . '@' . $domain, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['mailboxes'] != 0 && $list_domains[$domain_key]['mailbox_count'] >= $list_domains[$domain_key]['mailboxes']) { - $message = $LANG['Create_mailbox_username_text_error3']; + $message = $LANG['Add_mailbox_username_text_error3']; } if (empty($username)) { - $message = $LANG['Create_mailbox_username_text_error1']; + $message = $LANG['Add_mailbox_username_text_error1']; } if (empty($password1) or ($password1 != $password2)) { - $message = $LANG['Create_mailbox_password_text_error']; + $message = $LANG['Add_mailbox_password_text_error']; } if ($domain_exist && empty($message)) { @@ -71,7 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->execute(); $username = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Add_alias_result_error'] . "
($from) - $e
"; } try { @@ -84,11 +84,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(5, $domain, PDO::PARAM_STR); $sth->execute(); logging($admin, $domain, $LANG['Logging_mailbox_add'], "$from"); - $message = $LANG['Create_mailbox_result_succes'] . "
($from)"; + $message = $LANG['Add_mailbox_result_succes'] . "
($from)"; $username = ''; $name = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Add_alias_result_error'] . "
($from) - $e
"; } } } blob - b33ef41c1110d88a476ba8b2c7e64a7165f49ce1 blob + 42233f00a0478882793d302b903a491569e6d4a3 --- admin/add-alias.php +++ admin/add-alias.php @@ -48,11 +48,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $goto = filter_var($goto, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['aliases'] != 0 && $list_domains[$domain_key]['alias_count'] >= $list_domains[$domain_key]['aliases']) { - $message = $LANG['Create_alias_address_text_error2']; + $message = $LANG['Add_alias_address_text_error2']; } if (empty($address) || empty($goto)) { - $message = $LANG['Create_alias_address_text_error1']; + $message = $LANG['Add_alias_address_text_error1']; } if ($domain_exist && empty($message)) { @@ -64,11 +64,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(3, $domain, PDO::PARAM_STR); $sth->execute(); logging($admin, $domain, $LANG['Logging_alias_add'], "$from -> $goto"); - $message = $LANG['Create_alias_result_succes'] . "
($from -> $goto)
"; + $message = $LANG['Add_alias_result_succes'] . "
($from -> $goto)
"; $address = ''; $goto = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from -> $goto)
"; + $message = $LANG['Add_alias_result_error'] . "
($from -> $goto)
"; } } } blob - a32fcc2cb11a24f3d70be6b031775aa692312bc7 blob + 88ab3d219ee7ccb440431d099e887b57637c25c5 --- admin/add-mailbox.php +++ admin/add-mailbox.php @@ -47,15 +47,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $from = filter_var($username . '@' . $domain, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['mailboxes'] != 0 && $list_domains[$domain_key]['mailbox_count'] >= $list_domains[$domain_key]['mailboxes']) { - $message = $LANG['Create_mailbox_username_text_error3']; + $message = $LANG['Add_mailbox_username_text_error3']; } if (empty($username)) { - $message = $LANG['Create_mailbox_username_text_error1']; + $message = $LANG['Add_mailbox_username_text_error1']; } if (empty($password1) or ($password1 != $password2)) { - $message = $LANG['Create_mailbox_password_text_error']; + $message = $LANG['Add_mailbox_password_text_error']; } if ($domain_exist && empty($message)) { @@ -70,7 +70,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->execute(); $username = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Add_alias_result_error'] . "
($from) - $e
"; } try { @@ -83,11 +83,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(5, $domain, PDO::PARAM_STR); $sth->execute(); logging($admin, $domain, $LANG['Logging_mailbox_add'], "$from"); - $message = $LANG['Create_mailbox_result_succes'] . "
($from)"; + $message = $LANG['Add_mailbox_result_succes'] . "
($from)"; $username = ''; $name = ''; } catch(PDOException $e) { - $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Add_alias_result_error'] . "
($from) - $e
"; } } } blob - 6f4df5ebe9e8fe2ee736c0061a87ad9bd4bbd6af blob + 24f6678cc54413086a89b50229da50af037cf40c --- languages/en.lang +++ languages/en.lang @@ -62,16 +62,16 @@ $LANG['Overview_get_modified'] = 'Last Modified'; $LANG['Delete_delete_error'] = 'Unable to delete the entry '; $LANG['Delete_domain_error'] = 'This domain is not yours '; -$LANG['Create_alias_welcome'] = 'Create a new alias for your domain.'; -$LANG['Create_alias_address'] = 'Alias'; -$LANG['Create_alias_address_text_error1'] = 'The ALIAS or TO is not valid.'; -$LANG['Create_alias_address_text_error2'] = 'You have reached your limit to create aliases.'; -$LANG['Create_alias_goto'] = 'To'; -$LANG['Create_alias_button'] = 'Add Alias'; -$LANG['Create_alias_goto_text'] = 'Where the mail needs to be send to.'; -$LANG['Create_alias_result_error'] = 'This email address already exists, unable to add to the alias table.'; -$LANG['Create_alias_result_succes'] = 'The alias has been added to the alias table.'; -$LANG['Create_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.
For domain to domain forwarding use "*@domain.tld" as to.'; +$LANG['Add_alias_welcome'] = 'Create a new alias for your domain.'; +$LANG['Add_alias_address'] = 'Alias'; +$LANG['Add_alias_address_text_error1'] = 'The ALIAS or TO is not valid.'; +$LANG['Add_alias_address_text_error2'] = 'You have reached your limit to create aliases.'; +$LANG['Add_alias_goto'] = 'To'; +$LANG['Add_alias_button'] = 'Add Alias'; +$LANG['Add_alias_goto_text'] = 'Where the mail needs to be send to.'; +$LANG['Add_alias_result_error'] = 'This email address already exists, unable to add to the alias table.'; +$LANG['Add_alias_result_succes'] = 'The alias has been added to the alias table.'; +$LANG['Add_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.
For domain to domain forwarding use "*@domain.tld" as to.'; $LANG['Edit_alias_welcome'] = 'Edit an alias for your domain.
One entry per line.'; $LANG['Edit_alias_address'] = 'Alias'; @@ -83,21 +83,21 @@ $LANG['Edit_alias_domain_error'] = 'Unable to modify the alias.'; -$LANG['Create_mailbox_welcome'] = 'Create a new mailbox for your domain.'; -$LANG['Create_mailbox_username'] = 'Username'; -$LANG['Create_mailbox_username_text_error1'] = 'The USERNAME is not valid.'; -$LANG['Create_mailbox_username_text_error2'] = 'This email address already exists, please choose a different one.'; -$LANG['Create_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes.'; -$LANG['Create_mailbox_password'] = 'Password'; -$LANG['Create_mailbox_password2'] = 'Password (again)'; -$LANG['Create_mailbox_password_text'] = 'Password for POP3/IMAP'; -$LANG['Create_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; -$LANG['Create_mailbox_name'] = 'Name'; -$LANG['Create_mailbox_name_text'] = 'Full name'; -$LANG['Create_mailbox_mail'] = 'Create mailbox'; -$LANG['Create_mailbox_button'] = 'Add Mailbox'; -$LANG['Create_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table.'; -$LANG['Create_mailbox_result_succes'] = 'The mailbox has been added to the mailbox table.'; +$LANG['Add_mailbox_welcome'] = 'Create a new mailbox for your domain.'; +$LANG['Add_mailbox_username'] = 'Username'; +$LANG['Add_mailbox_username_text_error1'] = 'The USERNAME is not valid.'; +$LANG['Add_mailbox_username_text_error2'] = 'This email address already exists, please choose a different one.'; +$LANG['Add_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes.'; +$LANG['Add_mailbox_password'] = 'Password'; +$LANG['Add_mailbox_password2'] = 'Password (again)'; +$LANG['Add_mailbox_password_text'] = 'Password for POP3/IMAP'; +$LANG['Add_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; +$LANG['Add_mailbox_name'] = 'Name'; +$LANG['Add_mailbox_name_text'] = 'Full name'; +$LANG['Add_mailbox_mail'] = 'Create mailbox'; +$LANG['Add_mailbox_button'] = 'Add Mailbox'; +$LANG['Add_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table.'; +$LANG['Add_mailbox_result_succes'] = 'The mailbox has been added to the mailbox table.'; $LANG['Edit_mailbox_welcome'] = 'Edit a mailbox for your domain.'; $LANG['Edit_mailbox_username'] = 'Username'; blob - bca4f981557c09f14cfe121fb4b23dbf11e739e9 blob + 1f4cdcf033783374b6646bf32a151a76fe3cd663 --- templates/add-alias.tpl +++ templates/add-alias.tpl @@ -2,10 +2,10 @@
- + - + - + - + - + blob - 96286bf393c82b0e7e6040d28495156a6323e34a blob + 26f3cce983e8e0253c22ba89fa4cdd4a2f620f57 --- templates/add-mailbox.tpl +++ templates/add-mailbox.tpl @@ -2,10 +2,10 @@

- + - + - + - + - + - + - + - +