From 577680b10defe852d5e8b9ab3b5d85d6410f4053 Mon Sep 17 00:00:00 2001 From: mischa Date: Sat, 3 Sep 2022 09:30:40 +0000 Subject: [PATCH] PALANG -> LANG, pVar -> Var --- admin/add-alias.php | 8 +- admin/add-mailbox.php | 12 +- admin/admin.php | 20 +- admin/delete.php | 8 +- admin/domain.php | 8 +- admin/edit-alias.php | 10 +- admin/edit-mailbox.php | 12 +- create-alias.php | 18 +- create-mailbox.php | 36 +-- delete.php | 6 +- edit-active.php | 4 +- edit-alias.php | 12 +- edit-mailbox.php | 14 +- functions.inc.php | 1 - languages/en.lang | 462 +++++++++++++++---------------- login.php | 6 +- password.php | 12 +- sendmail.php | 6 +- templates/add-alias.tpl | 10 +- templates/add-mailbox.tpl | 16 +- templates/admin_admin.tpl | 14 +- templates/admin_domain.tpl | 18 +- templates/admin_list-admin.tpl | 10 +- templates/admin_list-domain.tpl | 16 +- templates/admin_list-virtual.tpl | 38 +-- templates/admin_menu.tpl | 18 +- templates/admin_search.tpl | 26 +- templates/create-alias.tpl | 10 +- templates/create-mailbox.tpl | 18 +- templates/edit-alias.tpl | 8 +- templates/edit-mailbox.tpl | 16 +- templates/header.tpl | 2 +- templates/list-domains.tpl | 16 +- templates/list-virtuals.tpl | 56 ++-- templates/login.tpl | 10 +- templates/main.tpl | 28 +- templates/menu.tpl | 14 +- templates/overview-get.tpl | 24 +- templates/overview.tpl | 58 ++-- templates/password.tpl | 12 +- templates/search.tpl | 30 +- templates/sendmail.tpl | 14 +- templates/users_edit-alias.tpl | 8 +- templates/users_login.tpl | 8 +- templates/users_main.tpl | 16 +- templates/users_menu.tpl | 8 +- templates/users_password.tpl | 12 +- templates/users_vacation-get.tpl | 2 +- templates/users_vacation.tpl | 12 +- templates/viewlog.tpl | 14 +- users/edit-alias.php | 8 +- users/login.php | 6 +- users/password.php | 12 +- users/vacation.php | 8 +- viewlog.php | 4 +- 55 files changed, 627 insertions(+), 628 deletions(-) diff --git a/admin/add-alias.php b/admin/add-alias.php index bc082f0..6c742c6 100644 --- a/admin/add-alias.php +++ b/admin/add-alias.php @@ -41,11 +41,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $goto = filter_var($goto, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['alias_count'] < 0 || $list_domains[$domain_key]['alias_count'] >= $list_domains[$domain_key]['aliases']) { - $message = $PALANG['pCreate_alias_address_text_error2']; + $message = $LANG['Create_alias_address_text_error2']; } if (empty($address) || empty($goto)) { - $message = $PALANG['pCreate_alias_address_text_error1']; + $message = $LANG['Create_alias_address_text_error1']; } if (empty($message)) { @@ -57,11 +57,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(3, $domain, PDO::PARAM_STR); $sth->execute(); logging(ADMIN_EMAIL, $domain, "create alias", "$from -> $goto"); - $message = $PALANG['pCreate_alias_result_succes'] . "
($from -> $goto)
"; + $message = $LANG['Create_alias_result_succes'] . "
($from -> $goto)
"; $address = ''; $goto = ''; } catch(PDOException $e) { - $message = $PALANG['pCreate_alias_result_error'] . "
($from -> $goto) - $e
"; + $message = $LANG['Create_alias_result_error'] . "
($from -> $goto) - $e
"; } } } diff --git a/admin/add-mailbox.php b/admin/add-mailbox.php index 96b35f9..76e84c0 100644 --- a/admin/add-mailbox.php +++ b/admin/add-mailbox.php @@ -42,15 +42,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $from = filter_var($username . '@' . $domain, FILTER_VALIDATE_EMAIL); if ($list_domains[$domain_key]['mailbox_count'] < 0 || $list_domains[$domain_key]['mailbox_count'] >= $list_domains[$domain_key]['mailboxes']) { - $message = $PALANG['pCreate_mailbox_username_text_error3']; + $message = $LANG['Create_mailbox_username_text_error3']; } if (empty($username)) { - $message = $PALANG['pCreate_mailbox_username_text_error1']; + $message = $LANG['Create_mailbox_username_text_error1']; } if (empty($password1) or ($password1 != $password2)) { - $message = $PALANG['pCreate_mailbox_password_text_error']; + $message = $LANG['Create_mailbox_password_text_error']; } if (empty($message)) { @@ -65,7 +65,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->execute(); $username = ''; } catch(PDOException $e) { - $message = $PALANG['pCreate_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; } try { @@ -78,11 +78,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(5, $domain, PDO::PARAM_STR); $sth->execute(); logging(ADMIN_EMAIL, $domain, "create mailbox", "$from"); - $message = $PALANG['pCreate_mailbox_result_succes'] . "
($from)"; + $message = $LANG['Create_mailbox_result_succes'] . "
($from)"; $username = ''; $name = ''; } catch(PDOException $e) { - $message = $PALANG['pCreate_alias_result_error'] . "
($from) - $e
"; + $message = $LANG['Create_alias_result_error'] . "
($from) - $e
"; } } } diff --git a/admin/admin.php b/admin/admin.php index f146bdd..60bf51f 100644 --- a/admin/admin.php +++ b/admin/admin.php @@ -48,15 +48,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if ($action == 'add') { if (empty($username) || in_array($username, array_column($list_admins, 'username'))) { - $message = $PALANG['pAdminAdd_admin_username_error']; + $message = $LANG['AdminAdd_admin_username_error']; } if (empty($password1) || $password1 != $password2) { - $message = $PALANG['pAdminAdd_admin_password_error']; + $message = $LANG['AdminAdd_admin_password_error']; } if (empty($domains['domains'])) { - $message = $PALANG['pAdminAdd_admin_domain_error']; + $message = $LANG['AdminAdd_admin_domain_error']; } if (empty($message)) { @@ -73,16 +73,16 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(2, $row, PDO::PARAM_STR); $sth->execute(); } - $message = $PALANG['pAdminAdd_admin_result_succes'] . "
($username)
"; + $message = $LANG['AdminAdd_admin_result_succes'] . "
($username)
"; } catch(PDOException $e) { - $message = $PALANG['pAdminAdd_admin_result_error'] . "
($username)
"; + $message = $LANG['AdminAdd_admin_result_error'] . "
($username)
"; } } } if (in_array($username, array_column($list_admins, 'username')) && $action == 'edit') { if ($password1 != $password2) { - $message = $PALANG['pAdminAdd_admin_password_error']; + $message = $LANG['AdminAdd_admin_password_error']; } if (empty($message)) { try { @@ -93,12 +93,12 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(2, $username, PDO::PARAM_STR); $sth->execute(); } catch(PDOException $e) { - $message = $PALANG['pAdminEdit_admin_result_error'] . "
($username)
"; + $message = $LANG['AdminEdit_admin_result_error'] . "
($username)
"; } } if (empty($domains['domains'])) { - $message = $PALANG['pAdminAdd_admin_domain_error']; + $message = $LANG['AdminAdd_admin_domain_error']; } if (empty($message)) { try { @@ -121,9 +121,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { } header("Location: list-admin.php"); } catch (RuntimeException $e) { - $message = $PALANG['pAdminEdit_admin_result_error']; + $message = $LANG['AdminEdit_admin_result_error']; } catch (PDOException $e) { - $message = $PALANG['pAdminEdit_admin_result_error']; + $message = $LANG['AdminEdit_admin_result_error']; } } } diff --git a/admin/delete.php b/admin/delete.php index 6168a4c..85dc92c 100644 --- a/admin/delete.php +++ b/admin/delete.php @@ -153,9 +153,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { header("Location: list-virtual.php?domain=$domain"); } catch (RuntimeException $e) { - $message = $PALANG['pDelete_delete_error'] . "$delete (" . $e->getMessage() . ")!"; + $message = $LANG['Delete_delete_error'] . "$delete (" . $e->getMessage() . ")!"; } catch (PDOException $e) { - $message = $PALANG['pDelete_delete_error'] . "$delete (alias)! " . $e-getMessage(); + $message = $LANG['Delete_delete_error'] . "$delete (alias)! " . $e-getMessage(); } try { @@ -176,9 +176,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { header("Location: list-virtual.php?domain=$domain"); } catch (RuntimeException $e) { - $message = $PALANG['pDelete_delete_error'] . "$delete (" . $e->getMessage() . ")!"; + $message = $LANG['Delete_delete_error'] . "$delete (" . $e->getMessage() . ")!"; } catch (PDOException $e) { - $message = $PALANG['pDelete_delete_error'] . "$delete (mailbox)!"; + $message = $LANG['Delete_delete_error'] . "$delete (mailbox)!"; } } } diff --git a/admin/domain.php b/admin/domain.php index cbc691e..74f9fca 100644 --- a/admin/domain.php +++ b/admin/domain.php @@ -57,12 +57,12 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->bindParam(3, $aliases, PDO::PARAM_INT); $sth->bindParam(4, $mailboxes, PDO::PARAM_INT); $sth->execute(); - $message = $PALANG['pAdminAdd_domain_result_succes'] . "
($domain)
"; + $message = $LANG['AdminAdd_domain_result_succes'] . "
($domain)
"; } catch(PDOException $e) { - $message = $PALANG['pAdminAdd_domain_result_error'] . "
($domain)
"; + $message = $LANG['AdminAdd_domain_result_error'] . "
($domain)
"; } } else { - $message = $PALANG['pAdminAdd_domain_domain_text_error']; + $message = $LANG['AdminAdd_domain_domain_text_error']; } if (in_array($domain, array_column($list_domains, 'domain')) && $action == 'edit') { @@ -76,7 +76,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $sth->execute(); header("Location: list-domain.php"); } catch(PDOException $e) { - $message = $PALANG['pAdminEdit_domain_result_error']; + $message = $LANG['AdminEdit_domain_result_error']; } } } diff --git a/admin/edit-alias.php b/admin/edit-alias.php index 672391e..c7544c3 100644 --- a/admin/edit-alias.php +++ b/admin/edit-alias.php @@ -32,12 +32,12 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $row = db_array($result['result']); $tGoto = $row['goto']; } else { - $tMessage = $PALANG['pEdit_alias_address_error']; + $tMessage = $LANG['Edit_alias_address_error']; } } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pEdit_alias_goto = $PALANG['pEdit_alias_goto']; + $pEdit_alias_goto = $LANG['Edit_alias_goto']; $fAddress = escape_string($_GET['address']); $fAddress = strtolower($fAddress); @@ -48,7 +48,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if (empty($fGoto)) { $error = 1; $tGoto = $fGoto; - $tMessage = $PALANG['pEdit_alias_goto_text_error1']; + $tMessage = $LANG['Edit_alias_goto_text_error1']; } $goto = preg_replace('/\\\r\\\n/', ',', $fGoto); @@ -64,14 +64,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { { $error = 1; $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]"; + $tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]"; } } if ($error != 1) { $result = db_query("UPDATE alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'"); if ($result['rows'] != 1) { - $tMessage = $PALANG['pEdit_alias_result_error']; + $tMessage = $LANG['Edit_alias_result_error']; } else { db_log($CONF['admin_email'], $fDomain, "edit alias", "$fAddress -> $goto"); diff --git a/admin/edit-mailbox.php b/admin/edit-mailbox.php index 0c633c5..2727832 100644 --- a/admin/edit-mailbox.php +++ b/admin/edit-mailbox.php @@ -39,13 +39,13 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $tQuota = $row['quota'] / $CONF['quota_multiplier']; $tActive = $row['active']; } else { - $tMessage = $PALANG['pEdit_mailbox_login_error']; + $tMessage = $LANG['Edit_mailbox_login_error']; } } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error']; - $pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text']; + $pEdit_mailbox_password_text = $LANG['Edit_mailbox_password_text_error']; + $pEdit_mailbox_quota_text = $LANG['Edit_mailbox_quota_text']; $fUsername = escape_string($_GET['username']); $fUsername = strtolower($fUsername); @@ -63,7 +63,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tActive = $fActive; - $pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error']; + $pEdit_mailbox_password_text = $LANG['Edit_mailbox_password_text_error']; } if ($CONF['quota'] == "YES") { @@ -72,7 +72,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tActive = $fActive; - $pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text_error']; + $pEdit_mailbox_quota_text = $LANG['Edit_mailbox_quota_text_error']; } } @@ -97,7 +97,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { } if ($result['rows'] != 1) { - $tMessage = $PALANG['pEdit_mailbox_result_error']; + $tMessage = $LANG['Edit_mailbox_result_error']; } else { db_log($CONF['admin_email'], $fDomain, "edit mailbox", $fUsername); header("Location: list-virtual.php?domain=$fDomain"); diff --git a/create-alias.php b/create-alias.php index 0dd2b61..7a1895d 100644 --- a/create-alias.php +++ b/create-alias.php @@ -31,13 +31,13 @@ $SESSID_USERNAME = check_session(); $list_domains = list_domains_for_admin($SESSID_USERNAME); if ($_SERVER['REQUEST_METHOD'] == "GET") { - $pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text']; + $pCreate_alias_goto_text = $LANG['Create_alias_goto_text']; if (isset($_GET['domain'])) $tDomain = escape_string($_GET['domain']); } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text']; + $pCreate_alias_goto_text = $LANG['Create_alias_goto_text']; $fAddress = escape_string($_POST['fAddress']) . "@" . escape_string($_POST['fDomain']); $fAddress = strtolower($fAddress); @@ -54,7 +54,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tAddress = escape_string($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1']; + $pCreate_alias_address_text = $LANG['Create_alias_address_text_error1']; } if (!check_alias($fDomain)) { @@ -62,7 +62,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tAddress = escape_string($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error3']; + $pCreate_alias_address_text = $LANG['Create_alias_address_text_error3']; } if (empty($fAddress) or !check_email($fAddress)) { @@ -70,7 +70,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tAddress = escape_string($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1']; + $pCreate_alias_address_text = $LANG['Create_alias_address_text_error1']; } if (empty($fGoto) or !check_email($fGoto)) { @@ -78,7 +78,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tAddress = escape_string($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text_error']; + $pCreate_alias_goto_text = $LANG['Create_alias_goto_text_error']; } if (escape_string($_POST['fAddress']) == "*") $fAddress = "@" . escape_string($_POST['fDomain']); @@ -89,7 +89,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tAddress = escape_string($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error2']; + $pCreate_alias_address_text = $LANG['Create_alias_address_text_error2']; } if ($error != 1) { @@ -98,12 +98,12 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("INSERT INTO alias (address,goto,domain,created,modified) VALUES ('$fAddress','$fGoto','$fDomain',NOW(),NOW())"); if ($result['rows'] != 1) { $tDomain = $fDomain; - $tMessage = $PALANG['pCreate_alias_result_error'] . "
($fAddress -> $fGoto)
\n"; + $tMessage = $LANG['Create_alias_result_error'] . "
($fAddress -> $fGoto)
\n"; } else { db_log($SESSID_USERNAME, $fDomain, "create alias", "$fAddress -> $fGoto"); $tDomain = $fDomain; - $tMessage = $PALANG['pCreate_alias_result_succes'] . "
($fAddress -> $fGoto)
\n"; + $tMessage = $LANG['Create_alias_result_succes'] . "
($fAddress -> $fGoto)
\n"; } } } diff --git a/create-mailbox.php b/create-mailbox.php index 29de1d6..3c3b829 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -39,17 +39,17 @@ $list_domains = list_domains_for_admin($SESSID_USERNAME); if ($_SERVER['REQUEST_METHOD'] == "GET") { $tQuota = $CONF['maxquota']; - $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text']; - $pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text']; - $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text']; + $pCreate_mailbox_password_text = $LANG['Create_mailbox_password_text']; + $pCreate_mailbox_name_text = $LANG['Create_mailbox_name_text']; + $pCreate_mailbox_quota_text = $LANG['Create_mailbox_quota_text']; if (isset($_GET['domain'])) $tDomain = escape_string($_GET['domain']); } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text']; - $pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text']; - $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text']; + $pCreate_mailbox_password_text = $LANG['Create_mailbox_password_text']; + $pCreate_mailbox_name_text = $LANG['Create_mailbox_name_text']; + $pCreate_mailbox_quota_text = $LANG['Create_mailbox_quota_text']; $fUsername = escape_string($_POST['fUsername']) . "@" . escape_string($_POST['fDomain']); $fUsername = strtolower($fUsername); @@ -67,7 +67,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; + $pCreate_mailbox_username_text = $LANG['Create_mailbox_username_text_error1']; } if (!check_mailbox($fDomain)) { @@ -76,7 +76,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3']; + $pCreate_mailbox_username_text = $LANG['Create_mailbox_username_text_error3']; } if (empty($fUsername) or !check_email($fUsername)) { @@ -85,7 +85,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; + $pCreate_mailbox_username_text = $LANG['Create_mailbox_username_text_error1']; } if (empty($fPassword) or ($fPassword != $fPassword2)) { @@ -97,7 +97,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error']; + $pCreate_mailbox_password_text = $LANG['Create_mailbox_password_text_error']; } } @@ -108,7 +108,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error']; + $pCreate_mailbox_quota_text = $LANG['Create_mailbox_quota_text_error']; } } @@ -119,7 +119,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2']; + $pCreate_mailbox_username_text = $LANG['Create_mailbox_username_text_error2']; } if ($error != 1) { @@ -150,18 +150,18 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("INSERT INTO alias (address,goto,domain,created,modified,active) VALUES ('$fUsername','vmail','$fDomain',NOW(),NOW(),'$fActive')"); if ($result['rows'] != 1) { $tDomain = $fDomain; - $tMessage = $PALANG['pAlias_result_error'] . "
($fUsername -> $fUsername)
"; + $tMessage = $LANG['Alias_result_error'] . "
($fUsername -> $fUsername)
"; } $result = db_query("INSERT INTO mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$fActive')"); if ($result['rows'] != 1) { $tDomain = $fDomain; - $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "
($fUsername)
"; + $tMessage .= $LANG['Create_mailbox_result_error'] . "
($fUsername)
"; } else { db_log($SESSID_USERNAME, $fDomain, "create mailbox", "$fUsername"); $tDomain = $fDomain; - $tMessage = $PALANG['pCreate_mailbox_result_succes'] . "
($fUsername"; + $tMessage = $LANG['Create_mailbox_result_succes'] . "
($fUsername"; if ($CONF['generate_password'] == "YES") { $tMessage .= " / $fPassword)
"; } else { @@ -172,15 +172,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if ($fMail == "on") { $fTo = $fUsername; - $fSubject = $PALANG['pSendmail_subject_text']; + $fSubject = $LANG['Sendmail_subject_text']; $fHeaders = "From: " . $SESSID_USERNAME . "\r\n"; $fHeaders .= "Content-Type: text/plain; charset=utf-8\r\n"; $fBody = $CONF['welcome_text']; if (!mail($fTo, $fSubject, $fBody, $fHeaders)) { - $tMessage .= "
" . $PALANG['pSendmail_result_error'] . "
"; + $tMessage .= "
" . $LANG['Sendmail_result_error'] . "
"; } else { - $tMessage .= "
" . $PALANG['pSendmail_result_succes'] . "
"; + $tMessage .= "
" . $LANG['Sendmail_result_succes'] . "
"; } } } diff --git a/delete.php b/delete.php index fc9be7c..f788e5a 100644 --- a/delete.php +++ b/delete.php @@ -33,13 +33,13 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { if (in_array($_GET['domain'], array_column($list_domains, 'domain'))) { #if (!check_owner($SESSID_USERNAME, $fDomain)) { $error = 1; - $tMessage = $PALANG['pDelete_domain_error'] . "$fDomain!"; + $tMessage = $LANG['Delete_domain_error'] . "$fDomain!"; } else { $result = db_query("DELETE FROM alias WHERE address='$fDelete' AND domain='$fDomain'"); if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pDelete_delete_error'] . "$fDelete (alias)!"; + $tMessage = $LANG['Delete_delete_error'] . "$fDelete (alias)!"; } else { db_log($SESSID_USERNAME, $fDomain, "delete alias", $fDelete); } @@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $result = db_query("DELETE FROM mailbox WHERE username='$fDelete' AND domain='$fDomain'"); if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pDelete_delete_error'] . "$fDelete (mailbox)!"; + $tMessage = $LANG['Delete_delete_error'] . "$fDelete (mailbox)!"; } else { db_query("DELETE FROM vacation WHERE email='$fDelete' AND domain='$fDomain'"); db_log($SESSID_USERNAME, $fDomain, "delete mailbox", $fDelete); diff --git a/edit-active.php b/edit-active.php index 1eba32a..2e9487f 100644 --- a/edit-active.php +++ b/edit-active.php @@ -31,12 +31,12 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { if (!check_owner($SESSID_USERNAME, $fDomain)) { $error = 1; - $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "$fDomain!"; + $tMessage = $LANG['Edit_mailbox_domain_error'] . "$fDomain!"; } else { $result = db_query("UPDATE mailbox SET active=1-active WHERE username='$fUsername' AND domain='$fDomain'"); if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pEdit_mailbox_result_error']; + $tMessage = $LANG['Edit_mailbox_result_error']; } else { db_log($SESSID_USERNAME, $fDomain, "edit active", $fUsername); } diff --git a/edit-alias.php b/edit-alias.php index 0c129c7..fc36f8c 100644 --- a/edit-alias.php +++ b/edit-alias.php @@ -38,12 +38,12 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $tGoto = $row['goto']; } } else { - $tMessage = $PALANG['pEdit_alias_address_error']; + $tMessage = $LANG['Edit_alias_address_error']; } } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pEdit_alias_goto = $PALANG['pEdit_alias_goto']; + $pEdit_alias_goto = $LANG['Edit_alias_goto']; $fAddress = escape_string($_GET['address']); $fAddress = strtolower($fAddress); @@ -54,13 +54,13 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if (!check_owner($SESSID_USERNAME, $fDomain)) { $error = 1; $tGoto = $fGoto; - $tMessage = $PALANG['pEdit_alias_domain_error'] . "$fDomain"; + $tMessage = $LANG['Edit_alias_domain_error'] . "$fDomain"; } if (empty($fGoto)) { $error = 1; $tGoto = $fGoto; - $tMessage = $PALANG['pEdit_alias_goto_text_error1']; + $tMessage = $LANG['Edit_alias_goto_text_error1']; } $goto = preg_replace('/\\\r\\\n/', ',', $fGoto); @@ -78,14 +78,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { { $error = 1; $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]"; + $tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]"; } } if ($error != 1) { $result = db_query("UPDATE alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'"); if ($result['rows'] != 1) { - $tMessage = $PALANG['pEdit_alias_result_error']; + $tMessage = $LANG['Edit_alias_result_error']; } else { db_log($SESSID_USERNAME, $fDomain, "edit alias", "$fAddress -> $goto"); diff --git a/edit-mailbox.php b/edit-mailbox.php index 11eb4b0..6a6f138 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -45,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $tActive = $row['active']; } } else { - $tMessage = $PALANG['pEdit_mailbox_login_error']; + $tMessage = $LANG['Edit_mailbox_login_error']; } include("./templates/header.tpl"); @@ -55,8 +55,8 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error']; - $pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text']; + $pEdit_mailbox_password_text = $LANG['Edit_mailbox_password_text_error']; + $pEdit_mailbox_quota_text = $LANG['Edit_mailbox_quota_text']; $fUsername = escape_string($_GET['username']); $fUsername = strtolower($fUsername); @@ -73,7 +73,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tActive = $fActive; - $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "$fDomain"; + $tMessage = $LANG['Edit_mailbox_domain_error'] . "$fDomain"; } if ($fPassword != $fPassword2) { @@ -81,7 +81,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tActive = $fActive; - $pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error']; + $pEdit_mailbox_password_text = $LANG['Edit_mailbox_password_text_error']; } if ($CONF['quota'] == "YES") { @@ -90,7 +90,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tName = $fName; $tQuota = $fQuota; $tActive = $fActive; - $pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text_error']; + $pEdit_mailbox_quota_text = $LANG['Edit_mailbox_quota_text_error']; } } @@ -115,7 +115,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { } if ($result['rows'] != 1) { - $tMessage = $PALANG['pEdit_mailbox_result_error']; + $tMessage = $LANG['Edit_mailbox_result_error']; } else { db_log($SESSID_USERNAME, $fDomain, "edit mailbox", $fUsername); diff --git a/functions.inc.php b/functions.inc.php index a349b60..27076b6 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -16,7 +16,6 @@ DEFINE("VERSION", "version 1.0.0"); DEFINE('ROOT_PATH', dirname(__FILE__) . '/'); require_once ROOT_PATH . 'conf.php'; require_once ROOT_PATH . 'config.inc.php'; -require_once ROOT_PATH . 'variables.inc.php'; // // Check of debug is enabled or not diff --git a/languages/en.lang b/languages/en.lang index 9577580..2fed86b 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -3,267 +3,267 @@ // Language file English // by Mischa // -$PALANG['YES'] = 'YES'; -$PALANG['NO'] = 'NO'; -$PALANG['edit'] = 'edit'; -$PALANG['del'] = 'del'; -$PALANG['confirm'] = 'Are you sure you want to delete this?'; -$PALANG['confirm_domain'] = 'Do you really want to delete all records for this domain? This can not be undone!'; -$PALANG['check_update'] = 'Check for update'; +$LANG['YES'] = 'YES'; +$LANG['NO'] = 'NO'; +$LANG['edit'] = 'edit'; +$LANG['del'] = 'del'; +$LANG['confirm'] = 'Are you sure you want to delete this?\n'; +$LANG['confirm_domain'] = 'Do you really want to delete all records for this domain?\nThis can not be undone! '; +$LANG['check_update'] = 'Check for update'; -$PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.'; -$PALANG['pLogin_username'] = 'Login (email)'; -$PALANG['pLogin_password'] = 'Password'; -$PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address.'; -$PALANG['pLogin_password_incorrect'] = 'Your password is not correct.'; -$PALANG['pLogin_login_users'] = 'Users click here to login to the user section.'; +$LANG['Login_welcome'] = 'Mail admins login here to administer your domain.'; +$LANG['Login_username'] = 'Login (email)'; +$LANG['Login_password'] = 'Password'; +$LANG['Login_button'] = 'Login'; +$LANG['Login_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address.'; +$LANG['Login_password_incorrect'] = 'Your password is not correct.'; +$LANG['Login_login_users'] = 'Users click here to login to the user section.'; -$PALANG['pMenu_overview'] = 'Overview'; -$PALANG['pMenu_create_alias'] = 'Add Alias'; -$PALANG['pMenu_create_mailbox'] = 'Add Mailbox'; -$PALANG['pMenu_sendmail'] = 'Send Email'; -$PALANG['pMenu_password'] = 'Password'; -$PALANG['pMenu_viewlog'] = 'View Log'; -$PALANG['pMenu_logout'] = 'Logout'; +$LANG['Menu_overview'] = 'Overview'; +$LANG['Menu_create_alias'] = 'Add Alias'; +$LANG['Menu_create_mailbox'] = 'Add Mailbox'; +$LANG['Menu_sendmail'] = 'Send Email'; +$LANG['Menu_password'] = 'Password'; +$LANG['Menu_viewlog'] = 'View Log'; +$LANG['Menu_logout'] = 'Logout'; -$PALANG['pMain_welcome'] = 'Welcome to OpenSMTPD Admin!'; -$PALANG['pMain_overview'] = 'List your aliases and mailboxes. You can edit / delete them from here.'; -$PALANG['pMain_create_alias'] = 'Create a new alias for your domain.'; -$PALANG['pMain_create_mailbox'] = 'Create a new mailbox for your domain.'; -$PALANG['pMain_sendmail'] = 'Send an email to one of your newly created mailboxes.'; -$PALANG['pMain_password'] = 'Change the password for your admin account.'; -$PALANG['pMain_viewlog'] = 'View the log files.'; -$PALANG['pMain_logout'] = 'Logout from the system'; +$LANG['Main_welcome'] = 'Welcome to OpenSMTPD Admin!'; +$LANG['Main_overview'] = 'List your aliases and mailboxes. You can edit / delete them from here.'; +$LANG['Main_create_alias'] = 'Create a new alias for your domain.'; +$LANG['Main_create_mailbox'] = 'Create a new mailbox for your domain.'; +$LANG['Main_sendmail'] = 'Send an email to one of your newly created mailboxes.'; +$LANG['Main_password'] = 'Change the password for your admin account.'; +$LANG['Main_viewlog'] = 'View the log files.'; +$LANG['Main_logout'] = 'Logout from the system'; -$PALANG['pOverview_disabled'] = 'Disabled'; -$PALANG['pOverview_unlimited'] = 'Unlimited'; -$PALANG['pOverview_title'] = ':: Defined Domains'; -$PALANG['pOverview_up_arrow'] = 'Go Top'; -$PALANG['pOverview_right_arrow'] = 'Next Page'; -$PALANG['pOverview_left_arrow'] = 'Previus Page'; -$PALANG['pOverview_alias_title'] = ':: Alias'; -$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; -$PALANG['pOverview_button'] = 'Go'; -$PALANG['pOverview_welcome'] = 'Overview for '; -$PALANG['pOverview_alias_alias_count'] = 'Aliases'; -$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes'; -$PALANG['pOverview_alias_address'] = 'From'; -$PALANG['pOverview_alias_goto'] = 'To'; -$PALANG['pOverview_alias_modified'] = 'Last Modified'; -$PALANG['pOverview_mailbox_username'] = 'Email'; -$PALANG['pOverview_mailbox_name'] = 'Name'; -$PALANG['pOverview_mailbox_modified'] = 'Last Modified'; -$PALANG['pOverview_mailbox_active'] = 'Active'; +$LANG['Overview_disabled'] = 'Disabled'; +$LANG['Overview_unlimited'] = 'Unlimited'; +$LANG['Overview_title'] = ':: Defined Domains'; +$LANG['Overview_up_arrow'] = 'Go Top'; +$LANG['Overview_right_arrow'] = 'Next Page'; +$LANG['Overview_left_arrow'] = 'Previus Page'; +$LANG['Overview_alias_title'] = ':: Alias'; +$LANG['Overview_mailbox_title'] = ':: Mailboxes'; +$LANG['Overview_button'] = 'Go'; +$LANG['Overview_welcome'] = 'Overview for '; +$LANG['Overview_alias_alias_count'] = 'Aliases'; +$LANG['Overview_alias_mailbox_count'] = 'Mailboxes'; +$LANG['Overview_alias_address'] = 'From'; +$LANG['Overview_alias_goto'] = 'To'; +$LANG['Overview_alias_modified'] = 'Last Modified'; +$LANG['Overview_mailbox_username'] = 'Email'; +$LANG['Overview_mailbox_name'] = 'Name'; +$LANG['Overview_mailbox_modified'] = 'Last Modified'; +$LANG['Overview_mailbox_active'] = 'Active'; -$PALANG['pOverview_get_domain'] = 'Domain'; -$PALANG['pOverview_get_aliases'] = 'Aliases'; -$PALANG['pOverview_get_mailboxes'] = 'Mailboxes'; -$PALANG['pOverview_get_modified'] = 'Last Modified'; +$LANG['Overview_get_domain'] = 'Domain'; +$LANG['Overview_get_aliases'] = 'Aliases'; +$LANG['Overview_get_mailboxes'] = 'Mailboxes'; +$LANG['Overview_get_modified'] = 'Last Modified'; -$PALANG['pDelete_delete_error'] = 'Unable to delete the entry '; -$PALANG['pDelete_domain_error'] = 'This domain is not yours '; +$LANG['Delete_delete_error'] = 'Unable to delete the entry '; +$LANG['Delete_domain_error'] = 'This domain is not yours '; -$PALANG['pCreate_alias_welcome'] = 'Create a new alias for your domain.'; -$PALANG['pCreate_alias_address'] = 'Alias'; -$PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS or TO is not valid.'; -$PALANG['pCreate_alias_address_text_error2'] = 'You have reached your limit to create aliases.'; -$PALANG['pCreate_alias_goto'] = 'To'; -$PALANG['pCreate_alias_button'] = 'Add Alias'; -$PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be send to.'; -$PALANG['pCreate_alias_result_error'] = 'This email address already exists, unable to add to the alias table.'; -$PALANG['pCreate_alias_result_succes'] = 'The alias has been added to the alias table.'; -$PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.
For domain to domain forwarding use "*@domain.tld" as to.'; +$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.'; -$PALANG['pEdit_alias_welcome'] = 'Edit an alias for your domain.
One entry per line.'; -$PALANG['pEdit_alias_address'] = 'Alias'; -$PALANG['pEdit_alias_address_error'] = 'Unable to locate alias.'; -$PALANG['pEdit_alias_goto'] = 'To'; -$PALANG['pEdit_alias_goto_text_error1'] = 'You didn\'t enter anything at To'; -$PALANG['pEdit_alias_goto_text_error2'] = 'The email address that you have entered is not valid: '; -$PALANG['pEdit_alias_domain_error'] = 'This domain is not yours: '; -$PALANG['pEdit_alias_button'] = 'Edit Alias'; -$PALANG['pEdit_alias_result_error'] = 'Unable to modify the alias.'; +$LANG['Edit_alias_welcome'] = 'Edit an alias for your domain.
One entry per line.'; +$LANG['Edit_alias_address'] = 'Alias'; +$LANG['Edit_alias_address_error'] = 'Unable to locate alias.'; +$LANG['Edit_alias_goto'] = 'To'; +$LANG['Edit_alias_goto_text_error1'] = 'You didn\'t enter anything at To'; +$LANG['Edit_alias_goto_text_error2'] = 'The email address that you have entered is not valid: '; +$LANG['Edit_alias_domain_error'] = 'This domain is not yours: '; +$LANG['Edit_alias_button'] = 'Edit Alias'; +$LANG['Edit_alias_result_error'] = 'Unable to modify the alias.'; -$PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.'; -$PALANG['pCreate_mailbox_username'] = 'Username'; -$PALANG['pCreate_mailbox_username_text_error1'] = 'The USERNAME is not valid.'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'This email address already exists, please choose a different one.'; -$PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes.'; -$PALANG['pCreate_mailbox_password'] = 'Password'; -$PALANG['pCreate_mailbox_password2'] = 'Password (again)'; -$PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP'; -$PALANG['pCreate_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; -$PALANG['pCreate_mailbox_name'] = 'Name'; -$PALANG['pCreate_mailbox_name_text'] = 'Full name'; -$PALANG['pCreate_mailbox_active'] = 'Active'; -$PALANG['pCreate_mailbox_mail'] = 'Create mailbox'; -$PALANG['pCreate_mailbox_button'] = 'Add Mailbox'; -$PALANG['pCreate_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table.'; -$PALANG['pCreate_mailbox_result_succes'] = 'The mailbox has been added to the mailbox table.'; +$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_active'] = 'Active'; +$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.'; -$PALANG['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.'; -$PALANG['pEdit_mailbox_username'] = 'Username'; -$PALANG['pEdit_mailbox_username_error'] = 'Unable to locate mailbox.'; -$PALANG['pEdit_mailbox_password'] = 'New Password'; -$PALANG['pEdit_mailbox_password2'] = 'New Password (again)'; -$PALANG['pEdit_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match.'; -$PALANG['pEdit_mailbox_name'] = 'Name'; -$PALANG['pEdit_mailbox_domain_error'] = 'This domain is not yours: '; -$PALANG['pEdit_mailbox_button'] = 'Edit Mailbox'; -$PALANG['pEdit_mailbox_result_error'] = 'Unable to modify the mailbox.'; +$LANG['Edit_mailbox_welcome'] = 'Edit a mailbox for your domain.'; +$LANG['Edit_mailbox_username'] = 'Username'; +$LANG['Edit_mailbox_username_error'] = 'Unable to locate mailbox.'; +$LANG['Edit_mailbox_password'] = 'New Password'; +$LANG['Edit_mailbox_password2'] = 'New Password (again)'; +$LANG['Edit_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match.'; +$LANG['Edit_mailbox_name'] = 'Name'; +$LANG['Edit_mailbox_domain_error'] = 'This domain is not yours: '; +$LANG['Edit_mailbox_button'] = 'Edit Mailbox'; +$LANG['Edit_mailbox_result_error'] = 'Unable to modify the mailbox.'; -$PALANG['pPassword_welcome'] = 'Change your login password.'; -$PALANG['pPassword_admin'] = 'Login'; -$PALANG['pPassword_admin_text_error'] = 'The LOGIN that you supplied doesn\'t match a mailbox.'; -$PALANG['pPassword_password_current'] = 'Current Password'; -$PALANG['pPassword_password_current_text_error'] = 'You didn\'t supply your current password.'; -$PALANG['pPassword_password'] = 'New Password'; -$PALANG['pPassword_password2'] = 'New Password (again)'; -$PALANG['pPassword_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; -$PALANG['pPassword_button'] = 'Change Password'; -$PALANG['pPassword_result_error'] = 'Unable to change your password.'; -$PALANG['pPassword_result_succes'] = 'Your password has been changed.'; +$LANG['Password_welcome'] = 'Change your login password.'; +$LANG['Password_admin'] = 'Login'; +$LANG['Password_admin_text_error'] = 'The LOGIN that you supplied doesn\'t match a mailbox.'; +$LANG['Password_password_current'] = 'Current Password'; +$LANG['Password_password_current_text_error'] = 'You didn\'t supply your current password.'; +$LANG['Password_password'] = 'New Password'; +$LANG['Password_password2'] = 'New Password (again)'; +$LANG['Password_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; +$LANG['Password_button'] = 'Change Password'; +$LANG['Password_result_error'] = 'Unable to change your password.'; +$LANG['Password_result_succes'] = 'Your password has been changed.'; -$PALANG['pViewlog_welcome'] = 'View the last 10 actions for '; -$PALANG['pViewlog_timestamp'] = 'Timestamp'; -$PALANG['pViewlog_username'] = 'Admin'; -$PALANG['pViewlog_domain'] = 'Domain'; -$PALANG['pViewlog_action'] = 'Action'; -$PALANG['pViewlog_data'] = 'Data'; +$LANG['Viewlog_welcome'] = 'View the last 10 actions for '; +$LANG['Viewlog_timestamp'] = 'Timestamp'; +$LANG['Viewlog_username'] = 'Admin'; +$LANG['Viewlog_domain'] = 'Domain'; +$LANG['Viewlog_action'] = 'Action'; +$LANG['Viewlog_data'] = 'Data'; -$PALANG['pViewlog_button'] = 'Go'; -$PALANG['pViewlog_result_error'] = 'Unable to find the logs.'; +$LANG['Viewlog_button'] = 'Go'; +$LANG['Viewlog_result_error'] = 'Unable to find the logs.'; -$PALANG['pSendmail_welcome'] = 'Send an email.'; -$PALANG['pSendmail_admin'] = 'From'; -$PALANG['pSendmail_to'] = 'To'; -$PALANG['pSendmail_to_text_error'] = 'To is empty or is not a valid email address.'; -$PALANG['pSendmail_subject'] = 'Subject'; -$PALANG['pSendmail_subject_text'] = 'Welcome'; -$PALANG['pSendmail_body'] = 'Body'; -$PALANG['pSendmail_button'] = 'Send Message'; -$PALANG['pSendmail_result_error'] = 'Unable to create mailbox.'; -$PALANG['pSendmail_result_succes'] = 'The mailbox has been created.'; +$LANG['Sendmail_welcome'] = 'Send an email.'; +$LANG['Sendmail_admin'] = 'From'; +$LANG['Sendmail_to'] = 'To'; +$LANG['Sendmail_to_text_error'] = 'To is empty or is not a valid email address.'; +$LANG['Sendmail_subject'] = 'Subject'; +$LANG['Sendmail_subject_text'] = 'Welcome'; +$LANG['Sendmail_body'] = 'Body'; +$LANG['Sendmail_button'] = 'Send Message'; +$LANG['Sendmail_result_error'] = 'Unable to create mailbox.'; +$LANG['Sendmail_result_succes'] = 'The mailbox has been created.'; -$PALANG['pAdminMenu_list_admin'] = 'Admin List'; -$PALANG['pAdminMenu_list_domain'] = 'Domain List'; -$PALANG['pAdminMenu_list_virtual'] = 'Virtual List'; -$PALANG['pAdminMenu_viewlog'] = 'View Log'; -$PALANG['pAdminMenu_backup'] = 'Backup'; -$PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins'; -$PALANG['pAdminMenu_create_admin'] = 'New Admin'; -$PALANG['pAdminMenu_create_domain'] = 'New Domain'; -$PALANG['pAdminMenu_create_alias'] = 'Add Alias'; -$PALANG['pAdminMenu_create_mailbox'] = 'Add Mailbox'; +$LANG['AdminMenu_list_admin'] = 'Admin List'; +$LANG['AdminMenu_list_domain'] = 'Domain List'; +$LANG['AdminMenu_list_virtual'] = 'Virtual List'; +$LANG['AdminMenu_viewlog'] = 'View Log'; +$LANG['AdminMenu_backup'] = 'Backup'; +$LANG['AdminMenu_create_domain_admins'] = 'Domain Admins'; +$LANG['AdminMenu_create_admin'] = 'New Admin'; +$LANG['AdminMenu_create_domain'] = 'New Domain'; +$LANG['AdminMenu_create_alias'] = 'Add Alias'; +$LANG['AdminMenu_create_mailbox'] = 'Add Mailbox'; -$PALANG['pAdminList_admin_domain'] = 'Domain'; -$PALANG['pAdminList_admin_username'] = 'Admin'; -$PALANG['pAdminList_admin_count'] = 'Domains'; -$PALANG['pAdminList_admin_modified'] = 'Last Modified'; -$PALANG['pAdminList_admin_active'] = 'Active'; +$LANG['AdminList_admin_domain'] = 'Domain'; +$LANG['AdminList_admin_username'] = 'Admin'; +$LANG['AdminList_admin_count'] = 'Domains'; +$LANG['AdminList_admin_modified'] = 'Last Modified'; +$LANG['AdminList_admin_active'] = 'Active'; -$PALANG['pAdminList_domain_domain'] = 'Domain'; -$PALANG['pAdminList_domain_description'] = 'Description'; -$PALANG['pAdminList_domain_aliases'] = 'Aliases'; -$PALANG['pAdminList_domain_mailboxes'] = 'Mailboxes'; -$PALANG['pAdminList_domain_modified'] = 'Last Modified'; -$PALANG['pAdminList_domain_active'] = 'Active'; +$LANG['AdminList_domain_domain'] = 'Domain'; +$LANG['AdminList_domain_description'] = 'Description'; +$LANG['AdminList_domain_aliases'] = 'Aliases'; +$LANG['AdminList_domain_mailboxes'] = 'Mailboxes'; +$LANG['AdminList_domain_modified'] = 'Last Modified'; +$LANG['AdminList_domain_active'] = 'Active'; -$PALANG['pAdminList_virtual_button'] = 'Go'; -$PALANG['pAdminList_virtual_welcome'] = 'Overview for '; -$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliases'; -$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxes'; -$PALANG['pAdminList_virtual_alias_address'] = 'From'; -$PALANG['pAdminList_virtual_alias_goto'] = 'To'; -$PALANG['pAdminList_virtual_alias_modified'] = 'Last Modified'; -$PALANG['pAdminList_virtual_mailbox_username'] = 'Email'; -$PALANG['pAdminList_virtual_mailbox_name'] = 'Name'; -$PALANG['pAdminList_virtual_mailbox_modified'] = 'Last Modified'; -$PALANG['pAdminList_virtual_mailbox_active'] = 'Active'; +$LANG['AdminList_virtual_button'] = 'Go'; +$LANG['AdminList_virtual_welcome'] = 'Overview for '; +$LANG['AdminList_virtual_alias_alias_count'] = 'Aliases'; +$LANG['AdminList_virtual_alias_mailbox_count'] = 'Mailboxes'; +$LANG['AdminList_virtual_alias_address'] = 'From'; +$LANG['AdminList_virtual_alias_goto'] = 'To'; +$LANG['AdminList_virtual_alias_modified'] = 'Last Modified'; +$LANG['AdminList_virtual_mailbox_username'] = 'Email'; +$LANG['AdminList_virtual_mailbox_name'] = 'Name'; +$LANG['AdminList_virtual_mailbox_modified'] = 'Last Modified'; +$LANG['AdminList_virtual_mailbox_active'] = 'Active'; -$PALANG['pAdminAdd_domain_welcome'] = 'Add a new domain'; -$PALANG['pAdminAdd_domain_domain'] = 'Domain'; -$PALANG['pAdminAdd_domain_domain_text_error'] = 'The domain already exists.'; -$PALANG['pAdminAdd_domain_description'] = 'Description'; -$PALANG['pAdminAdd_domain_aliases'] = 'Aliases'; -$PALANG['pAdminAdd_domain_aliases_text'] = '-1 = disable | 0 = unlimited'; -$PALANG['pAdminAdd_domain_mailboxes'] = 'Mailboxes'; -$PALANG['pAdminAdd_domain_mailboxes_text'] = '-1 = disable | 0 = unlimited'; -$PALANG['pAdminAdd_domain_button'] = 'Add Domain'; -$PALANG['pAdminAdd_domain_result_error'] = 'Unable to add domain.'; -$PALANG['pAdminAdd_domain_result_succes'] = 'Domain has been added.'; +$LANG['AdminAdd_domain_welcome'] = 'Add a new domain'; +$LANG['AdminAdd_domain_domain'] = 'Domain'; +$LANG['AdminAdd_domain_domain_text_error'] = 'The domain already exists.'; +$LANG['AdminAdd_domain_description'] = 'Description'; +$LANG['AdminAdd_domain_aliases'] = 'Aliases'; +$LANG['AdminAdd_domain_aliases_text'] = '-1 = disable | 0 = unlimited'; +$LANG['AdminAdd_domain_mailboxes'] = 'Mailboxes'; +$LANG['AdminAdd_domain_mailboxes_text'] = '-1 = disable | 0 = unlimited'; +$LANG['AdminAdd_domain_button'] = 'Add Domain'; +$LANG['AdminAdd_domain_result_error'] = 'Unable to add domain.'; +$LANG['AdminAdd_domain_result_succes'] = 'Domain has been added.'; -$PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain'; -$PALANG['pAdminEdit_domain_domain'] = 'Domain'; -$PALANG['pAdminEdit_domain_description'] = 'Description'; -$PALANG['pAdminEdit_domain_aliases'] = 'Aliases'; -$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = disable | 0 = unlimited'; -$PALANG['pAdminEdit_domain_mailboxes'] = 'Mailboxes'; -$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = disable | 0 = unlimited'; -$PALANG['pAdminEdit_domain_active'] = 'Active'; -$PALANG['pAdminEdit_domain_button'] = 'Edit Domain'; -$PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain.'; +$LANG['AdminEdit_domain_welcome'] = 'Edit a domain'; +$LANG['AdminEdit_domain_domain'] = 'Domain'; +$LANG['AdminEdit_domain_description'] = 'Description'; +$LANG['AdminEdit_domain_aliases'] = 'Aliases'; +$LANG['AdminEdit_domain_aliases_text'] = '-1 = disable | 0 = unlimited'; +$LANG['AdminEdit_domain_mailboxes'] = 'Mailboxes'; +$LANG['AdminEdit_domain_mailboxes_text'] = '-1 = disable | 0 = unlimited'; +$LANG['AdminEdit_domain_active'] = 'Active'; +$LANG['AdminEdit_domain_button'] = 'Edit Domain'; +$LANG['AdminEdit_domain_result_error'] = 'Unable to modify domain.'; -$PALANG['pAdminAdd_admin_welcome'] = 'Add a new domain admin'; -$PALANG['pAdminAdd_admin_username'] = 'Admin (email address)'; -$PALANG['pAdminAdd_admin_username_error'] = 'Admin already exists or is not valid.'; -$PALANG['pAdminAdd_admin_password1'] = 'Password'; -$PALANG['pAdminAdd_admin_password2'] = 'Password (again)'; -$PALANG['pAdminAdd_admin_password_error'] = 'The passwords you supplied don\'t match, or are empty.'; -$PALANG['pAdminAdd_admin_domain_error'] = 'No domains selected.'; -$PALANG['pAdminAdd_admin_button'] = 'Add Admin'; -$PALANG['pAdminAdd_admin_result_error'] = 'Unable to add admin.'; -$PALANG['pAdminAdd_admin_result_succes'] = 'Admin has been added.'; -$PALANG['pAdminAdd_admin_address'] = 'Domain'; +$LANG['AdminAdd_admin_welcome'] = 'Add a new domain admin'; +$LANG['AdminAdd_admin_username'] = 'Admin (email address)'; +$LANG['AdminAdd_admin_username_error'] = 'Admin already exists or is not valid.'; +$LANG['AdminAdd_admin_password1'] = 'Password'; +$LANG['AdminAdd_admin_password2'] = 'Password (again)'; +$LANG['AdminAdd_admin_password_error'] = 'The passwords you supplied don\'t match, or are empty.'; +$LANG['AdminAdd_admin_domain_error'] = 'No domains selected.'; +$LANG['AdminAdd_admin_button'] = 'Add Admin'; +$LANG['AdminAdd_admin_result_error'] = 'Unable to add admin.'; +$LANG['AdminAdd_admin_result_succes'] = 'Admin has been added.'; +$LANG['AdminAdd_admin_address'] = 'Domain'; -$PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin'; -$PALANG['pAdminEdit_admin_username'] = 'Admin'; -$PALANG['pAdminEdit_admin_password'] = 'Password'; -$PALANG['pAdminEdit_admin_password2'] = 'Password (again)'; -$PALANG['pAdminEdit_admin_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; -$PALANG['pAdminEdit_admin_active'] = 'Active'; -$PALANG['pAdminEdit_admin_button'] = 'Edit Admin'; -$PALANG['pAdminEdit_admin_result_error'] = 'Unable to modify admin.'; -$PALANG['pAdminEdit_admin_result_succes'] = 'Admin has been modified.'; +$LANG['AdminEdit_admin_welcome'] = 'Edit a domain admin'; +$LANG['AdminEdit_admin_username'] = 'Admin'; +$LANG['AdminEdit_admin_password'] = 'Password'; +$LANG['AdminEdit_admin_password2'] = 'Password (again)'; +$LANG['AdminEdit_admin_password_text_error'] = 'The passwords that you supplied don\'t match, or are empty.'; +$LANG['AdminEdit_admin_active'] = 'Active'; +$LANG['AdminEdit_admin_button'] = 'Edit Admin'; +$LANG['AdminEdit_admin_result_error'] = 'Unable to modify admin.'; +$LANG['AdminEdit_admin_result_succes'] = 'Admin has been modified.'; -$PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.'; -$PALANG['pUsersLogin_username'] = 'Login (email)'; -$PALANG['pUsersLogin_password'] = 'Password'; -$PALANG['pUsersLogin_button'] = 'Login'; -$PALANG['pUsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address.'; -$PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct.'; +$LANG['UsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.'; +$LANG['UsersLogin_username'] = 'Login (email)'; +$LANG['UsersLogin_password'] = 'Password'; +$LANG['UsersLogin_button'] = 'Login'; +$LANG['UsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address.'; +$LANG['UsersLogin_password_incorrect'] = 'Your password is not correct.'; -$PALANG['pUsersMenu_vacation'] = 'Auto Response'; -$PALANG['pUsersMenu_edit_alias'] = 'Change your forward'; -$PALANG['pUsersMenu_password'] = 'Change Password'; +$LANG['UsersMenu_vacation'] = 'Auto Response'; +$LANG['UsersMenu_edit_alias'] = 'Change your forward'; +$LANG['UsersMenu_password'] = 'Change Password'; -$PALANG['pUsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.'; -$PALANG['pUsersMain_edit_alias'] = 'Change your email forwarding.'; -$PALANG['pUsersMain_password'] = 'Change your current password.'; +$LANG['UsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.'; +$LANG['UsersMain_edit_alias'] = 'Change your email forwarding.'; +$LANG['UsersMain_password'] = 'Change your current password.'; -$PALANG['pUsersVacation_welcome'] = 'Auto Response.'; -$PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured.'; -$PALANG['pUsersVacation_subject'] = 'Subject'; -$PALANG['pUsersVacation_subject_text'] = 'Out of Office'; -$PALANG['pUsersVacation_body'] = 'Body'; -$PALANG['pUsersVacation_body_text'] = << until . For urgent matters you can contact . EOM; -$PALANG['pUsersVacation_button_away'] = 'Going Away'; -$PALANG['pUsersVacation_button_back'] = 'Coming Back'; -$PALANG['pUsersVacation_result_error'] = 'Unable to update your auto response settings.'; -$PALANG['pUsersVacation_result_succes'] = 'Your auto response has been removed.'; +$LANG['UsersVacation_button_away'] = 'Going Away'; +$LANG['UsersVacation_button_back'] = 'Coming Back'; +$LANG['UsersVacation_result_error'] = 'Unable to update your auto response settings.'; +$LANG['UsersVacation_result_succes'] = 'Your auto response has been removed.'; -$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; -$PALANG['pCreate_dbLog_createalias'] = 'create alias'; -$PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; -$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; +$LANG['Create_dbLog_createmailbox'] = 'create mailbox'; +$LANG['Create_dbLog_createalias'] = 'create alias'; +$LANG['Delete_dbLog_deletealias'] = 'delete alias'; +$LANG['Delete_dbLog_deletemailbox'] = 'delete mailbox'; -$PALANG['pEdit_dbLog_editactive'] = 'change active state'; -$PALANG['pEdit_dbLog_editalias'] = 'edit alias'; -$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox'; +$LANG['Edit_dbLog_editactive'] = 'change active state'; +$LANG['Edit_dbLog_editalias'] = 'edit alias'; +$LANG['Edit_dbLog_editmailbox'] = 'edit mailbox'; -$PALANG['pSearch_welcome'] = 'Searching for: '; +$LANG['Search_welcome'] = 'Searching for: '; ?> diff --git a/login.php b/login.php index 87e3083..23672c8 100644 --- a/login.php +++ b/login.php @@ -31,14 +31,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("SELECT password FROM admin WHERE username='$fUsername' AND active='1'"); if ($result['rows'] == 1) { $row = db_array($result['result']); - if (!password_verify($fPassword, $row['password'])) { + if (!password_verify($fPassword, $row['assword'])) { $error = 1; - $tMessage = $PALANG['pLogin_password_incorrect']; + $tMessage = $LANG['Login_password_incorrect']; $tUsername = $fUsername; } } else { $error = 1; - $tMessage = $PALANG['pLogin_username_incorrect']; + $tMessage = $LANG['Login_username_incorrect']; } if ($error != 1) { diff --git a/password.php b/password.php index 0ca3d13..4284426 100644 --- a/password.php +++ b/password.php @@ -36,28 +36,28 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("SELECT * FROM admin WHERE username='$username'"); if ($result['rows'] == 1) { $row = db_array($result['result']); - if (!password_verify($fPassword_current, $row['password'])) { + if (!password_verify($fPassword_current, $row['assword'])) { $error = 1; - $pPassword_password_current_text = $PALANG['pPassword_password_current_text_error']; + $pPassword_password_current_text = $LANG['Password_password_current_text_error']; } } else { $error = 1; - $pPassword_email_text = $PALANG['pPassword_email_text_error']; + $pPassword_email_text = $LANG['Password_email_text_error']; } if (empty($fPassword) or ($fPassword != $fPassword2)) { $error = 1; - $pPassword_password_text = $PALANG['pPassword_password_text_error']; + $pPassword_password_text = $LANG['Password_password_text_error']; } if ($error != 1) { $password = pacrypt($fPassword); $result = db_query("UPDATE admin SET password='$password',modified=NOW() WHERE username='$username'"); if ($result['rows'] == 1) { - $tMessage = $PALANG['pPassword_result_succes']; + $tMessage = $LANG['Password_result_succes']; } else { - $tMessage = $PALANG['pPassword_result_error']; + $tMessage = $LANG['Password_result_error']; } } } diff --git a/sendmail.php b/sendmail.php index 779b05e..f89cf76 100644 --- a/sendmail.php +++ b/sendmail.php @@ -41,14 +41,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $tTo = escape_string($_POST['fTo']); $tSubject = escape_string($_POST['fSubject']); $tBody = escape_string($_POST['fBody']); - $tMessage = $PALANG['pSendmail_to_text_error']; + $tMessage = $LANG['Sendmail_to_text_error']; } if ($error != 1) { if (!mail($fTo, $fSubject, $fBody, $fHeaders)) { - $tMessage .= $PALANG['pSendmail_result_error']; + $tMessage .= $LANG['Sendmail_result_error']; } else { - $tMessage .= $PALANG['pSendmail_result_succes']; + $tMessage .= $LANG['Sendmail_result_succes']; } } } diff --git a/templates/add-alias.tpl b/templates/add-alias.tpl index afa5760..28b655d 100644 --- a/templates/add-alias.tpl +++ b/templates/add-alias.tpl @@ -2,10 +2,10 @@
- + - + - + - + - + diff --git a/templates/add-mailbox.tpl b/templates/add-mailbox.tpl index 93bdcd0..416c48e 100644 --- a/templates/add-mailbox.tpl +++ b/templates/add-mailbox.tpl @@ -2,10 +2,10 @@

- + - + - + - + - + - + - + - + diff --git a/templates/admin_admin.tpl b/templates/admin_admin.tpl index 6b2d2d4..68526c6 100644 --- a/templates/admin_admin.tpl +++ b/templates/admin_admin.tpl @@ -3,13 +3,13 @@

 
- + - + - + @@ -17,15 +17,15 @@ - + - + - + - + diff --git a/templates/admin_domain.tpl b/templates/admin_domain.tpl index b019d6b..f704bbf 100644 --- a/templates/admin_domain.tpl +++ b/templates/admin_domain.tpl @@ -3,13 +3,13 @@

- + - + - + @@ -18,22 +18,22 @@ - + - + - + - + - + - + diff --git a/templates/admin_list-admin.tpl b/templates/admin_list-admin.tpl index 7124d53..47d31ee 100644 --- a/templates/admin_list-admin.tpl +++ b/templates/admin_list-admin.tpl @@ -3,9 +3,9 @@ if (count($list_admins) > 0) { echo "

 
\n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; @@ -15,8 +15,8 @@ if (count($list_admins) > 0) { echo " "; echo " "; echo " "; - echo " "; - echo " "; + echo " "; + echo " "; echo " \n"; } echo "
" . $PALANG['pAdminList_admin_username'] . "" . $PALANG['pAdminList_admin_count'] . "" . $PALANG['pAdminList_admin_modified'] . "" . $LANG['AdminList_admin_username'] . "" . $LANG['AdminList_admin_count'] . "" . $LANG['AdminList_admin_modified'] . " 
" . $row['username'] . "" . $row['domain_count'] . "" . $row['modified'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; diff --git a/templates/admin_list-domain.tpl b/templates/admin_list-domain.tpl index e1fb439..2338630 100644 --- a/templates/admin_list-domain.tpl +++ b/templates/admin_list-domain.tpl @@ -11,7 +11,7 @@ if (count($list_admins) > 0) { } ?> - +
@@ -21,11 +21,11 @@ if (count($list_admins) > 0) { if (count($list_domains) > 0) { echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; foreach ($list_domains as $row) { @@ -35,8 +35,8 @@ if (count($list_domains) > 0) { echo ""; echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; echo "\n"; } diff --git a/templates/admin_list-virtual.tpl b/templates/admin_list-virtual.tpl index 3e01f1e..15489d2 100644 --- a/templates/admin_list-virtual.tpl +++ b/templates/admin_list-virtual.tpl @@ -12,12 +12,12 @@ if (count($list_domains) > 0) { ?> - + -

-

-

+

+

+

@@ -29,26 +29,26 @@ if ($list_domains[$selected_domain]['alias_count'] > $limit || $list_domains[$se echo "
\n"; if ($offset >= $limit) { - echo "\n"; + echo "\n"; } if (($list_domains[$selected_domain]['alias_count'] > $limit) || ($list_domains[$selected_domain]['mailbox_count'] > $limit)) { - echo "\n"; + echo "\n"; } if ((($offset + $limit) < $list_domains[$selected_domain]['alias_count']) || (($offset + $limit) < $list_domains[$selected_domain]['mailbox_count'])) { - echo "\n"; + echo "\n"; } echo "
\n"; } if (count($list_alias) > 0) { print "
" . $PALANG['pAdminList_domain_domain'] . "" . $PALANG['pAdminList_domain_description'] . "" . $PALANG['pAdminList_domain_aliases'] . "" . $PALANG['pAdminList_domain_mailboxes'] . "" . $PALANG['pAdminList_domain_modified'] . "" . $LANG['AdminList_domain_domain'] . "" . $LANG['AdminList_domain_description'] . "" . $LANG['AdminList_domain_aliases'] . "" . $LANG['AdminList_domain_mailboxes'] . "" . $LANG['AdminList_domain_modified'] . " 
" . $row['alias_count'] . " / " . $row['aliases'] . "" . $row['mailbox_count'] . " / " . $row['mailboxes'] . "" . $row['modified'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; print " \n"; - print " "; + print " "; print " "; print " \n"; - print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; + print " \n"; print " \n"; print " \n"; @@ -57,8 +57,8 @@ if (count($list_alias) > 0) { print " \n"; print " \n"; print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; print " \n"; } print "

" . $PALANG['pOverview_alias_title'] . "

" . $LANG['Overview_alias_title'] . "

" . $PALANG['pAdminList_virtual_alias_address'] . "" . $PALANG['pAdminList_virtual_alias_goto'] . "" . $PALANG['pAdminList_virtual_alias_modified'] . "" . $LANG['AdminList_virtual_alias_address'] . "" . $LANG['AdminList_virtual_alias_goto'] . "" . $LANG['AdminList_virtual_alias_modified'] . " 
" . $row['address'] . "" . preg_replace("/,/", "
", $row['goto']) . "		" . $row['modified'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; @@ -67,12 +67,12 @@ if (count($list_alias) > 0) { if (count($list_mailbox) > 0) { print "\n"; print " \n"; - print " "; + print " "; print " "; print " \n"; - print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; + print " \n"; print " \n"; print " \n"; @@ -81,8 +81,8 @@ if (count($list_mailbox) > 0) { print " \n"; print " \n"; print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; print " \n"; } print "

" . $PALANG['pOverview_mailbox_title'] . "

" . $LANG['Overview_mailbox_title'] . "

" . $PALANG['pAdminList_virtual_mailbox_username'] . "" . $PALANG['pAdminList_virtual_mailbox_name'] . "" . $PALANG['pAdminList_virtual_mailbox_modified'] . "" . $LANG['AdminList_virtual_mailbox_username'] . "" . $LANG['AdminList_virtual_mailbox_name'] . "" . $LANG['AdminList_virtual_mailbox_modified'] . " 
" . $row['username'] . "" . $row['name'] . "" . $row['modified'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; diff --git a/templates/admin_menu.tpl b/templates/admin_menu.tpl index 0ae9a8e..98148d6 100644 --- a/templates/admin_menu.tpl +++ b/templates/admin_menu.tpl @@ -1,13 +1,13 @@ diff --git a/templates/admin_search.tpl b/templates/admin_search.tpl index 9c020e1..c63b698 100644 --- a/templates/admin_search.tpl +++ b/templates/admin_search.tpl @@ -1,5 +1,5 @@
-

+

@@ -8,12 +8,12 @@ if (count($list_alias) > 0) { print "\n"; print " \n"; - print " "; + print " "; print " "; print " \n"; - print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; + print " \n"; print " \n"; print " \n"; @@ -22,8 +22,8 @@ if (count($list_alias) > 0) { print " \n"; print " \n"; print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; print " \n"; } print "

".$PALANG['pOverview_alias_title']."

".$LANG['Overview_alias_title']."

" . $PALANG['pOverview_alias_address'] . "" . $PALANG['pOverview_alias_goto'] . "" . $PALANG['pOverview_alias_modified'] . "" . $LANG['Overview_alias_address'] . "" . $LANG['Overview_alias_goto'] . "" . $LANG['Overview_alias_modified'] . " 
" . $row['address'] . "" . preg_replace("/,/", "
", $row['goto']) . "		" . $row['modified'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; @@ -32,12 +32,12 @@ if (count($list_alias) > 0) { if (count($list_mailbox) > 0) { print "\n"; print " \n"; - print " "; + print " "; print " "; print " \n"; - print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; + print " \n"; print " \n"; print " \n"; @@ -45,8 +45,8 @@ if (count($list_mailbox) > 0) { print " \n"; print " \n"; print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; print " \n"; } print "

".$PALANG['pOverview_mailbox_title']."

".$LANG['Overview_mailbox_title']."

" . $PALANG['pOverview_mailbox_username'] . "" . $PALANG['pOverview_mailbox_name'] . "" . $PALANG['pOverview_mailbox_modified'] . "" . $LANG['Overview_mailbox_username'] . "" . $LANG['Overview_mailbox_name'] . "" . $LANG['Overview_mailbox_modified'] . " 
" . $row['username'] . "" . $row['name'] . "" . $PALANG['edit'] . "" . $PALANG['del'] . "" . $LANG['edit'] . "" . $LANG['del'] . "
\n"; diff --git a/templates/create-alias.tpl b/templates/create-alias.tpl index c8ca0b2..bf573c0 100644 --- a/templates/create-alias.tpl +++ b/templates/create-alias.tpl @@ -2,10 +2,10 @@
- + - + - + - + - + diff --git a/templates/create-mailbox.tpl b/templates/create-mailbox.tpl index b6c680f..18db241 100644 --- a/templates/create-mailbox.tpl +++ b/templates/create-mailbox.tpl @@ -2,10 +2,10 @@

- + - + - + - + - + - + - + - + - + diff --git a/templates/edit-alias.tpl b/templates/edit-alias.tpl index 69c21a9..74e52a9 100644 --- a/templates/edit-alias.tpl +++ b/templates/edit-alias.tpl @@ -2,15 +2,15 @@

 
 
 
- + - + - + - + diff --git a/templates/users_edit-alias.tpl b/templates/users_edit-alias.tpl index 8111c3b..1093547 100644 --- a/templates/users_edit-alias.tpl +++ b/templates/users_edit-alias.tpl @@ -2,15 +2,15 @@

 
 
- + - + - + - + diff --git a/templates/viewlog.tpl b/templates/viewlog.tpl index 669bae1..a8f655b 100644 --- a/templates/viewlog.tpl +++ b/templates/viewlog.tpl @@ -12,7 +12,7 @@ for ($i = 0; $i < $count; $i++) { } ?> - + 0) { print "
 
 
\n"; print " \n"; - print " \n"; + print " \n"; print " \n"; print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; + print " \n"; + print " \n"; + print " \n"; + print " \n"; + print " \n"; print " \n"; for ($i = 0; $i < $tLog_count; $i++) { diff --git a/users/edit-alias.php b/users/edit-alias.php index b8a233f..9d6faa1 100644 --- a/users/edit-alias.php +++ b/users/edit-alias.php @@ -35,12 +35,12 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $tGoto = preg_replace('/vmail/', '', $row['goto']); #$tGoto = $row['goto']; } else { - $tMessage = $PALANG['pEdit_alias_address_error']; + $tMessage = $LANG['Edit_alias_address_error']; } } if ($_SERVER['REQUEST_METHOD'] == "POST") { - $pEdit_alias_goto = $PALANG['pEdit_alias_goto']; + $pEdit_alias_goto = $LANG['Edit_alias_goto']; if (isset($_POST['fGoto'])) $fGoto = escape_string($_POST['fGoto']); $fGoto = strtolower($fGoto); @@ -56,7 +56,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if (!check_email($array[$i])) { $error = 1; $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]"; + $tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]"; } } @@ -69,7 +69,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("UPDATE alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"); if ($result['rows'] != 1) { - $tMessage = $PALANG['pEdit_alias_result_error']; + $tMessage = $LANG['Edit_alias_result_error']; } else { db_log($USERID_USERNAME, $USERID_DOMAIN, "edit alias", "$USERID_USERNAME -> $goto"); diff --git a/users/login.php b/users/login.php index 17676c2..687252b 100644 --- a/users/login.php +++ b/users/login.php @@ -31,14 +31,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("SELECT password FROM mailbox WHERE username='$fUsername' AND active='1'"); if ($result['rows'] == 1) { $row = db_array($result['result']); - if (!password_verify($fPassword, $row['password'])) { + if (!password_verify($fPassword, $row['assword'])) { $error = 1; - $tMessage = $PALANG['pLogin_password_incorrect']; + $tMessage = $LANG['Login_password_incorrect']; $tUsername = $fUsername; } } else { $error = 1; - $tMessage = $PALANG['pLogin_username_incorrect']; + $tMessage = $LANG['Login_username_incorrect']; } if ($error != 1) { diff --git a/users/password.php b/users/password.php index a3175fb..3fa0503 100644 --- a/users/password.php +++ b/users/password.php @@ -37,29 +37,29 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("SELECT * FROM mailbox WHERE username='$username'"); if ($result['rows'] == 1) { $row = db_array($result['result']); - if (!password_verify($fPassword_current, $row['password'])) { + if (!password_verify($fPassword_current, $row['assword'])) { $error = 1; - $pPassword_password_current_text = $PALANG['pPassword_password_current_text_error']; + $pPassword_password_current_text = $LANG['Password_password_current_text_error']; } } else { $error = 1; - $pPassword_email_text = $PALANG['pPassword_email_text_error']; + $pPassword_email_text = $LANG['Password_email_text_error']; } if (empty($fPassword) or ($fPassword != $fPassword2)) { $error = 1; - $pPassword_password_text = $PALANG['pPassword_password_text_error']; + $pPassword_password_text = $LANG['Password_password_text_error']; } if ($error != 1) { $password = pacrypt($fPassword); $result = db_query("UPDATE mailbox SET password='$password',modified=NOW(),scheme='' WHERE username='$username'"); if ($result['rows'] == 1) { - $tMessage = $PALANG['pPassword_result_succes']; + $tMessage = $LANG['Password_result_succes']; db_log($USERID_USERNAME, $USERID_DOMAIN, "change password", "$USERID_USERNAME"); } else { - $tMessage = $PALANG['pPassword_result_error']; + $tMessage = $LANG['Password_result_error']; } } } diff --git a/users/vacation.php b/users/vacation.php index 162c9a3..3200ad3 100644 --- a/users/vacation.php +++ b/users/vacation.php @@ -32,7 +32,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { $result = db_query("SELECT * FROM vacation WHERE email='$USERID_USERNAME'"); if ($result['rows'] == 1) { $row = db_array($result['result']); - $tMessage = $PALANG['pUsersVacation_welcome_text']; + $tMessage = $LANG['UsersVacation_welcome_text']; $template = "users_vacation-get.tpl"; } else { $template = "users_vacation.tpl"; @@ -52,9 +52,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("DELETE FROM vacation WHERE email='$USERID_USERNAME'"); if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pUsersVacation_result_error']; + $tMessage = $LANG['UsersVacation_result_error']; } else { - $tMessage = $PALANG['pUsersVacation_result_succes']; + $tMessage = $LANG['UsersVacation_result_succes']; } } @@ -62,7 +62,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $result = db_query("INSERT INTO vacation (email,subject,body,cache,domain,created,active) VALUES ('$USERID_USERNAME','$fSubject','$fBody','','$USERID_DOMAIN',NOW(),'1')"); if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pUsersVacation_result_error']; + $tMessage = $LANG['UsersVacation_result_error']; } else { header("Location: main.php"); exit; diff --git a/viewlog.php b/viewlog.php index dabb73a..ba06d29 100644 --- a/viewlog.php +++ b/viewlog.php @@ -31,7 +31,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") { if (!check_owner($SESSID_USERNAME, $fDomain)) { $error = 1; - $tMessage = $PALANG['pViewlog_result_error']; + $tMessage = $LANG['Viewlog_result_error']; } if ($error != 1) { @@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { if (!check_owner($SESSID_USERNAME, $fDomain)) { $error = 1; - $tMessage = $PALANG['pViewlog_error']; + $tMessage = $LANG['Viewlog_error']; } if ($error != 1) {

".$PALANG['pViewlog_welcome']." ".$fDomain."

".$LANG['Viewlog_welcome']." ".$fDomain."

" . $PALANG['pViewlog_timestamp'] . "" . $PALANG['pViewlog_username'] . "" . $PALANG['pViewlog_domain'] . "" . $PALANG['pViewlog_action'] . "" . $PALANG['pViewlog_data'] . "" . $LANG['Viewlog_timestamp'] . "" . $LANG['Viewlog_username'] . "" . $LANG['Viewlog_domain'] . "" . $LANG['Viewlog_action'] . "" . $LANG['Viewlog_data'] . "