commit - ea8336ce5cf46f7aa036d06652cc3cc9023213c2
commit + 577680b10defe852d5e8b9ab3b5d85d6410f4053
blob - bc082f084b29278c56c2f7696b0c970ec72d0157
blob + 6c742c64d54b459cc10eeb5c6b9976d63f4fdca5
--- admin/add-alias.php
+++ 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'] . "<br />($from -> $goto)</br />";
+			$message = $LANG['Create_alias_result_succes'] . "<br />($from -> $goto)</br />";
 			$address = '';
 			$goto = '';
  		} catch(PDOException $e) { 
-			$message = $PALANG['pCreate_alias_result_error'] . "<br />($from -> $goto) - $e<br />";
+			$message = $LANG['Create_alias_result_error'] . "<br />($from -> $goto) - $e<br />";
 		}
 	}
 }
blob - 96b35f9e830d590be6283b00d358182f3efcd887
blob + 76e84c072cbd0f992e7e8077d5750c402b44912b
--- admin/add-mailbox.php
+++ 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'] . "<br />($from) - $e<br />";
+			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 
 		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'] . "<br />($from)";
+			$message = $LANG['Create_mailbox_result_succes'] . "<br />($from)";
 			$username = '';
 			$name = '';
  		} catch(PDOException $e) { 
-			$message = $PALANG['pCreate_alias_result_error'] . "<br />($from) - $e<br />";
+			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 	}
 }
blob - f146bdd3e4f4683c8dc05fae6a88369822f4b348
blob + 60bf51f9828c30bd5f69da6746de3d8edadff0c4
--- admin/admin.php
+++ 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'] . "<br />($username)</br />";
+				$message = $LANG['AdminAdd_admin_result_succes'] . "<br />($username)</br />";
 			} catch(PDOException $e) {
-				$message = $PALANG['pAdminAdd_admin_result_error'] . "<br />($username)<br />";
+				$message = $LANG['AdminAdd_admin_result_error'] . "<br />($username)<br />";
 			}	
 		}
 	}
 
 	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'] . "<br />($username)<br />";
+				$message = $LANG['AdminEdit_admin_result_error'] . "<br />($username)<br />";
 			}	
 		}
 
 		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'];
 			}
 		}
 	}
blob - 6168a4c9229c1d429d964a2248f6b86aa0c60932
blob + 85dc92c9a5bd3d429f61eb8aec5d37d4dce12195
--- admin/delete.php
+++ 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'] . "<b>$delete</b> (" . $e->getMessage() . ")!</span>";
+			$message = $LANG['Delete_delete_error'] . "<b>$delete</b> (" . $e->getMessage() . ")!</span>";
 		} catch (PDOException $e) {
-			$message = $PALANG['pDelete_delete_error'] . "<b>$delete</b> (alias)!</span> " . $e-getMessage();
+			$message = $LANG['Delete_delete_error'] . "<b>$delete</b> (alias)!</span> " . $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'] . "<b>$delete</b> (" . $e->getMessage() . ")!</span>";
+			$message = $LANG['Delete_delete_error'] . "<b>$delete</b> (" . $e->getMessage() . ")!</span>";
 		} catch (PDOException $e) {
-			$message = $PALANG['pDelete_delete_error'] . "<b>$delete</b> (mailbox)!</span>";
+			$message = $LANG['Delete_delete_error'] . "<b>$delete</b> (mailbox)!</span>";
 		}
 	}
 }
blob - cbc691e6df3105ff6cd7c55d5c999f54494b3f61
blob + 74f9fcaaff79cabdfadec665f583f319ebefb210
--- admin/domain.php
+++ 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'] . "<br />($domain)</br />";
+			$message = $LANG['AdminAdd_domain_result_succes'] . "<br />($domain)</br />";
 		} catch(PDOException $e) {
-			$message = $PALANG['pAdminAdd_domain_result_error'] . "<br />($domain)<br />";
+			$message = $LANG['AdminAdd_domain_result_error'] . "<br />($domain)<br />";
 		}
 	} 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'];
 		}
 	}
 }
blob - 672391e64384eef0710026d2a4b1c0c9c370211d
blob + c7544c32c3a6d6e78a58b9911da788724b434d62
--- admin/edit-alias.php
+++ 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]</div>";
+			$tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]</div>";
 		}
 	}
 	
 	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");
 					
blob - 0c633c59cb5ae4b4541a588c898d353e7ac92366
blob + 272783280783f4b4ac3178e69c2f82099d873b53
--- admin/edit-mailbox.php
+++ 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");
blob - 0dd2b61aa1e5685835172742b822614f9e94a5b6
blob + 7a1895d5dcbd6ecde053d5aa0320bd810a00211b
--- create-alias.php
+++ 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'] . "<br />($fAddress -> $fGoto)<br />\n";
+			$tMessage = $LANG['Create_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n";
 		} else {
 			db_log($SESSID_USERNAME, $fDomain, "create alias", "$fAddress -> $fGoto");
 
 			$tDomain = $fDomain;
-			$tMessage = $PALANG['pCreate_alias_result_succes'] . "<br />($fAddress -> $fGoto)<br />\n";
+			$tMessage = $LANG['Create_alias_result_succes'] . "<br />($fAddress -> $fGoto)<br />\n";
 		}
 	}
 }
blob - 29de1d6eea9d9c4c828767591acba0786163df58
blob + 3c3b82917b9dc0488dd52cf0af1f9a8a2ee62010
--- create-mailbox.php
+++ create-mailbox.php
@@ -39,17 +39,17 @@ $list_domains = list_domains_for_admin($SESSID_USERNAM
 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'] . "<br />($fUsername -> $fUsername)</br />";
+			$tMessage = $LANG['Alias_result_error'] . "<br />($fUsername -> $fUsername)</br />";
 		}
 
 		$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'] . "<br />($fUsername)<br />";
+			$tMessage .= $LANG['Create_mailbox_result_error'] . "<br />($fUsername)<br />";
 		} else {
 			db_log($SESSID_USERNAME, $fDomain, "create mailbox", "$fUsername");
 
 			$tDomain = $fDomain;
-			$tMessage = $PALANG['pCreate_mailbox_result_succes'] . "<br />($fUsername";
+			$tMessage = $LANG['Create_mailbox_result_succes'] . "<br />($fUsername";
 			if ($CONF['generate_password'] == "YES") {
 				$tMessage .= " / $fPassword)</br />";
 			} 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 .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+					$tMessage .= "<br />" . $LANG['Sendmail_result_error'] . "<br />";
 				} else {
-					$tMessage .= "<br />" . $PALANG['pSendmail_result_succes'] . "<br />";
+					$tMessage .= "<br />" . $LANG['Sendmail_result_succes'] . "<br />";
 				}
 			}
 		}
blob - fc9be7c398879dce9757eb523daed8fa5df04379
blob + f788e5ac19e6fd8570fbc3b04e2e058296f0416c
--- delete.php
+++ 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'] . "<b>$fDomain</b>!</div>";
+		$tMessage = $LANG['Delete_domain_error'] . "<b>$fDomain</b>!</div>";
 	} else {
 
 		$result = db_query("DELETE FROM alias WHERE address='$fDelete' AND domain='$fDomain'");
 		if ($result['rows'] != 1) {
 			$error = 1;
-			$tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (alias)!</div>";
+			$tMessage = $LANG['Delete_delete_error'] . "<b>$fDelete</b> (alias)!</div>";
 		} 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'] . "<b>$fDelete</b> (mailbox)!</div>";
+				$tMessage = $LANG['Delete_delete_error'] . "<b>$fDelete</b> (mailbox)!</div>";
 			} else {
 				db_query("DELETE FROM vacation WHERE email='$fDelete' AND domain='$fDomain'");
 				db_log($SESSID_USERNAME, $fDomain, "delete mailbox", $fDelete);
blob - 1eba32a7e3a58ddd9b3fd0b8eb5ec03c0c377624
blob + 2e9487f71b5274bfcab2a6e8ede6fb828bf6790e
--- edit-active.php
+++ 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'] . "<b>$fDomain</b>!</font>";
+		$tMessage = $LANG['Edit_mailbox_domain_error'] . "<b>$fDomain</b>!</font>";
 	} 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);
 		}
blob - 0c129c7cfea43b9431e9544e870a529b2c23ef32
blob + fc36f8c1e578e9ba5e9a9698a287bd2c3fba9e68
--- edit-alias.php
+++ 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</font>";
+		$tMessage = $LANG['Edit_alias_domain_error'] . "$fDomain</font>";
 	}	
 	
 	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]</div>";
+			$tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]</div>";
 		}
 	}
 	
 	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");
 					
blob - 11eb4b0a0716b2005472fa5fa0ff255978534f7a
blob + 6a6f1386fe7e802123165001c2c76356ec339ee1
--- edit-mailbox.php
+++ 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</font>";
+		$tMessage = $LANG['Edit_mailbox_domain_error'] . "$fDomain</font>";
 	}
 
 	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);
 			
blob - a349b606adfc73a3e21afde968355f8a93aff06b
blob + 27076b6d349215df63a8923ec58b0a5431dbaf24
--- functions.inc.php
+++ 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
blob - 95775808214e28f8c0bf2a276ff376bccd9136ac
blob + 2fed86b52ac92e334b6a780b00992f96e3edd945
--- languages/en.lang
+++ languages/en.lang
@@ -3,267 +3,267 @@
 // Language file English
 // by Mischa <mischa at high5 dot nl>
 //
-$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'] = '<span class="error_msg">Your login is not correct. Make sure that you login with your email address.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Your password is not correct.</span>';
-$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'] = '<span class="error_msg">Your login is not correct. Make sure that you login with your email address.</span>';
+$LANG['Login_password_incorrect'] = '<span class="error_msg">Your password is not correct.</span>';
+$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'] = '<span class="error_msg">Unable to delete the entry ';
-$PALANG['pDelete_domain_error'] = '<span class="error_msg">This domain is not yours ';
+$LANG['Delete_delete_error'] = '<span class="error_msg">Unable to delete the entry ';
+$LANG['Delete_domain_error'] = '<span class="error_msg">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'] = '<span class="error_msg">The ALIAS or TO is not valid.</span>';
-$PALANG['pCreate_alias_address_text_error2'] = '<span class="error_msg">You have reached your limit to create aliases.</span>';
-$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'] = '<span class="error_msg">This email address already exists, unable to add to the alias table.</span>';
-$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.<br />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'] = '<span class="error_msg">The ALIAS or TO is not valid.</span>';
+$LANG['Create_alias_address_text_error2'] = '<span class="error_msg">You have reached your limit to create aliases.</span>';
+$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'] = '<span class="error_msg">This email address already exists, unable to add to the alias table.</span>';
+$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.<br />For domain to domain forwarding use "*@domain.tld" as to.';
 
-$PALANG['pEdit_alias_welcome'] = 'Edit an alias for your domain.<br />One entry per line.';
-$PALANG['pEdit_alias_address'] = 'Alias';
-$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Unable to locate alias.</span>';
-$PALANG['pEdit_alias_goto'] = 'To';
-$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">You didn\'t enter anything at To</span>';
-$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">The email address that you have entered is not valid: ';
-$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">This domain is not yours: ';
-$PALANG['pEdit_alias_button'] = 'Edit Alias';
-$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Unable to modify the alias.</span>';
+$LANG['Edit_alias_welcome'] = 'Edit an alias for your domain.<br />One entry per line.';
+$LANG['Edit_alias_address'] = 'Alias';
+$LANG['Edit_alias_address_error'] = '<span class="error_msg">Unable to locate alias.</span>';
+$LANG['Edit_alias_goto'] = 'To';
+$LANG['Edit_alias_goto_text_error1'] = '<span class="error_msg">You didn\'t enter anything at To</span>';
+$LANG['Edit_alias_goto_text_error2'] = '<span class="error_msg">The email address that you have entered is not valid: ';
+$LANG['Edit_alias_domain_error'] = '<span class="error_msg">This domain is not yours: ';
+$LANG['Edit_alias_button'] = 'Edit Alias';
+$LANG['Edit_alias_result_error'] = '<span class="error_msg">Unable to modify the alias.</span>';
 
-$PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.';
-$PALANG['pCreate_mailbox_username'] = 'Username';
-$PALANG['pCreate_mailbox_username_text_error1'] = '<span class="error_msg">The USERNAME is not valid.</span>';
-$PALANG['pCreate_mailbox_username_text_error2'] = '<span class="error_msg">This email address already exists, please choose a different one.</span>';
-$PALANG['pCreate_mailbox_username_text_error3'] = '<span class="error_msg">You have reached your limit to create mailboxes.</span>';
-$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'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
-$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'] = '<span class="error_msg">Unable to add the mailbox to the mailbox table.</span>';
-$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'] = '<span class="error_msg">The USERNAME is not valid.</span>';
+$LANG['Create_mailbox_username_text_error2'] = '<span class="error_msg">This email address already exists, please choose a different one.</span>';
+$LANG['Create_mailbox_username_text_error3'] = '<span class="error_msg">You have reached your limit to create mailboxes.</span>';
+$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'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
+$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'] = '<span class="error_msg">Unable to add the mailbox to the mailbox table.</span>';
+$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'] = '<span class="error_msg">Unable to locate mailbox.</span>';
-$PALANG['pEdit_mailbox_password'] = 'New Password';
-$PALANG['pEdit_mailbox_password2'] = 'New Password (again)';
-$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match.</span>';
-$PALANG['pEdit_mailbox_name'] = 'Name';
-$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">This domain is not yours: ';
-$PALANG['pEdit_mailbox_button'] = 'Edit Mailbox';
-$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Unable to modify the mailbox.</span>';
+$LANG['Edit_mailbox_welcome'] = 'Edit a mailbox for your domain.';
+$LANG['Edit_mailbox_username'] = 'Username';
+$LANG['Edit_mailbox_username_error'] = '<span class="error_msg">Unable to locate mailbox.</span>';
+$LANG['Edit_mailbox_password'] = 'New Password';
+$LANG['Edit_mailbox_password2'] = 'New Password (again)';
+$LANG['Edit_mailbox_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match.</span>';
+$LANG['Edit_mailbox_name'] = 'Name';
+$LANG['Edit_mailbox_domain_error'] = '<span class="error_msg">This domain is not yours: ';
+$LANG['Edit_mailbox_button'] = 'Edit Mailbox';
+$LANG['Edit_mailbox_result_error'] = '<span class="error_msg">Unable to modify the mailbox.</span>';
 
-$PALANG['pPassword_welcome'] = 'Change your login password.';
-$PALANG['pPassword_admin'] = 'Login';
-$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">The LOGIN that you supplied doesn\'t match a mailbox.</span>';
-$PALANG['pPassword_password_current'] = 'Current Password';
-$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">You didn\'t supply your current password.</span>';
-$PALANG['pPassword_password'] = 'New Password';
-$PALANG['pPassword_password2'] = 'New Password (again)';
-$PALANG['pPassword_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
-$PALANG['pPassword_button'] = 'Change Password';
-$PALANG['pPassword_result_error'] = '<span class="error_msg">Unable to change your password.</span>';
-$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'] = '<span class="error_msg">The LOGIN that you supplied doesn\'t match a mailbox.</span>';
+$LANG['Password_password_current'] = 'Current Password';
+$LANG['Password_password_current_text_error'] = '<span class="error_msg">You didn\'t supply your current password.</span>';
+$LANG['Password_password'] = 'New Password';
+$LANG['Password_password2'] = 'New Password (again)';
+$LANG['Password_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
+$LANG['Password_button'] = 'Change Password';
+$LANG['Password_result_error'] = '<span class="error_msg">Unable to change your password.</span>';
+$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'] = '<span class="error_msg">Unable to find the logs.</span>';
-
-$PALANG['pSendmail_welcome'] = 'Send an email.';
-$PALANG['pSendmail_admin'] = 'From';
-$PALANG['pSendmail_to'] = 'To';
-$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">To is empty or is not a valid email address.</span>';
-$PALANG['pSendmail_subject'] = 'Subject';
-$PALANG['pSendmail_subject_text'] = 'Welcome';
-$PALANG['pSendmail_body'] = 'Body';
-$PALANG['pSendmail_button'] = 'Send Message';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Unable to create mailbox.</span>';
-$PALANG['pSendmail_result_succes'] = 'The mailbox has been created.';
+$LANG['Viewlog_button'] = 'Go';
+$LANG['Viewlog_result_error'] = '<span class="error_msg">Unable to find the logs.</span>';
 
-$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['Sendmail_welcome'] = 'Send an email.';
+$LANG['Sendmail_admin'] = 'From';
+$LANG['Sendmail_to'] = 'To';
+$LANG['Sendmail_to_text_error'] = '<span class="error_msg">To is empty or is not a valid email address.</span>';
+$LANG['Sendmail_subject'] = 'Subject';
+$LANG['Sendmail_subject_text'] = 'Welcome';
+$LANG['Sendmail_body'] = 'Body';
+$LANG['Sendmail_button'] = 'Send Message';
+$LANG['Sendmail_result_error'] = '<span class="error_msg">Unable to create mailbox.</span>';
+$LANG['Sendmail_result_succes'] = 'The mailbox has been created.';
 
-$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['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_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_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_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_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['pAdminAdd_domain_welcome'] = 'Add a new domain';
-$PALANG['pAdminAdd_domain_domain'] = 'Domain';
-$PALANG['pAdminAdd_domain_domain_text_error'] = '<span class="error_msg">The domain already exists.</span>';
-$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'] = '<span class="error_msg">Unable to add domain.</span>';
-$PALANG['pAdminAdd_domain_result_succes'] = 'Domain has been added.';
+$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['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'] = '<span class="error_msg">Unable to modify domain.</span>';
+$LANG['AdminAdd_domain_welcome'] = 'Add a new domain';
+$LANG['AdminAdd_domain_domain'] = 'Domain';
+$LANG['AdminAdd_domain_domain_text_error'] = '<span class="error_msg">The domain already exists.</span>';
+$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'] = '<span class="error_msg">Unable to add domain.</span>';
+$LANG['AdminAdd_domain_result_succes'] = 'Domain has been added.';
 
-$PALANG['pAdminAdd_admin_welcome'] = 'Add a new domain admin';
-$PALANG['pAdminAdd_admin_username'] = 'Admin (email address)';
-$PALANG['pAdminAdd_admin_username_error'] = '<span class="error_msg">Admin already exists or is not valid.</span>';
-$PALANG['pAdminAdd_admin_password1'] = 'Password';
-$PALANG['pAdminAdd_admin_password2'] = 'Password (again)';
-$PALANG['pAdminAdd_admin_password_error'] = '<span class="error_msg">The passwords you supplied don\'t match, or are empty.</span>';
-$PALANG['pAdminAdd_admin_domain_error'] = '<span class="error_msg">No domains selected.</span>';
-$PALANG['pAdminAdd_admin_button'] = 'Add Admin';
-$PALANG['pAdminAdd_admin_result_error'] = '<span class="error_msg">Unable to add admin.</span>';
-$PALANG['pAdminAdd_admin_result_succes'] = 'Admin has been added.';
-$PALANG['pAdminAdd_admin_address'] = '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'] = '<span class="error_msg">Unable to modify domain.</span>';
 
-$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'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
-$PALANG['pAdminEdit_admin_active'] = 'Active';
-$PALANG['pAdminEdit_admin_button'] = 'Edit Admin';
-$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Unable to modify admin.</span>';
-$PALANG['pAdminEdit_admin_result_succes'] = 'Admin has been modified.';
+$LANG['AdminAdd_admin_welcome'] = 'Add a new domain admin';
+$LANG['AdminAdd_admin_username'] = 'Admin (email address)';
+$LANG['AdminAdd_admin_username_error'] = '<span class="error_msg">Admin already exists or is not valid.</span>';
+$LANG['AdminAdd_admin_password1'] = 'Password';
+$LANG['AdminAdd_admin_password2'] = 'Password (again)';
+$LANG['AdminAdd_admin_password_error'] = '<span class="error_msg">The passwords you supplied don\'t match, or are empty.</span>';
+$LANG['AdminAdd_admin_domain_error'] = '<span class="error_msg">No domains selected.</span>';
+$LANG['AdminAdd_admin_button'] = 'Add Admin';
+$LANG['AdminAdd_admin_result_error'] = '<span class="error_msg">Unable to add admin.</span>';
+$LANG['AdminAdd_admin_result_succes'] = 'Admin has been added.';
+$LANG['AdminAdd_admin_address'] = 'Domain';
 
-$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['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'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
+$LANG['AdminEdit_admin_active'] = 'Active';
+$LANG['AdminEdit_admin_button'] = 'Edit Admin';
+$LANG['AdminEdit_admin_result_error'] = '<span class="error_msg">Unable to modify admin.</span>';
+$LANG['AdminEdit_admin_result_succes'] = 'Admin has been modified.';
 
-$PALANG['pUsersMenu_vacation'] = 'Auto Response';
-$PALANG['pUsersMenu_edit_alias'] = 'Change your forward';
-$PALANG['pUsersMenu_password'] = 'Change Password';
+$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['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['UsersMenu_vacation'] = 'Auto Response';
+$LANG['UsersMenu_edit_alias'] = 'Change your forward';
+$LANG['UsersMenu_password'] = 'Change 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'] = <<<EOM
+$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.';
+
+$LANG['UsersVacation_welcome'] = 'Auto Response.';
+$LANG['UsersVacation_welcome_text'] = 'You already have an auto response configured.';
+$LANG['UsersVacation_subject'] = 'Subject';
+$LANG['UsersVacation_subject_text'] = 'Out of Office';
+$LANG['UsersVacation_body'] = 'Body';
+$LANG['UsersVacation_body_text'] = <<<EOM
 I will be away from <date> until <date>.
 For urgent matters you can contact <contact person>.
 EOM;
-$PALANG['pUsersVacation_button_away'] = 'Going Away';
-$PALANG['pUsersVacation_button_back'] = 'Coming Back';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Unable to update your auto response settings.</span>';
-$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'] = '<span class="error_msg">Unable to update your auto response settings.</span>';
+$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: ';
 ?>
blob - 87e30838630b78c0f2bf69812d2070b44a4be7b4
blob + 23672c8164d5e6bdb960d0a8b4a966f2a4384902
--- login.php
+++ 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) {
blob - 0ca3d13fa91f10ea31125e0cf2f20f1a2bafe9d7
blob + 4284426cc11f5177ebb5797c8cdfd438ed582639
--- password.php
+++ 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'];
 		}
 	}
 }
blob - 779b05e89646745cb93b296641d0751dcda86444
blob + f89cf7665c93e49a6907b67be3b47e15ecc077df
--- sendmail.php
+++ 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'];
 		}
 	}
 }
blob - afa5760edb5221eddb9e353cafea209823bf27ca
blob + 28b655da4b9457821bf5f59531f6f1d07a602846
--- templates/add-alias.tpl
+++ templates/add-alias.tpl
@@ -2,10 +2,10 @@
 <form name="create_alias" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php echo $PALANG['pCreate_alias_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php echo $LANG['Create_alias_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pCreate_alias_address']; ?></td>
+		<td><?php echo $LANG['Create_alias_address']; ?></td>
 		<td><input class="flat" type="text" name="address" value="<?php echo $address ?? ''; ?>" /></td>
 		<td>
 		<select name="domain">
@@ -20,12 +20,12 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pCreate_alias_goto'] . ":"; ?></td>
+		<td><?php echo $LANG['Create_alias_goto'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="goto" value="<?php echo $goto ?? ''; ?>" /></td>
-		<td><?php echo $PALANG['pCreate_alias_goto_text']; ?></td>
+		<td><?php echo $LANG['Create_alias_goto_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $PALANG['pCreate_alias_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Create_alias_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php echo $message ?? '&nbsp;'; ?></td>
blob - 93bdcd0f6f15817c77c549d4eeeeafaafa9eda8c
blob + 416c48eb21780c7b1be4c81b71cfa11bc9596dc7
--- templates/add-mailbox.tpl
+++ templates/add-mailbox.tpl
@@ -2,10 +2,10 @@
 <form name="create_mailbox" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pCreate_mailbox_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Create_mailbox_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_username'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_username'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="username" value="<?php print $username ?? ''; ?>" /></td>
 		<td>
 		<select name="domain">
@@ -20,22 +20,22 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_password'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password1" /></td>
-		<td><?php print $PALANG['pCreate_mailbox_password_text']; ?></td>
+		<td><?php print $LANG['Create_mailbox_password_text']; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_password2'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_name'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_name'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="name" value="<?php print $name ?? ''; ?>" /></td>
-		<td><?php print $PALANG['pCreate_mailbox_name_text']; ?></td>
+		<td><?php print $LANG['Create_mailbox_name_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pCreate_mailbox_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Create_mailbox_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $message ?? '&nbsp'; ?></td>
blob - 6b2d2d4715187b9592ed65292441afdb79925789
blob + 68526c6546533cbd524d74d7eb1d190ba2378072
--- templates/admin_admin.tpl
+++ templates/admin_admin.tpl
@@ -3,13 +3,13 @@
 <table>
 	<tr>
 		<?php if ($action == 'edit') { ?>
-		<td colspan="2"><h3><?php echo $PALANG['pAdminEdit_admin_welcome']; ?></h3></td>
+		<td colspan="2"><h3><?php echo $LANG['AdminEdit_admin_welcome']; ?></h3></td>
 		<?php } else { ?>
-		<td colspan="2"><h3><?php echo $PALANG['pAdminAdd_admin_welcome']; ?></h3></td>
+		<td colspan="2"><h3><?php echo $LANG['AdminAdd_admin_welcome']; ?></h3></td>
 		<?php } ?>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_admin_username'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_admin_username'] . ":"; ?></td>
 		<?php if ($action == 'edit') { ?>
 		<td><input class="flat" type="hidden" name="username" value="<?php echo $username; ?>" /><?php print $username; ?></td>
 		<?php } else { ?>
@@ -17,15 +17,15 @@
 		<?php } ?>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_admin_password1'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_admin_password1'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password1" /></td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_admin_password2'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_admin_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password2" /></td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_admin_address'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_admin_address'] . ":"; ?></td>
 		<td>
 		<select name="domains[]" size="10" multiple="multiple">
 		<?php
@@ -39,7 +39,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $PALANG['pAdminAdd_admin_button']; ?>" /></td>
+		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['AdminAdd_admin_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="2" class="standout"><?php echo $message ?? '&nbsp;'; ?></td>
blob - b019d6b31335c75f689f85ddc0abc1a2ea8cce0b
blob + f704bbf9047b07b9cac6668465948fb56c88db45
--- templates/admin_domain.tpl
+++ templates/admin_domain.tpl
@@ -3,13 +3,13 @@
 <table>
 	<tr>
 		<?php if ($action == 'edit') { ?>
-		<td colspan="3"><h3><?php print $PALANG['pAdminEdit_domain_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['AdminEdit_domain_welcome']; ?></h3></td>
 		<?php } else { ?>
-		<td colspan="3"><h3><?php echo $PALANG['pAdminAdd_domain_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php echo $LANG['AdminAdd_domain_welcome']; ?></h3></td>
 		<?php } ?>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_domain_domain'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_domain'] . ":"; ?></td>
 		<?php if ($action == 'edit') { ?>
 		<td><input class="flat" type="hidden" name="domain" value="<?php echo $domain; ?>" /><?php print $domain; ?></td>
 		<?php } else { ?>
@@ -18,22 +18,22 @@
 		<?php } ?>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_domain_description'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_description'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="description" value="<?php echo $description ?? ''; ?>" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_domain_aliases'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_aliases'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="aliases" value="<?php echo $aliases ?? ALIASES; ?>" /></td>
-		<td><?php echo $PALANG['pAdminAdd_domain_aliases_text']; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_aliases_text']; ?></td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pAdminAdd_domain_mailboxes'] . ":"; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_mailboxes'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="mailboxes" value="<?php echo $mailboxes ?? MAILBOXES; ?>" /></td>
-		<td><?php echo $PALANG['pAdminAdd_domain_mailboxes_text']; ?></td>
+		<td><?php echo $LANG['AdminAdd_domain_mailboxes_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $PALANG['pAdminAdd_domain_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['AdminAdd_domain_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php echo $message ?? '&nbsp;'; ?></td>
blob - 7124d538d44fce3085204e19dc85f8538feda186
blob + 47d31ee2c6687843f1a01abe9f6255859a729c5c
--- templates/admin_list-admin.tpl
+++ templates/admin_list-admin.tpl
@@ -3,9 +3,9 @@ if (count($list_admins) > 0) {
 
 	echo "<table id=\"admin_table\">\n";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pAdminList_admin_username'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_admin_count'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_admin_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_admin_username'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_admin_count'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_admin_modified'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 
@@ -15,8 +15,8 @@ if (count($list_admins) > 0) {
 		echo "		<td><a href=\"list-domain.php?username=" . $row['username'] . "\">" . $row['username'] . "</a></td>";
 		echo "		<td>" . $row['domain_count'] . "</td>";
 		echo "		<td>" . $row['modified'] . "</td>";
-		echo "		<td><a href=\"admin.php?action=edit&username=" . $row['username'] . "\">" . $PALANG['edit'] . "</a></td>";
-		echo "		<td><a href=\"delete.php?table=admin&where=username&delete=" . $row['username'] . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pAdminList_admin_username'] . ": " . $row['username'] . "')\">" . $PALANG['del'] . "</a></td>";
+		echo "		<td><a href=\"admin.php?action=edit&username=" . $row['username'] . "\">" . $LANG['edit'] . "</a></td>";
+		echo "		<td><a href=\"delete.php?table=admin&where=username&delete=" . $row['username'] . "\" onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['AdminList_admin_username'] . ": " . $row['username'] . "')\">" . $LANG['del'] . "</a></td>";
 		echo "	</tr>\n";
 	}
 	echo "</table>\n";
blob - e1fb4391143a51818ff333881ce1a4648b07be97
blob + 2338630383156dbebde1231b158b330dbfa9f646
--- templates/admin_list-domain.tpl
+++ templates/admin_list-domain.tpl
@@ -11,7 +11,7 @@ if (count($list_admins) > 0) {
 }
 ?>
 </select>
-<input class="button" type="submit" name="go" value="<?php echo $PALANG['pOverview_button']; ?>" />
+<input class="button" type="submit" name="go" value="<?php echo $LANG['Overview_button']; ?>" />
 </form>
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search" size="25">
@@ -21,11 +21,11 @@ if (count($list_admins) > 0) {
 if (count($list_domains) > 0) {
 	echo "<table id=\"admin_table\">\n";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pAdminList_domain_domain'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_domain_description'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_domain_aliases'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_domain_mailboxes'] . "</td>\n";
-	echo "		<td>" . $PALANG['pAdminList_domain_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_domain_domain'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_domain_description'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_domain_aliases'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_domain_mailboxes'] . "</td>\n";
+	echo "		<td>" . $LANG['AdminList_domain_modified'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 	foreach ($list_domains as $row) {
@@ -35,8 +35,8 @@ if (count($list_domains) > 0) {
 		echo "<td>" . $row['alias_count'] . " / " . $row['aliases'] . "</td>";
 		echo "<td>" . $row['mailbox_count'] . " / " . $row['mailboxes'] . "</td>";
 		echo "<td>" . $row['modified'] . "</td>";
-		echo "<td><a href=\"domain.php?action=edit&domain=" . $row['domain'] . "\">" . $PALANG['edit'] . "</a></td>";
-		echo "<td><a href=\"delete.php?table=domain&domain=" . $row['domain'] . "\" onclick=\"return confirm ('" . $PALANG['confirm_domain'] . $PALANG['pAdminList_admin_domain'] . ": " . $row['domain'] . "')\">" . $PALANG['del'] . "</a></td>";
+		echo "<td><a href=\"domain.php?action=edit&domain=" . $row['domain'] . "\">" . $LANG['edit'] . "</a></td>";
+		echo "<td><a href=\"delete.php?table=domain&domain=" . $row['domain'] . "\" onclick=\"return confirm ('" . $LANG['confirm_domain'] . $LANG['AdminList_admin_domain'] . ": " . $row['domain'] . "')\">" . $LANG['del'] . "</a></td>";
 		echo "</tr>\n";
 	}
 
blob - 3e01f1eaa3d834ed357b88c8626dcf7703fb2988
blob + 15489d232cf022c9ce4576bcf214914b3779a3bd
--- templates/admin_list-virtual.tpl
+++ templates/admin_list-virtual.tpl
@@ -12,12 +12,12 @@ if (count($list_domains) > 0) {
 ?>
 </select>
 <input type="hidden" name="limit" value="0">
-<input type="submit" name="go" value="<?php print $PALANG['pAdminList_virtual_button']; ?>" />
+<input type="submit" name="go" value="<?php print $LANG['AdminList_virtual_button']; ?>" />
 </form>
 
-<h4><?php print $PALANG['pAdminList_virtual_welcome'] . $domain; ?></h4>
-<p><?php print $PALANG['pAdminList_virtual_alias_alias_count'] . ": " . $list_domains[$selected_domain]['alias_count'] . " / " . $list_domains[$selected_domain]['aliases']; ?></p>
-<p><?php print $PALANG['pAdminList_virtual_alias_mailbox_count'] . ": " . $list_domains[$selected_domain]['mailbox_count'] . " / " . $list_domains[$selected_domain]['mailboxes']; ?></p>
+<h4><?php print $LANG['AdminList_virtual_welcome'] . $domain; ?></h4>
+<p><?php print $LANG['AdminList_virtual_alias_alias_count'] . ": " . $list_domains[$selected_domain]['alias_count'] . " / " . $list_domains[$selected_domain]['aliases']; ?></p>
+<p><?php print $LANG['AdminList_virtual_alias_mailbox_count'] . ": " . $list_domains[$selected_domain]['mailbox_count'] . " / " . $list_domains[$selected_domain]['mailboxes']; ?></p>
 
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search" size="25">
@@ -29,26 +29,26 @@ if ($list_domains[$selected_domain]['alias_count'] > $
 	echo "<div id=\"nav_bar\">\n";
 	if ($offset >= $limit) {
 
-		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"../images/arrow-l.png\" title=\"" . $PALANG['pOverview_left_arrow'] . "\"></a>\n";
+		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"../images/arrow-l.png\" title=\"" . $LANG['Overview_left_arrow'] . "\"></a>\n";
 	}
 	if (($list_domains[$selected_domain]['alias_count'] > $limit) || ($list_domains[$selected_domain]['mailbox_count'] > $limit)) {
 
-		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=0\"><img border=\"0\" src=\"../images/arrow-u.png\" title=\"" . $PALANG['pOverview_up_arrow'] . "\"></a>\n";
+		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=0\"><img border=\"0\" src=\"../images/arrow-u.png\" title=\"" . $LANG['Overview_up_arrow'] . "\"></a>\n";
 	}		
 	if ((($offset + $limit) < $list_domains[$selected_domain]['alias_count']) || (($offset + $limit) < $list_domains[$selected_domain]['mailbox_count'])) {
-		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"../images/arrow-r.png\" title=\"" . $PALANG['pOverview_right_arrow'] . "\"></a>\n";
+		echo "<a href=\"list-virtual.php?domain=" . $list_domains[$selected_domain]['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"../images/arrow-r.png\" title=\"" . $LANG['Overview_right_arrow'] . "\"></a>\n";
 	}
 	echo "</div>\n";
 }
 if (count($list_alias) > 0) {
 	print "<table id=\"alias_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"5\"><h3>" . $PALANG['pOverview_alias_title'] . "</h3></td>";
+	print "		<td colspan=\"5\"><h3>" . $LANG['Overview_alias_title'] . "</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_alias_address'] . "</td>\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_alias_goto'] . "</td>\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_alias_modified'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_alias_address'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_alias_goto'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_alias_modified'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -57,8 +57,8 @@ if (count($list_alias) > 0) {
 			print "		<td>" . $row['address'] . "</td>\n";
 			print "		<td>" . preg_replace("/,/", "<br>", $row['goto']) . "</td>\n";
 			print "		<td>" . $row['modified'] . "</td>\n";
-			print "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-			print "		<td><a href=\"delete.php?table=alias" . "&delete=" . $row['address'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			print "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+			print "		<td><a href=\"delete.php?table=alias" . "&delete=" . $row['address'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			print "	</tr>\n";
 	}
 	print "</table>\n";
@@ -67,12 +67,12 @@ if (count($list_alias) > 0) {
 if (count($list_mailbox) > 0) {
 	print "<table id=\"mailbox_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"7\"><h3>" . $PALANG['pOverview_mailbox_title'] . "</h3></td>";
+	print "		<td colspan=\"7\"><h3>" . $LANG['Overview_mailbox_title'] . "</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_mailbox_username'] . "</td>\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_mailbox_name'] . "</td>\n";
-	print "		<td>" . $PALANG['pAdminList_virtual_mailbox_modified'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_mailbox_username'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_mailbox_name'] . "</td>\n";
+	print "		<td>" . $LANG['AdminList_virtual_mailbox_modified'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -81,8 +81,8 @@ if (count($list_mailbox) > 0) {
 			print "		<td>" . $row['username'] . "</td>\n";
 			print "		<td>" . $row['name'] . "</td>\n";
 			print "		<td>" . $row['modified'] . "</td>\n";
-			print "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-			print "		<td><a href=\"delete.php?table=mailbox" . "&delete=" . $row['username'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			print "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+			print "		<td><a href=\"delete.php?table=mailbox" . "&delete=" . $row['username'] . "&domain=" . $list_domains[$selected_domain]['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			print "	</tr>\n";
 	}
 	print "</table>\n";
blob - 0ae9a8e776346a3a802ef26555c9cdc1cf585d69
blob + 98148d6b36e8b1bf2326baed5731d4e07a5c9d4d
--- templates/admin_menu.tpl
+++ templates/admin_menu.tpl
@@ -1,13 +1,13 @@
 <div id="menu">
 <ul>
-	<li><a target="_top" href="list-admin.php"><?php echo $PALANG['pAdminMenu_list_admin']; ?></a></li>
-	<li><a target="_top" href="list-domain.php"><?php echo $PALANG['pAdminMenu_list_domain']; ?></a></li>
-	<li><a target="_top" href="list-virtual.php"><?php echo $PALANG['pAdminMenu_list_virtual']; ?></a></li>
-	<li><a target="_top" href="viewlog.php"><?php echo $PALANG['pAdminMenu_viewlog']; ?></a></li>
-	<li><a target="_top" href="backup.php"><?php echo $PALANG['pAdminMenu_backup']; ?></a></li>
-	<li><a target="_top" href="domain.php"><?php echo $PALANG['pAdminMenu_create_domain']; ?></a></li>
-	<li><a target="_top" href="admin.php"><?php echo $PALANG['pAdminMenu_create_admin']; ?></a></li>
-	<li><a target="_top" href="add-alias.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $PALANG['pAdminMenu_create_alias']; ?></a></li>
-	<li><a target="_top" href="add-mailbox.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $PALANG['pAdminMenu_create_mailbox']; ?></a></li>
+	<li><a target="_top" href="list-admin.php"><?php echo $LANG['AdminMenu_list_admin']; ?></a></li>
+	<li><a target="_top" href="list-domain.php"><?php echo $LANG['AdminMenu_list_domain']; ?></a></li>
+	<li><a target="_top" href="list-virtual.php"><?php echo $LANG['AdminMenu_list_virtual']; ?></a></li>
+	<li><a target="_top" href="viewlog.php"><?php echo $LANG['AdminMenu_viewlog']; ?></a></li>
+	<li><a target="_top" href="backup.php"><?php echo $LANG['AdminMenu_backup']; ?></a></li>
+	<li><a target="_top" href="domain.php"><?php echo $LANG['AdminMenu_create_domain']; ?></a></li>
+	<li><a target="_top" href="admin.php"><?php echo $LANG['AdminMenu_create_admin']; ?></a></li>
+	<li><a target="_top" href="add-alias.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $LANG['AdminMenu_create_alias']; ?></a></li>
+	<li><a target="_top" href="add-mailbox.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $LANG['AdminMenu_create_mailbox']; ?></a></li>
 </ul>
 </div>
blob - 9c020e12220f4926e80dcc2ff5e955fc81c7217a
blob + c63b6982626e283821d985c78e7095d7b4d1a37e
--- templates/admin_search.tpl
+++ templates/admin_search.tpl
@@ -1,5 +1,5 @@
 <div id="overview">
-<h4><?php print $PALANG['pSearch_welcome'] . $search; ?></h4>
+<h4><?php print $LANG['Search_welcome'] . $search; ?></h4>
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search">
 </form>
@@ -8,12 +8,12 @@
 if (count($list_alias) > 0) {
 	print "<table id=\"alias_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"5\"><h3>".$PALANG['pOverview_alias_title']."</h3></td>";
+	print "		<td colspan=\"5\"><h3>".$LANG['Overview_alias_title']."</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_address'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_goto'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_modified'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -22,8 +22,8 @@ if (count($list_alias) > 0) {
 		print "		<td>" . $row['address'] . "</td>\n";
 		print "		<td>" . preg_replace("/,/", "<br>", $row['goto']) . "</td>\n";
 		print "		<td>" . $row['modified'] . "</td>\n";
-		print "		<td><a href=\"edit-alias.php?action=edit&address=" . $row['address'] . "&domain=" . $row['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-		print "		<td><a href=\"delete.php?table=alias&delete=" . $row['address'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+		print "		<td><a href=\"edit-alias.php?action=edit&address=" . $row['address'] . "&domain=" . $row['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+		print "		<td><a href=\"delete.php?table=alias&delete=" . $row['address'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 		print "	</tr>\n";
 	}
 	print "</table>\n";
@@ -32,12 +32,12 @@ if (count($list_alias) > 0) {
 if (count($list_mailbox) > 0) {
 	print "<table id=\"mailbox_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"7\"><h3>".$PALANG['pOverview_mailbox_title']."</h3></td>";
+	print "		<td colspan=\"7\"><h3>".$LANG['Overview_mailbox_title']."</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_username'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_name'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_modified'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_username'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_name'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_modified'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -45,8 +45,8 @@ if (count($list_mailbox) > 0) {
 		print "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
 		print "		<td>" . $row['username'] . "</td>\n";
 		print "		<td>" . $row['name'] . "</td>\n";
-		print "		<td><a href=\"edit-mailbox.php?action=edit&username=" . $row['username'] . "&domain=" . $row['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-		print "		<td><a href=\"delete.php?table=mailbox&delete=" . $row['username'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+		print "		<td><a href=\"edit-mailbox.php?action=edit&username=" . $row['username'] . "&domain=" . $row['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+		print "		<td><a href=\"delete.php?table=mailbox&delete=" . $row['username'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $LANG['del'] . "</a></td>\n";
 		print "	</tr>\n";
 	}
 	print "</table>\n";
blob - c8ca0b248b7181b22151e86ad5eb04de535b6005
blob + bf573c0b6198fde45f6b4d768ef48a19af98e03b
--- templates/create-alias.tpl
+++ templates/create-alias.tpl
@@ -2,10 +2,10 @@
 <form name="create_alias" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php echo $PALANG['pCreate_alias_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php echo $LANG['Create_alias_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pCreate_alias_address']; ?></td>
+		<td><?php echo $LANG['Create_alias_address']; ?></td>
 		<td><input class="flat" type="text" name="address" value="<?php echo $address ?? ''; ?>" /></td>
 		<td>
 		<select class="flat" name="domain">
@@ -21,12 +21,12 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php echo $PALANG['pCreate_alias_goto'] . ":"; ?></td>
+		<td><?php echo $LANG['Create_alias_goto'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="goto" value="<?php echo $goto ?? ''; ?>" /></td>
-		<td><?php echo $PALANG['pCreate_alias_goto_text']; ?></td>
+		<td><?php echo $LANG['Create_alias_goto_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $PALANG['pCreate_alias_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Create_alias_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php echo $message ?? '&nbsp;'; ?></td>
blob - b6c680f1567f366eeed3cd60430986ec53ac2801
blob + 18db241bf4db20f53ff19b6ee50b42efa60ec0b4
--- templates/create-mailbox.tpl
+++ templates/create-mailbox.tpl
@@ -2,10 +2,10 @@
 <form name="create_mailbox" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pCreate_mailbox_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Create_mailbox_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_username'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_username'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
 		<td>
 		<select name="fDomain">
@@ -23,39 +23,39 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_password'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td><?php print $pCreate_mailbox_password_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_password2'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_name'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_name'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fName" value="<?php print $tName; ?>" /></td>
 		<td><?php print $pCreate_mailbox_name_text; ?></td>
 	</tr>
 	<?php if ($CONF['quota'] == 'YES') { ?>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_quota'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_quota'] . ":"; ?></td>
 		<td><input type="text" name="fQuota" value="<?php print $tQuota; ?>" /></td>
 		<td><?php print $pCreate_mailbox_quota_text; ?></td>
 	<tr>
 	<?php } ?>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_active'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_active'] . ":"; ?></td>
 		<td><input class="flat" type="checkbox" name="fActive" checked /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_mail'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_mail'] . ":"; ?></td>
 		<td><input class="flat" type="checkbox" name="fMail" checked /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pCreate_mailbox_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Create_mailbox_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 69c21a9c3328d972c4be2a215f9beb8754d0a4ee
blob + 74e52a911fff13d1b1785de683bfbe8f67efa09c
--- templates/edit-alias.tpl
+++ templates/edit-alias.tpl
@@ -2,15 +2,15 @@
 <form name="edit_alias" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pEdit_alias_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Edit_alias_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_alias_address'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_alias_address'] . ":"; ?></td>
 		<td><?php print $fAddress; ?></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_alias_goto'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_alias_goto'] . ":"; ?></td>
 		<td>
 <textarea class="flat" rows="10" cols="60" name="fGoto">
 <?php
@@ -25,7 +25,7 @@ for ($i = 0 ; $i < count($array) ; $i++) {
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pEdit_alias_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Edit_alias_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 929d046b1916ec525e4e0dd6d1811282d0ffa9a0
blob + 26debaf5046638ec32fddbe69ffb8ccc29096772
--- templates/edit-mailbox.tpl
+++ templates/edit-mailbox.tpl
@@ -2,42 +2,42 @@
 <form name="edit_mailbox" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pEdit_mailbox_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Edit_mailbox_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_mailbox_username']; ?></td>
+		<td><?php print $LANG['Edit_mailbox_username']; ?></td>
 		<td><?php print $fUsername; ?></td>
 		<td><?php print $pEdit_mailbox_username_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_mailbox_password'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_mailbox_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td><?php print $pEdit_mailbox_password_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_mailbox_password2'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_mailbox_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_mailbox_name'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_mailbox_name'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fName" value="<?php print htmlspecialchars($tName,ENT_QUOTES); ?>" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<?php if ($CONF['quota'] == 'YES') { ?>
 	<tr>
-		<td><?php print $PALANG['pEdit_mailbox_quota'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_mailbox_quota'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fQuota" value="<?php print $tQuota; ?>" /></td>
 		<td><?php print $pEdit_mailbox_quota_text; ?></td>
 	</tr>
 	<?php } ?>
 	<tr>
-		<td><?php print $PALANG['pCreate_mailbox_active'] . ":"; ?></td>
+		<td><?php print $LANG['Create_mailbox_active'] . ":"; ?></td>
 		<td><input class="flat" type="checkbox" name="fActive" <?php print (!empty($tActive)) ? 'checked' : '' ?> ></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="flat" type="submit" name="submit" value="<?php print $PALANG['pEdit_mailbox_button']; ?>" ></td>
+		<td colspan="3" class="hlp_center"><input class="flat" type="submit" name="submit" value="<?php print $LANG['Edit_mailbox_button']; ?>" ></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - aaff17bea3f69dff9984a52be0bdc91d1c184f46
blob + 580f97bbc683a7a5d67a024525b5da924b098a5f
--- templates/header.tpl
+++ templates/header.tpl
@@ -8,7 +8,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php print isset($PALANG['charset']) ? $PALANG['charset'] : 'iso-8859-1' ?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php print isset($LANG['charset']) ? $LANG['charset'] : 'iso-8859-1' ?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <?php
 if (file_exists(realpath("./stylesheet.css"))) print "<link rel=\"stylesheet\" href=\"stylesheet.css\">\n";
blob - a91dc97f799e6e8205bea764cf3046860352e1f8
blob + 45a9ed4916d0aa53bccb53a47c9adeffa840d95c
--- templates/list-domains.tpl
+++ templates/list-domains.tpl
@@ -6,18 +6,18 @@ Search: <input type="textbox" name="search" size="25">
 <?php
 echo "<table id=\"overview_table\">\n";
 echo "	<tr>\n";
-echo "		<td colspan=\"5\"><h3>".$PALANG['pOverview_title']."</h3></td>";
+echo "		<td colspan=\"5\"><h3>".$LANG['Overview_title']."</h3></td>";
 echo "	</tr>";
 echo "	<tr class=\"header\">\n";
-echo "		<td>" . $PALANG['pOverview_get_domain'] . "</td>\n";
-echo "		<td>" . $PALANG['pOverview_get_aliases'] . "</td>\n";
-echo "		<td>" . $PALANG['pOverview_get_mailboxes'] . "</td>\n";
+echo "		<td>" . $LANG['Overview_get_domain'] . "</td>\n";
+echo "		<td>" . $LANG['Overview_get_aliases'] . "</td>\n";
+echo "		<td>" . $LANG['Overview_get_mailboxes'] . "</td>\n";
 echo "	</tr>\n";
 foreach ($list_domains as $row) {
-	if ($row['aliases'] == 0) $row['aliases'] = $PALANG['pOverview_unlimited'];
-	if ($row['mailboxes'] == 0) $row['mailboxes'] = $PALANG['pOverview_unlimited'];
-	if ($row['aliases'] < 0) $row['aliases'] = $PALANG['pOverview_disabled'];
-	if ($row['mailboxes'] < 0) $row['mailboxes'] = $PALANG['pOverview_disabled'];
+	if ($row['aliases'] == 0) $row['aliases'] = $LANG['Overview_unlimited'];
+	if ($row['mailboxes'] == 0) $row['mailboxes'] = $LANG['Overview_unlimited'];
+	if ($row['aliases'] < 0) $row['aliases'] = $LANG['Overview_disabled'];
+	if ($row['mailboxes'] < 0) $row['mailboxes'] = $LANG['Overview_disabled'];
 	echo "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
 	echo "		<td><a href=\"list-virtuals.php?domain=" . $row['domain'] . "\">" . $row['domain'] . "</a></td>\n";
 	echo "		<td>" . $row['alias_count'] . " / " . $row['aliases'] . "</td>\n";
blob - 9b5e58375bb881fbf52f18fe7f4027cc5f00052a
blob + 4c3327ec82ff5a548939c12a8ae157c449e1167c
--- templates/list-virtuals.tpl
+++ templates/list-virtuals.tpl
@@ -9,21 +9,21 @@ if (count($list_domains) > 0) {
 		echo ">" . $row['domain'] . "</option>\n";
 	}
 }
-if ($list_domains[$domain_key]['aliases'] == 0) $list_domains[$domain_key]['aliases'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$domain_key]['aliases'] < 0) $list_domains[$domain_key]['aliases'] = $PALANG['pOverview_disabled'];
-if ($list_domains[$domain_key]['mailboxes'] == 0) $list_domains[$domain_key]['mailboxes'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$domain_key]['mailboxes'] < 0) $list_domains[$domain_key]['mailboxes'] = $PALANG['pOverview_disabled'];
-if ($list_domains[$domain_key]['maxquota'] == 0) $list_domains[$domain_key]['maxquota'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$domain_key]['maxquota'] < 0) $list_domains[$domain_key]['maxquota'] = $PALANG['pOverview_disabled'];
+if ($list_domains[$domain_key]['aliases'] == 0) $list_domains[$domain_key]['aliases'] = $LANG['Overview_unlimited'];
+if ($list_domains[$domain_key]['aliases'] < 0) $list_domains[$domain_key]['aliases'] = $LANG['Overview_disabled'];
+if ($list_domains[$domain_key]['mailboxes'] == 0) $list_domains[$domain_key]['mailboxes'] = $LANG['Overview_unlimited'];
+if ($list_domains[$domain_key]['mailboxes'] < 0) $list_domains[$domain_key]['mailboxes'] = $LANG['Overview_disabled'];
+if ($list_domains[$domain_key]['maxquota'] == 0) $list_domains[$domain_key]['maxquota'] = $LANG['Overview_unlimited'];
+if ($list_domains[$domain_key]['maxquota'] < 0) $list_domains[$domain_key]['maxquota'] = $LANG['Overview_disabled'];
 ?>
 </select>
 <input type="hidden" name="offset" value="0">
-<input class="button" type="submit" name="go" value="<?php echo $PALANG['pOverview_button']; ?>" />
+<input class="button" type="submit" name="go" value="<?php echo $LANG['Overview_button']; ?>" />
 </form>
 
-<h4><?php echo $PALANG['pOverview_welcome'] . $domain; ?></h4>
-<p><?php echo $PALANG['pOverview_alias_alias_count'] . ": " . $list_domains[$domain_key]['alias_count'] . " / " . $list_domains[$domain_key]['aliases']; ?></p>
-<p><?php echo $PALANG['pOverview_alias_mailbox_count'] . ": " . $list_domains[$domain_key]['mailbox_count'] . " / " . $list_domains[$domain_key]['mailboxes']; ?></p>
+<h4><?php echo $LANG['Overview_welcome'] . $domain; ?></h4>
+<p><?php echo $LANG['Overview_alias_alias_count'] . ": " . $list_domains[$domain_key]['alias_count'] . " / " . $list_domains[$domain_key]['aliases']; ?></p>
+<p><?php echo $LANG['Overview_alias_mailbox_count'] . ": " . $list_domains[$domain_key]['mailbox_count'] . " / " . $list_domains[$domain_key]['mailboxes']; ?></p>
 
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search" size="25">
@@ -34,14 +34,14 @@ if ($list_domains[$domain_key]['alias_count'] > $limit
 	echo "<div id=\"nav_bar\">\n";
 	if ($offset >= $limit) {
 
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $PALANG['pOverview_left_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $LANG['Overview_left_arrow'] . "\"></a>\n";
 	}
 	if (($list_domains[$domain_key]['alias_count'] > $limit) || ($list_domains[$domain_key]['mailbox_count'] > $limit)) {
 
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=0\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $PALANG['pOverview_up_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=0\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $LANG['Overview_up_arrow'] . "\"></a>\n";
 	}		
 	if ((($offset + $limit) < $list_domains[$domain_key]['alias_count']) || (($offset + $limit) < $list_domains[$domain_key]['mailbox_count'])) {
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $PALANG['pOverview_right_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $LANG['Overview_right_arrow'] . "\"></a>\n";
 	}
 	echo "</div>\n";
 }
@@ -49,12 +49,12 @@ if ($list_domains[$domain_key]['alias_count'] > $limit
 if (count($list_alias) > 0) {
 	echo "<table id=\"alias_table\">\n";
 	echo "	<tr>\n";
-	echo "		<td colspan=\"5\"><h3>".$PALANG['pOverview_alias_title']."</h3></td>";
+	echo "		<td colspan=\"5\"><h3>".$LANG['Overview_alias_title']."</h3></td>";
 	echo "	</tr>";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_address'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_goto'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_modified'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 
@@ -65,12 +65,12 @@ if (count($list_alias) > 0) {
 			echo "		<td>" . $row['modified'] . "</td>\n";
 
 			if ($CONF['special_alias_control'] == 'YES') {
-				echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $list_domains[$domain_key]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-				echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=" . $list_domains[$domain_key]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+				echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $list_domains[$domain_key]['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+				echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=" . $list_domains[$domain_key]['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			} else {
 				if (!in_array($row['goto'], $CONF['default_aliases'])) {
-					echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $row['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-					echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+					echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=" . $row['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+					echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=" . $row['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 				} else {
 					echo "		<td>&nbsp;</td>\n";
 					echo "		<td>&nbsp;</td>\n";
@@ -85,13 +85,13 @@ if (count($list_alias) > 0) {
 if (count($list_mailbox) > 0) {
 	echo "<table id=\"mailbox_table\">\n";
 	echo "	<tr>\n";
-	echo "		<td colspan=\"7\"><h3>".$PALANG['pOverview_mailbox_title']."</h3></td>";
+	echo "		<td colspan=\"7\"><h3>".$LANG['Overview_mailbox_title']."</h3></td>";
 	echo "	</tr>";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_username'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_name'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_modified'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_active'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_username'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_name'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_active'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 
@@ -100,8 +100,8 @@ if (count($list_mailbox) > 0) {
 			echo "		<td>" . $row['username'] . "</td>\n";
 			echo "		<td>" . $row['name'] . "</td>\n";
 			echo "		<td>" . $row['modified'] . "</td>\n";
-			echo "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n";
-			echo "		<td><a href=\"delete.php?delete=" . $row['username'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			echo "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=$fDomain" . "\">" . $LANG['edit'] . "</a></td>\n";
+			echo "		<td><a href=\"delete.php?delete=" . $row['username'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			echo "	</tr>\n";
 	}
 	echo "</table>\n";
blob - 9b5a0f0f010ababfebb2687c93c2132c4db1d3d5
blob + 9853f1a85084bae42064b3885b62a5ffd7acc0b1
--- templates/login.tpl
+++ templates/login.tpl
@@ -2,24 +2,24 @@
 <form name="login" method="post">
 <table id="login_table" cellspacing="10">
 	<tr>
-		<td colspan="2"><h4><?php print $PALANG['pLogin_welcome']; ?></h4></td>
+		<td colspan="2"><h4><?php print $LANG['Login_welcome']; ?></h4></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pLogin_username'] . ":"; ?></td>
+		<td><?php print $LANG['Login_username'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pLogin_password'] . ":"; ?></td>
+		<td><?php print $LANG['Login_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 	</tr>
 	<tr>
-		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pLogin_button']; ?>" /></td>
+		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Login_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="2" class="standout"><?php print $tMessage; ?></td>
 	</tr>
 	<tr>
-		<td colspan="2"><a href="users/"><?php print $PALANG['pLogin_login_users']; ?></a></td>
+		<td colspan="2"><a href="users/"><?php print $LANG['Login_login_users']; ?></a></td>
 	</tr>
 </table>
 </form>
blob - 19e083edbeb83c073a2009fe914d25047da1a658
blob + 8119e66ed3842365cc70e0442e5316a6552cd833
--- templates/main.tpl
+++ templates/main.tpl
@@ -1,32 +1,32 @@
 <div id="main_menu">
 <table>
 	<tr>
-		<td nowrap><a target="_top" href="list-domains.php"><?php print $PALANG['pMenu_overview']; ?></a></td>
-		<td><?php print $PALANG['pMain_overview']; ?></td>
+		<td nowrap><a target="_top" href="list-domains.php"><?php print $LANG['Menu_overview']; ?></a></td>
+		<td><?php print $LANG['Main_overview']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="create-alias.php"><?php print $PALANG['pMenu_create_alias']; ?></a></td>
-		<td><?php print $PALANG['pMain_create_alias']; ?></td>
+		<td nowrap><a target="_top" href="create-alias.php"><?php print $LANG['Menu_create_alias']; ?></a></td>
+		<td><?php print $LANG['Main_create_alias']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="create-mailbox.php"><?php print $PALANG['pMenu_create_mailbox']; ?></a></td>
-		<td><?php print $PALANG['pMain_create_mailbox']; ?></td>
+		<td nowrap><a target="_top" href="create-mailbox.php"><?php print $LANG['Menu_create_mailbox']; ?></a></td>
+		<td><?php print $LANG['Main_create_mailbox']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="sendmail.php"><?php print $PALANG['pMenu_sendmail']; ?></a></td>
-		<td><?php print $PALANG['pMain_sendmail']; ?></td>
+		<td nowrap><a target="_top" href="sendmail.php"><?php print $LANG['Menu_sendmail']; ?></a></td>
+		<td><?php print $LANG['Main_sendmail']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php print $PALANG['pMenu_password']; ?></a></td>
-		<td><?php print $PALANG['pMain_password']; ?></td>
+		<td nowrap><a target="_top" href="password.php"><?php print $LANG['Menu_password']; ?></a></td>
+		<td><?php print $LANG['Main_password']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="viewlog.php"><?php print $PALANG['pMenu_viewlog']; ?></a></td>
-		<td><?php print $PALANG['pMain_viewlog']; ?></td>
+		<td nowrap><a target="_top" href="viewlog.php"><?php print $LANG['Menu_viewlog']; ?></a></td>
+		<td><?php print $LANG['Main_viewlog']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php print $PALANG['pMenu_logout']; ?></a></td>
-		<td><?php print $PALANG['pMain_logout']; ?></td>
+		<td nowrap><a target="_top" href="logout.php"><?php print $LANG['Menu_logout']; ?></a></td>
+		<td><?php print $LANG['Main_logout']; ?></td>
 	</tr>
 </table>
 /div>
blob - 7b49e1a86794d0751396d6da00ee4c3cf3533e06
blob + 713b5bbcc7d95dbb55926370afb2b6b2ba9a708c
--- templates/menu.tpl
+++ templates/menu.tpl
@@ -1,12 +1,12 @@
 <div id="menu">
 <ul>
-	<li><a target="_top" href="list-domains.php"><?php print $PALANG['pMenu_overview']; ?></a></li>
-	<li><a target="_top" href="create-alias.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $PALANG['pMenu_create_alias']; ?></a></li>
-	<li><a target="_top" href="create-mailbox.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $PALANG['pMenu_create_mailbox']; ?></a></li>
-	<li><a target="_top" href="sendmail.php"><?php print $PALANG['pMenu_sendmail']; ?></a></li>
-	<li><a target="_top" href="password.php"><?php print $PALANG['pMenu_password']; ?></a></li>
-	<li><a target="_top" href="viewlog.php"><?php print $PALANG['pMenu_viewlog']; ?></a></li>
-	<li><a target="_top" href="logout.php"><?php print $PALANG['pMenu_logout']; ?></a></li>
+	<li><a target="_top" href="list-domains.php"><?php print $LANG['Menu_overview']; ?></a></li>
+	<li><a target="_top" href="create-alias.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $LANG['Menu_create_alias']; ?></a></li>
+	<li><a target="_top" href="create-mailbox.php<?php if (isset($domain)) echo '?domain=' . $domain; ?>"><?php echo $LANG['Menu_create_mailbox']; ?></a></li>
+	<li><a target="_top" href="sendmail.php"><?php print $LANG['Menu_sendmail']; ?></a></li>
+	<li><a target="_top" href="password.php"><?php print $LANG['Menu_password']; ?></a></li>
+	<li><a target="_top" href="viewlog.php"><?php print $LANG['Menu_viewlog']; ?></a></li>
+	<li><a target="_top" href="logout.php"><?php print $LANG['Menu_logout']; ?></a></li>
 </ul>
 </div>
 <?php
blob - ac41c3d497a7385b7e13a3c450597286899ae6a6
blob + 6a93afd451200e0ba3bd5f07ecee8789ed767e18
--- templates/overview-get.tpl
+++ templates/overview-get.tpl
@@ -11,7 +11,7 @@ for ($i = 0; $i < count($list_domains); $i++) {
 }
 ?>
 </select>
-<input class="button" type="submit" name="go" value="<?php print $PALANG['pOverview_button']; ?>" />
+<input class="button" type="submit" name="go" value="<?php print $LANG['Overview_button']; ?>" />
 </form>
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search" size="10">
@@ -20,25 +20,25 @@ for ($i = 0; $i < count($list_domains); $i++) {
 <?php
 	print "<table id=\"overview_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"5\"><h3>".$PALANG['pOverview_title']."</h3></td>";
+	print "		<td colspan=\"5\"><h3>".$LANG['Overview_title']."</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pOverview_get_domain'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_get_aliases'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_get_mailboxes'] . "</td>\n";
-	if ($CONF['quota'] == 'YES') print "		<td>" . $PALANG['pOverview_get_quota'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_get_domain'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_get_aliases'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_get_mailboxes'] . "</td>\n";
+	if ($CONF['quota'] == 'YES') print "		<td>" . $LANG['Overview_get_quota'] . "</td>\n";
 	print "	</tr>\n";
 
 	for ($i = 0; $i < count($list_domains); $i++) {
 		if ((is_array($list_domains) and count($list_domains) > 0)) {
 			$limit = get_domain_properties($list_domains[$i]);
 
-			if ($limit['aliases'] == 0) $limit['aliases'] = $PALANG['pOverview_unlimited'];
-			if ($limit['mailboxes'] == 0) $limit['mailboxes'] = $PALANG['pOverview_unlimited'];
-			if ($limit['maxquota'] == 0) $limit['maxquota'] = $PALANG['pOverview_unlimited'];
-			if ($limit['aliases'] < 0) $limit['aliases'] = $PALANG['pOverview_disabled'];
-			if ($limit['mailboxes'] < 0) $limit['mailboxes'] = $PALANG['pOverview_disabled'];
-			if ($limit['maxquota'] < 0) $limit['maxquota'] = $PALANG['pOverview_disabled'];
+			if ($limit['aliases'] == 0) $limit['aliases'] = $LANG['Overview_unlimited'];
+			if ($limit['mailboxes'] == 0) $limit['mailboxes'] = $LANG['Overview_unlimited'];
+			if ($limit['maxquota'] == 0) $limit['maxquota'] = $LANG['Overview_unlimited'];
+			if ($limit['aliases'] < 0) $limit['aliases'] = $LANG['Overview_disabled'];
+			if ($limit['mailboxes'] < 0) $limit['mailboxes'] = $LANG['Overview_disabled'];
+			if ($limit['maxquota'] < 0) $limit['maxquota'] = $LANG['Overview_disabled'];
 
 			print "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
 			print "		<td><a href=\"overview.php?domain=" . $list_domains[$i] . "\">" . $list_domains[$i] . "</a></td>\n";
blob - c038161d72d3e1ed997d170b2d40411f3de2f76e
blob + 70e585765cef38b3ff8cfac6fd6a723b67ea0363
--- templates/overview.tpl
+++ templates/overview.tpl
@@ -9,21 +9,21 @@ if (count($list_domains) > 0) {
 		echo ">" . $row['domain'] . "</option>\n";
 	}
 }
-if ($list_domains[$selected_domain]['aliases'] == 0) $list_domains[$selected_domain]['aliases'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$selected_domain]['aliases'] < 0) $list_domains[$selected_domain]['aliases'] = $PALANG['pOverview_disabled'];
-if ($list_domains[$selected_domain]['mailboxes'] == 0) $list_domains[$selected_domain]['mailboxes'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$selected_domain]['mailboxes'] < 0) $list_domains[$selected_domain]['mailboxes'] = $PALANG['pOverview_disabled'];
-if ($list_domains[$selected_domain]['maxquota'] == 0) $list_domains[$selected_domain]['maxquota'] = $PALANG['pOverview_unlimited'];
-if ($list_domains[$selected_domain]['maxquota'] < 0) $list_domains[$selected_domain]['maxquota'] = $PALANG['pOverview_disabled'];
+if ($list_domains[$selected_domain]['aliases'] == 0) $list_domains[$selected_domain]['aliases'] = $LANG['Overview_unlimited'];
+if ($list_domains[$selected_domain]['aliases'] < 0) $list_domains[$selected_domain]['aliases'] = $LANG['Overview_disabled'];
+if ($list_domains[$selected_domain]['mailboxes'] == 0) $list_domains[$selected_domain]['mailboxes'] = $LANG['Overview_unlimited'];
+if ($list_domains[$selected_domain]['mailboxes'] < 0) $list_domains[$selected_domain]['mailboxes'] = $LANG['Overview_disabled'];
+if ($list_domains[$selected_domain]['maxquota'] == 0) $list_domains[$selected_domain]['maxquota'] = $LANG['Overview_unlimited'];
+if ($list_domains[$selected_domain]['maxquota'] < 0) $list_domains[$selected_domain]['maxquota'] = $LANG['Overview_disabled'];
 ?>
 </select>
 <input type="hidden" name="offset" value="0">
-<input class="button" type="submit" name="go" value="<?php echo $PALANG['pOverview_button']; ?>" />
+<input class="button" type="submit" name="go" value="<?php echo $LANG['Overview_button']; ?>" />
 </form>
 
-<h4><?php echo $PALANG['pOverview_welcome'] . $_GET['domain']; ?></h4>
-<p><?php echo $PALANG['pOverview_alias_alias_count'] . ": " . $list_domains[$selected_domain]['alias_count'] . " / " . $list_domains[$selected_domain]['aliases']; ?></p>
-<p><?php echo $PALANG['pOverview_alias_mailbox_count'] . ": " . $list_domains[$selected_domain]['mailbox_count'] . " / " . $list_domains[$selected_domain]['mailboxes']; ?></p>
+<h4><?php echo $LANG['Overview_welcome'] . $_GET['domain']; ?></h4>
+<p><?php echo $LANG['Overview_alias_alias_count'] . ": " . $list_domains[$selected_domain]['alias_count'] . " / " . $list_domains[$selected_domain]['aliases']; ?></p>
+<p><?php echo $LANG['Overview_alias_mailbox_count'] . ": " . $list_domains[$selected_domain]['mailbox_count'] . " / " . $list_domains[$selected_domain]['mailboxes']; ?></p>
 
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search" size="25">
@@ -34,14 +34,14 @@ if ($list_domains[$selected_domain]['alias_count'] > $
 	echo "<div id=\"nav_bar\">\n";
 	if ($offset >= $limit) {
 
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $PALANG['pOverview_left_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset - $limit) . "\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $LANG['Overview_left_arrow'] . "\"></a>\n";
 	}
 	if (($list_domains[$selected_domain]['alias_count'] > $limit) || ($list_domains[$selected_domain]['mailbox_count'] > $limit)) {
 
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=0\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $PALANG['pOverview_up_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=0\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $LANG['Overview_up_arrow'] . "\"></a>\n";
 	}		
 	if ((($offset + $limit) < $list_domains[$selected_domain]['alias_count']) || (($offset + $limit) < $list_domains[$selected_domain]['mailbox_count'])) {
-		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $PALANG['pOverview_right_arrow'] . "\"></a>\n";
+		echo "<a href=\"overview.php?domain=" . $_GET['domain'] . "&offset=" . ($offset + $limit) . "\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $LANG['Overview_right_arrow'] . "\"></a>\n";
 	}
 	echo "</div>\n";
 }
@@ -49,12 +49,12 @@ if ($list_domains[$selected_domain]['alias_count'] > $
 if (count($list_alias) > 0) {
 	echo "<table id=\"alias_table\">\n";
 	echo "	<tr>\n";
-	echo "		<td colspan=\"5\"><h3>".$PALANG['pOverview_alias_title']."</h3></td>";
+	echo "		<td colspan=\"5\"><h3>".$LANG['Overview_alias_title']."</h3></td>";
 	echo "	</tr>";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_address'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_goto'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_alias_modified'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 
@@ -65,12 +65,12 @@ if (count($list_alias) > 0) {
 			echo "		<td>" . $row['modified'] . "</td>\n";
 
 			if ($CONF['special_alias_control'] == 'YES') {
-				echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n";
-				echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+				echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=fDomain" . "\">" . $LANG['edit'] . "</a></td>\n";
+				echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			} else {
 				if (!in_array($row['goto'], $CONF['default_aliases'])) {
-					echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n";
-					echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $row['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+					echo "		<td><a href=\"edit-alias.php?address=" . $row['address'] . "&domain=fDomain" . "\">" . $LANG['edit'] . "</a></td>\n";
+					echo "		<td><a href=\"delete.php?delete=" . $row['address'] . "&domain=fDomain" . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $row['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 				} else {
 					echo "		<td>&nbsp;</td>\n";
 					echo "		<td>&nbsp;</td>\n";
@@ -85,13 +85,13 @@ if (count($list_alias) > 0) {
 if (count($list_mailbox) > 0) {
 	echo "<table id=\"mailbox_table\">\n";
 	echo "	<tr>\n";
-	echo "		<td colspan=\"7\"><h3>".$PALANG['pOverview_mailbox_title']."</h3></td>";
+	echo "		<td colspan=\"7\"><h3>".$LANG['Overview_mailbox_title']."</h3></td>";
 	echo "	</tr>";
 	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_username'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_name'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_modified'] . "</td>\n";
-	echo "		<td>" . $PALANG['pOverview_mailbox_active'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_username'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_name'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_modified'] . "</td>\n";
+	echo "		<td>" . $LANG['Overview_mailbox_active'] . "</td>\n";
 	echo "		<td colspan=\"2\">&nbsp;</td>\n";
 	echo "	</tr>\n";
 
@@ -100,9 +100,9 @@ if (count($list_mailbox) > 0) {
 			echo "		<td>" . $row['username'] . "</td>\n";
 			echo "		<td>" . $row['name'] . "</td>\n";
 			echo "		<td>" . $row['modified'] . "</td>\n";
-			$active = ($row['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-			echo "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=$fDomain" . "\">" . $PALANG['edit'] . "</a></td>\n";
-			echo "		<td><a href=\"delete.php?delete=" . $row['username'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			$active = ($row['active'] == 1) ? $LANG['YES'] : $LANG['NO'];
+			echo "		<td><a href=\"edit-mailbox.php?username=" . $row['username'] . "&domain=$fDomain" . "\">" . $LANG['edit'] . "</a></td>\n";
+			echo "		<td><a href=\"delete.php?delete=" . $row['username'] . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_mailboxes'] . ": ". $row['username'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			echo "	</tr>\n";
 	}
 	echo "</table>\n";
blob - cefcf5c905c7b7c4a548eb040a6cd3359eedc4a1
blob + 2e1f6e448fdf8e1a695329d6f5b23d7682ceed0e
--- templates/password.tpl
+++ templates/password.tpl
@@ -2,30 +2,30 @@
 <form name="password" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pPassword_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Password_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_admin'] . ":"; ?></td>
+		<td><?php print $LANG['Password_admin'] . ":"; ?></td>
 		<td><?php print $SESSID_USERNAME; ?></td>
 		<td><?php print $pPassword_admin_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password_current']; ?></td>
+		<td><?php print $LANG['Password_password_current']; ?></td>
 		<td><input class="flat" type="password" name="fPassword_current" /></td>
 		<td><?php print $pPassword_password_current_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password'] . ":"; ?></td>
+		<td><?php print $LANG['Password_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td><?php print $pPassword_password_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password2'] . ":"; ?></td>
+		<td><?php print $LANG['Password_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pPassword_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Password_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 1c7911d40818d17c309ef67432585c503fbbe6f4
blob + 4de0e5bd36528259cf70ce66aa63a01c2a3213cc
--- templates/search.tpl
+++ templates/search.tpl
@@ -1,5 +1,5 @@
 <div id="overview">
-<h4><?php print $PALANG['pSearch_welcome'] . $fSearch; ?></h4>
+<h4><?php print $LANG['Search_welcome'] . $fSearch; ?></h4>
 <form name="search" method="post" action="search.php">
 <input type="textbox" name="search">
 </form>
@@ -8,12 +8,12 @@
 if (count($tAlias) > 0) {
 	print "<table id=\"alias_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"5\"><h3>".$PALANG['pOverview_alias_title']."</h3></td>";
+	print "		<td colspan=\"5\"><h3>".$LANG['Overview_alias_title']."</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pOverview_alias_address'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_alias_goto'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_alias_modified'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_address'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_goto'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_alias_modified'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -23,8 +23,8 @@ if (count($tAlias) > 0) {
 			print "		<td>" . $tAlias[$i]['address'] . "</td>\n";
 			print "		<td>" . preg_replace("/,/", "<br>", $tAlias[$i]['goto']) . "</td>\n";
 			print "		<td>" . $tAlias[$i]['modified'] . "</td>\n";
-			print "		<td><a href=\"edit-alias.php?address=" . $tAlias[$i]['address'] . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-			print "		<td><a href=\"delete.php?delete=" . $tAlias[$i]['address'] . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			print "		<td><a href=\"edit-alias.php?address=" . $tAlias[$i]['address'] . "&domain=" . $tAlias[$i]['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+			print "		<td><a href=\"delete.php?delete=" . $tAlias[$i]['address'] . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			print "	</tr>\n";
 		}
 	}
@@ -35,14 +35,14 @@ if (count($tAlias) > 0) {
 if (count($tMailbox) > 0) {
 	print "<table id=\"mailbox_table\">\n";
 	print "	<tr>\n";
-	print "		<td colspan=\"7\"><h3>".$PALANG['pOverview_mailbox_title']."</h3></td>";
+	print "		<td colspan=\"7\"><h3>".$LANG['Overview_mailbox_title']."</h3></td>";
 	print "	</tr>";
 	print "	<tr class=\"header\">\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_username'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_name'] . "</td>\n";
-	if ($CONF['quota'] == 'YES') print "		<td>" . $PALANG['pOverview_mailbox_quota'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_modified'] . "</td>\n";
-	print "		<td>" . $PALANG['pOverview_mailbox_active'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_username'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_name'] . "</td>\n";
+	if ($CONF['quota'] == 'YES') print "		<td>" . $LANG['Overview_mailbox_quota'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_modified'] . "</td>\n";
+	print "		<td>" . $LANG['Overview_mailbox_active'] . "</td>\n";
 	print "		<td colspan=\"2\">&nbsp;</td>\n";
 	print "	</tr>\n";
 
@@ -51,8 +51,8 @@ if (count($tMailbox) > 0) {
 			print "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
 			print "		<td>" . $tMailbox[$i]['username'] . "</td>\n";
 			print "		<td>" . $tMailbox[$i]['name'] . "</td>\n";
-			print "		<td><a href=\"edit-mailbox.php?username=" . $tMailbox[$i]['username'] . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-			print "		<td><a href=\"delete.php?delete=" . $tMailbox[$i]['username'] . "&domain=" . $tMailbox[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $tMailbox[$i]['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+			print "		<td><a href=\"edit-mailbox.php?username=" . $tMailbox[$i]['username'] . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $LANG['edit'] . "</a></td>\n";
+			print "		<td><a href=\"delete.php?delete=" . $tMailbox[$i]['username'] . "&domain=" . $tMailbox[$i]['domain'] . "\"onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['Overview_get_mailboxes'] . ": ". $tMailbox[$i]['username'] . "')\">" . $LANG['del'] . "</a></td>\n";
 			print "	</tr>\n";
 		}
 	}
blob - f244ad650fb3a3daa0d533ff6788c21a4e528a22
blob + bc9b068ca38f87efb83694d5982aeb43ed5d7eed
--- templates/sendmail.tpl
+++ templates/sendmail.tpl
@@ -2,32 +2,32 @@
 <form name="sendmail" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pSendmail_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Sendmail_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pSendmail_admin'] . ":"; ?></td>
+		<td><?php print $LANG['Sendmail_admin'] . ":"; ?></td>
 		<td><?php print $SESSID_USERNAME; ?></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pSendmail_to'] . ":"; ?></td>
+		<td><?php print $LANG['Sendmail_to'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fTo" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pSendmail_subject'] . ":"; ?></td>
-		<td><input class="flat" type="text" name="fSubject" value="<?php print $PALANG['pSendmail_subject_text']; ?>" /></td>
+		<td><?php print $LANG['Sendmail_subject'] . ":"; ?></td>
+		<td><input class="flat" type="text" name="fSubject" value="<?php print $LANG['Sendmail_subject_text']; ?>" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pSendmail_body'] . ":" ?></td>
+		<td><?php print $LANG['Sendmail_body'] . ":" ?></td>
 		<td>
 		<textarea class="flat" rows="10" cols="60" name="fBody"><?php print $CONF['welcome_text']; ?></textarea>
 		</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pSendmail_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Sendmail_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 8111c3bd4cfd1a694af71cb637ced8980258b179
blob + 1093547cee5cfb23833302f405a63cef638838c9
--- templates/users_edit-alias.tpl
+++ templates/users_edit-alias.tpl
@@ -2,15 +2,15 @@
 <form name="edit_alias" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pEdit_alias_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['Edit_alias_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_alias_address'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_alias_address'] . ":"; ?></td>
 		<td><?php print $USERID_USERNAME; ?></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pEdit_alias_goto'] . ":"; ?></td>
+		<td><?php print $LANG['Edit_alias_goto'] . ":"; ?></td>
 <td><textarea class="flat" rows="4" cols="30" name="fGoto">
 <?php
 $array = preg_split('/,/', $tGoto);
@@ -26,7 +26,7 @@ for ($i = 0 ; $i < count($array) ; $i++) {
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pEdit_alias_button']; ?>"></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['Edit_alias_button']; ?>"></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 93a4aa9ac8152d44c97ce3bab3991bd4917630e4
blob + 0f833e274b2843d91ef56491b09fb4bf2a7d053d
--- templates/users_login.tpl
+++ templates/users_login.tpl
@@ -2,18 +2,18 @@
 <form name="login" method="post">
 <table id="login_table" cellspacing="10">
 	<tr>
-		<td colspan="2"><h4><?php print $PALANG['pUsersLogin_welcome']; ?></h4></td>
+		<td colspan="2"><h4><?php print $LANG['UsersLogin_welcome']; ?></h4></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pUsersLogin_username'] . ":"; ?></td>
+		<td><?php print $LANG['UsersLogin_username'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pUsersLogin_password'] . ":"; ?></td>
+		<td><?php print $LANG['UsersLogin_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 	</tr>
 	<tr>
-		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pUsersLogin_button']; ?>" /></td>
+		<td colspan="2" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $LANG['UsersLogin_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="2" class="standout"><?php print $tMessage; ?></td>
blob - 555b8d8c8688559724d1c1ccddb3dd1b12c82e00
blob + 8986a19c261ad80740b8443ade1540b4b40c9f00
--- templates/users_main.tpl
+++ templates/users_main.tpl
@@ -6,21 +6,21 @@
 	</tr>
 	<?php if ($CONF['vacation'] == 'YES') { ?>
 	<tr>
-		<td nowrap><a target="_top" href="vacation.php"><?php print $PALANG['pUsersMenu_vacation']; ?></a></td>
-		<td><?php print $PALANG['pUsersMain_vacation']; ?></td>
+		<td nowrap><a target="_top" href="vacation.php"><?php print $LANG['UsersMenu_vacation']; ?></a></td>
+		<td><?php print $LANG['UsersMain_vacation']; ?></td>
 	</tr>
 	<?php } ?>
 	<tr>
-		<td nowrap><a target="_top" href="edit-alias.php"><?php print $PALANG['pUsersMenu_edit_alias']; ?></a></td>
-		<td><?php print $PALANG['pUsersMain_edit_alias']; ?></td>
+		<td nowrap><a target="_top" href="edit-alias.php"><?php print $LANG['UsersMenu_edit_alias']; ?></a></td>
+		<td><?php print $LANG['UsersMain_edit_alias']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php print $PALANG['pUsersMenu_password']; ?></a></td>
-		<td><?php print $PALANG['pUsersMain_password']; ?></td>
+		<td nowrap><a target="_top" href="password.php"><?php print $LANG['UsersMenu_password']; ?></a></td>
+		<td><?php print $LANG['UsersMain_password']; ?></td>
 	</tr>
 	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php print $PALANG['pMenu_logout']; ?></a></td>
-		<td><?php print $PALANG['pMain_logout']; ?></td>
+		<td nowrap><a target="_top" href="logout.php"><?php print $LANG['Menu_logout']; ?></a></td>
+		<td><?php print $LANG['Main_logout']; ?></td>
 	</tr>
 </table>
 </div>
blob - 804fdf41ff7c84948919e0c5ecad595648c8f3ae
blob + eb29f443dd9b1d6c5bd06ceaa2a0fe77b7be390c
--- templates/users_menu.tpl
+++ templates/users_menu.tpl
@@ -1,11 +1,11 @@
 <div id="menu">
 <ul>
 	<?php if ($CONF['vacation'] == "YES") { ?>
-	<li><a target="_top" href="vacation.php"><?php print $PALANG['pUsersMenu_vacation']; ?></a></li>
+	<li><a target="_top" href="vacation.php"><?php print $LANG['UsersMenu_vacation']; ?></a></li>
 	<?php } ?>
-	<li><a target="_top" href="edit-alias.php"><?php print $PALANG['pUsersMenu_edit_alias']; ?></a></li>
-	<li><a target="_top" href="password.php"><?php print $PALANG['pUsersMenu_password']; ?></a></li>
-	<li><a target="_top" href="logout.php"><?php print $PALANG['pMenu_logout']; ?></a></li>
+	<li><a target="_top" href="edit-alias.php"><?php print $LANG['UsersMenu_edit_alias']; ?></a></li>
+	<li><a target="_top" href="password.php"><?php print $LANG['UsersMenu_password']; ?></a></li>
+	<li><a target="_top" href="logout.php"><?php print $LANG['Menu_logout']; ?></a></li>
 </ul>
 </div>
 
blob - 4e7c8c5f16fdeaa2ad257b223dbc262184b329fa
blob + fd4b5674def192d265d87813901abe2a66fa4b1e
--- templates/users_password.tpl
+++ templates/users_password.tpl
@@ -2,30 +2,30 @@
 <form name="password" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pPassword_welcome']; ?></td>
+		<td colspan="3"><h3><?php print $LANG['Password_welcome']; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_admin'] . ":"; ?></td>
+		<td><?php print $LANG['Password_admin'] . ":"; ?></td>
 		<td><?php print $USERID_USERNAME; ?></td>
 		<td><?php print $pPassword_admin_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password_current'] . ":"; ?></td>
+		<td><?php print $LANG['Password_password_current'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword_current" ></td>
 		<td><?php print $pPassword_password_current_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password'] . ":"; ?></td>
+		<td><?php print $LANG['Password_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword" ></td>
 		<td><?php print $pPassword_password_text; ?></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pPassword_password2'].":" ?></td>
+		<td><?php print $LANG['Password_password2'].":" ?></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input type="submit" name="submit" value="<?php print $PALANG['pPassword_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input type="submit" name="submit" value="<?php print $LANG['Password_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 2b6b42fce704c8098f61af28deeeef07c5dd8c15
blob + 5f1a11c6bdb34af756cf85c9e2c61524a6ba7af7
--- templates/users_vacation-get.tpl
+++ templates/users_vacation-get.tpl
@@ -2,7 +2,7 @@
 <form name="vacation" method="post">
 <table>
 	<tr>
-		<td class="hlp_center"><input class="button" type="submit" name="fBack" value="<?php print $PALANG['pUsersVacation_button_back']; ?>" /></td>
+		<td class="hlp_center"><input class="button" type="submit" name="fBack" value="<?php print $LANG['UsersVacation_button_back']; ?>" /></td>
 	</tr>
 </table>
 </form>
blob - 1f36a35045f40f188da2b475df6898e1800a6196
blob + 828d23800eb3e249ac43467edbe7524fd261d638
--- templates/users_vacation.tpl
+++ templates/users_vacation.tpl
@@ -2,24 +2,24 @@
 <form name="vacation" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php print $PALANG['pUsersVacation_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php print $LANG['UsersVacation_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-		<td><input type="text" name="fSubject" value="<?php print $PALANG['pUsersVacation_subject_text']; ?>" /></td>
+		<td><?php print $LANG['UsersVacation_subject'] . ":"; ?></td>
+		<td><input type="text" name="fSubject" value="<?php print $LANG['UsersVacation_subject_text']; ?>" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php print $PALANG['pUsersVacation_body'] . ":"; ?></td>
+		<td><?php print $LANG['UsersVacation_body'] . ":"; ?></td>
 		<td>
 <textarea rows="10" cols="80" name="fBody">
-<?php print $PALANG['pUsersVacation_body_text']; ?>
+<?php print $LANG['UsersVacation_body_text']; ?>
 </textarea>
 		</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="fAway" value="<?php print $PALANG['pUsersVacation_button_away']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="fAway" value="<?php print $LANG['UsersVacation_button_away']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php print $tMessage; ?></td>
blob - 669bae16a9c3e91c035cfeba242d68e85c464e4d
blob + a8f655b929ea3a33242e9872018562eec78d2e02
--- templates/viewlog.tpl
+++ templates/viewlog.tpl
@@ -12,7 +12,7 @@ for ($i = 0; $i < $count; $i++) {
 }
 ?>
 </select>
-<input class="button" type="submit" name="go" value="<?php print $PALANG['pViewlog_button']; ?>" />
+<input class="button" type="submit" name="go" value="<?php print $LANG['Viewlog_button']; ?>" />
 </form>
 </div>
 <?php 
@@ -21,14 +21,14 @@ if (!empty($tLog)) {
 	if ($tLog_count > 0) {
 		print "<table id=\"log_table\">\n";
 		print "	<tr>\n";
-		print "		<td colspan=\"5\"><h3>".$PALANG['pViewlog_welcome']." ".$fDomain."</h3></td>\n";
+		print "		<td colspan=\"5\"><h3>".$LANG['Viewlog_welcome']." ".$fDomain."</h3></td>\n";
 		print "	</tr>\n";
 		print "	<tr class=\"header\">\n";
-		print "		<td>" . $PALANG['pViewlog_timestamp'] . "</td>\n";
-		print "		<td>" . $PALANG['pViewlog_username'] . "</td>\n";
-		print "		<td>" . $PALANG['pViewlog_domain'] . "</td>\n";
-		print "		<td>" . $PALANG['pViewlog_action'] . "</td>\n";
-		print "		<td>" . $PALANG['pViewlog_data'] . "</td>\n";
+		print "		<td>" . $LANG['Viewlog_timestamp'] . "</td>\n";
+		print "		<td>" . $LANG['Viewlog_username'] . "</td>\n";
+		print "		<td>" . $LANG['Viewlog_domain'] . "</td>\n";
+		print "		<td>" . $LANG['Viewlog_action'] . "</td>\n";
+		print "		<td>" . $LANG['Viewlog_data'] . "</td>\n";
 		print "	</tr>\n";
 
 		for ($i = 0; $i < $tLog_count; $i++) {
blob - b8a233f9aa11298a2f05ce59bafadacaa9798175
blob + 9d6faa1b9e49649461c92201bef096a03e5004bb
--- users/edit-alias.php
+++ 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]</font>";
+			$tMessage = $LANG['Edit_alias_goto_text_error2'] . "$array[$i]</font>";
 		}
 	}
 	
@@ -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");
 					
blob - 17676c28d1ab5aa5b5a6b3a7f05bd49dd643df88
blob + 687252b87ba5fa10786c855dd29e12bfafc09258
--- users/login.php
+++ 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) {
blob - a3175fb3febfe5b75adf348bb39398bbf808a2b9
blob + 3fa050316a337a0e31aa3f3fc022b19ed040d5b6
--- users/password.php
+++ 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'];
 		}
 	}
 }
blob - 162c9a34c56e136834f685893fe4f7c4093d34b7
blob + 3200ad36273956baf770cc585036d704215bb41b
--- users/vacation.php
+++ 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;
blob - dabb73aa57f712129861761015376f6a3e0c9cf1
blob + ba06d29b9701b5f8d2286786a5b2ce5b38d539b7
--- viewlog.php
+++ 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) {