High5! Code

Commit Diff

Commit:: 36ef6f7c649a95fabb539b42be78340e9c7e50e9
From:: mischa <mischa@rx.high5.nl>
Date:: Sun Sep 4 20:43:21 2022 UTC
Message:: clean up
Actions:: Patch | Tree
commit - f4071a612a8e81c1c3577e75ecb42e5b21fdb806
commit + 36ef6f7c649a95fabb539b42be78340e9c7e50e9
blob - d9404d56f6610698c3008d332c71b879557c6b73
blob + 3c0802deb900631b3c4675baaf43641429bebc83
--- add-alias.php
+++ add-alias.php
@@ -16,7 +16,7 @@
 // domain
 // goto
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // address
 // domain
blob - 11722940405517541a67012324839750a91e4965
blob + 91bd255e556601cd778180b975f49e1aa8500247
--- add-mailbox.php
+++ add-mailbox.php
@@ -16,7 +16,7 @@
 // name
 // domain
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 // password1
blob - 5ee43521c2ddf420b15d4b39c08dc9469aa7a628
blob + ac84b03d701cc7365f2d6282793103049f284b63
--- admin/add-alias.php
+++ admin/add-alias.php
@@ -16,7 +16,7 @@
 // domain
 // goto
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // address
 // domain
blob - bb6122699af48092296cf315e1b6e490abe1eca7
blob + 50b2ccbabf97cd6687472e2e5f882585ea3ad0d2
--- admin/add-mailbox.php
+++ admin/add-mailbox.php
@@ -16,7 +16,7 @@
 // name
 // domain
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 // password1
blob - f776b9019d751a378ed2c04f9770e2a5861bd9ca
blob + 916eefe1429a52a9570a84e97d736f81e993d533
--- admin/admin.php
+++ admin/admin.php
@@ -17,7 +17,7 @@
 // username
 // domains
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 // password1
blob - c55757ff773149a540e5c4d84b71307b25b675f5
blob + 9066fb493b1686f5de6ed3fa4d3a9336343d3a83
--- admin/backup.php
+++ admin/backup.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - 7a1cec7a3a6c6f6b6814f7ca1e4138daa84618dd
blob + 28c56c07122f8070c6171414b19d9cd2ef3ccf53
--- admin/delete.php
+++ admin/delete.php
@@ -13,7 +13,7 @@
 //
 // message
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // table
 // where
blob - 6ad2f5722a75085ea6cabf594e43f1d3833ab725
blob + 7bab9d215c4a18b587d61c4c80f1b2a970eb771f
--- admin/domain.php
+++ admin/domain.php
@@ -18,7 +18,7 @@
 // aliases
 // mailboxes
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // domain
 // description
blob - 102e7700579f1ecd9dcca3f5cd2c911aba8b914d
blob + b1c0010d68fd597c3d9724fc13e27c2108ef5889
--- admin/edit-alias.php
+++ admin/edit-alias.php
@@ -14,7 +14,7 @@
 // message
 // goto
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // address
 // domain
blob - f5f32a73dc6dc23ccfc3b7a1002c10374fa6c2f4
blob + c0f358aa906087919e73d3a81b3b211c38f5ef84
--- admin/edit-mailbox.php
+++ admin/edit-mailbox.php
@@ -14,7 +14,7 @@
 // message
 // name
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 // domain
blob - a11416a6d209dd64a130a20096f1d54a5af5472f
blob + 383d9feba37ed2f8bff021824b9a0d81b5880358
--- admin/index.php
+++ admin/index.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - d2ab8eb90cee982dcc343a3803ac31862571fe89
blob + cade867e5fd322837564676fa840e91445b193ef
--- admin/list-admin.php
+++ admin/list-admin.php
@@ -13,7 +13,7 @@
 //
 // list_admins
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - 2134f1bbab01519099cf1cda2dc31101df12d59d
blob + 278f796f05ea2ee82b175e06f72f7a3dbeb3c9e1
--- admin/list-domain.php
+++ admin/list-domain.php
@@ -13,7 +13,7 @@
 //
 // list_domains
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 //
blob - 76e1928704369e4c51739f3df2fef920432f5a61
blob + 2eb9ceda9c1700527918f7b40b279ec634d29f1d
--- admin/list-virtual.php
+++ admin/list-virtual.php
@@ -14,7 +14,7 @@
 // list_alias
 // list_mailbox
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // domain
 // offset
blob - 3bdc5f928c785472f24225faa37d54a6ebf080e2
blob + dc79b30bde105db5c54fdad7730b1b3549e9b639
--- admin/search.php
+++ admin/search.php
@@ -14,7 +14,7 @@
 // list_alias
 // list_mailbox
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // search
 //
@@ -23,34 +23,35 @@ include '../languages/' . check_language() . '.lang';
 
 $list_domains = list_domains();
 
-$search = filter_input(INPUT_POST, 'search', FILTER_DEFAULT);
+if ($_SERVER['REQUEST_METHOD'] == "POST") {
+	$search = filter_input(INPUT_POST, 'search', FILTER_DEFAULT);
 
-if (isset($search)) {
-	$dbh = pdo_connect();
-	$sth = $dbh->prepare("SELECT alias.address,alias.goto,alias.modified,alias.domain FROM alias LEFT JOIN mailbox ON alias.address=mailbox.username WHERE alias.address LIKE ? AND mailbox.maildir IS NULL ORDER BY alias.address");
-	$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
-	$sth->execute();
-	$list_alias = $sth->fetchAll();
-	foreach ($list_alias as $key => $value) {
-		if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
-			unset($list_alias[$key]);
+	if (isset($search)) {
+		$dbh = pdo_connect();
+		$sth = $dbh->prepare("SELECT alias.address,alias.goto,alias.modified,alias.domain FROM alias LEFT JOIN mailbox ON alias.address=mailbox.username WHERE alias.address LIKE ? AND mailbox.maildir IS NULL ORDER BY alias.address");
+		$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
+		$sth->execute();
+		$list_alias = $sth->fetchAll();
+		foreach ($list_alias as $key => $value) {
+			if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
+				unset($list_alias[$key]);
+			}
 		}
-	}
 
-	$sth = $dbh->prepare("SELECT * FROM mailbox WHERE username LIKE ? ORDER BY username");
-	$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
-	$sth->execute();
-	$list_mailbox = $sth->fetchAll();
-	foreach ($list_mailbox as $key => $value) {
-		if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
-			unset($list_mailbox[$key]);
+		$sth = $dbh->prepare("SELECT * FROM mailbox WHERE username LIKE ? ORDER BY username");
+		$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
+		$sth->execute();
+		$list_mailbox = $sth->fetchAll();
+		foreach ($list_mailbox as $key => $value) {
+			if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
+				unset($list_mailbox[$key]);
+			}
 		}
+	} else {
+		$list_alias = array();
+		$list_mailbox = array();
 	}
-} else {
-	$list_alias = array();
-	$list_mailbox = array();
 }
-
 include '../templates/header.tpl';
 include '../templates/admin_menu.tpl';
 include '../templates/search.tpl';
blob - 8ff88fe637ded256b5f6abbb25526686b6fa6e93
blob + b8eaec0472a850fd2abbda5d162a74f9410c6964
--- admin/viewlog.php
+++ admin/viewlog.php
@@ -13,7 +13,7 @@
 //
 // log
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // domain
 //
blob - c64a5e227d2bbc4bc6dc251c6121386a471cadf2
blob + 022631a91f0b65659be2a26f79fe02e3296ace9a
--- delete.php
+++ delete.php
@@ -13,7 +13,7 @@
 //
 // message
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // table
 // where
blob - 41a5571cd8605d9c0a4cd57c8957a60a0b0423fa
blob + c2715814f06f4421ba417f8e9bc0880c156735eb
--- edit-alias.php
+++ edit-alias.php
@@ -14,7 +14,7 @@
 // message
 // goto
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // address
 // domain
blob - 0235062080780d8327a6f45c89b99aceb9dfe992
blob + f225334d4b9ded5516bcecc3bcaf5bb966ce3b4f
--- edit-mailbox.php
+++ edit-mailbox.php
@@ -14,7 +14,7 @@
 // message
 // name
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // username
 // domain
blob - b20a132ede3c1d2cc689f818802d4d0a46f5c84e
blob + ca5d939c25a6d9cc9f0d77b59404af647a38fb19
--- index.php
+++ index.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - cc9fc8943fc4f9d9c33254351015a84609b6cd61
blob + ce380e6f628730f871c90b7df8c95c60c2806e6f
--- list-virtual.php
+++ list-virtual.php
@@ -14,7 +14,7 @@
 // list_alias
 // list_mailbox
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // domain
 // offset
blob - 2d6569d9dc8e552dbfef37ff840d4a9711b4934c
blob + f837b1776658c32ec16c9a2f72de7c469435c2c4
--- logout.php
+++ logout.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - a1952da4221fee642c75c2e0056bdd465d58be1c
blob + e6cdc7573cd34057fa1f747f5291dc90c8cc9eb3
--- main.php
+++ main.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - 3cc408f5ebff4d1323d44b7ab8349b031947a77d
blob + 5f9280c041ab6bcaa1a8a1c58b7d730e50558fd8
--- password.php
+++ password.php
@@ -13,7 +13,7 @@
 //
 // message
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // password_current
 // password1
blob - 3aab1b6fa28421e3aa449636de4f6280d04ec50b
blob + 7cb06466725898b7383d183ac0821e77f4ad5f1f
--- search.php
+++ search.php
@@ -14,7 +14,7 @@
 // list_alias
 // list_mailbox
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // search
 //
@@ -24,34 +24,35 @@ include './languages/' . check_language() . '.lang';
 $SESSID_USERNAME = check_session();
 $list_domains = list_domains($SESSID_USERNAME);
 
-$search = filter_input(INPUT_POST, 'search', FILTER_DEFAULT);
+if ($_SERVER['REQUEST_METHOD'] == "POST") {
+	$search = filter_input(INPUT_POST, 'search', FILTER_DEFAULT);
 
-if (isset($search)) {
-	$dbh = pdo_connect();
-	$sth = $dbh->prepare("SELECT alias.address,alias.goto,alias.modified,alias.domain FROM alias LEFT JOIN mailbox ON alias.address=mailbox.username WHERE alias.address LIKE ? AND mailbox.maildir IS NULL ORDER BY alias.address");
-	$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
-	$sth->execute();
-	$list_alias = $sth->fetchAll();
-	foreach ($list_alias as $key => $value) {
-		if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
-			unset($list_alias[$key]);
+	if (isset($search)) {
+		$dbh = pdo_connect();
+		$sth = $dbh->prepare("SELECT alias.address,alias.goto,alias.modified,alias.domain FROM alias LEFT JOIN mailbox ON alias.address=mailbox.username WHERE alias.address LIKE ? AND mailbox.maildir IS NULL ORDER BY alias.address");
+		$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
+		$sth->execute();
+		$list_alias = $sth->fetchAll();
+		foreach ($list_alias as $key => $value) {
+			if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
+				unset($list_alias[$key]);
+			}
 		}
-	}
 
-	$sth = $dbh->prepare("SELECT * FROM mailbox WHERE username LIKE ? ORDER BY username");
-	$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
-	$sth->execute();
-	$list_mailbox = $sth->fetchAll();
-	foreach ($list_mailbox as $key => $value) {
-		if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
-			unset($list_mailbox[$key]);
+		$sth = $dbh->prepare("SELECT * FROM mailbox WHERE username LIKE ? ORDER BY username");
+		$sth->bindValue(1, '%'.$search.'%', PDO::PARAM_STR);
+		$sth->execute();
+		$list_mailbox = $sth->fetchAll();
+		foreach ($list_mailbox as $key => $value) {
+			if (!in_array($value['domain'], array_column($list_domains, 'domain'))) {
+				unset($list_mailbox[$key]);
+			}
 		}
+	} else {
+		$list_alias = array();
+		$list_mailbox = array();
 	}
-} else {
-	$list_alias = array();
-	$list_mailbox = array();
 }
-
 include './templates/header.tpl';
 include './templates/menu.tpl';
 include './templates/search.tpl';
blob - 16dadfac6d7f870f850a51b3ae3dce19fe95eb70
blob + 18a49431b5d3e75c638e0a2722b25aefdc636d5f
--- sendmail.php
+++ sendmail.php
@@ -16,7 +16,7 @@
 // subject
 // body
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // to
 // subject
blob - 9c7dcefd96211dab8ee4744ad293817fa63438ac
blob + 5bf916e3c907148acf47addf549c59254b231962
--- users/index.php
+++ users/index.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - 3eebb1983205af9e010f7d61a22fe0359b5ff1dc
blob + 1aae1fcb58717edd1815064391cc7999c46763b3
--- users/logout.php
+++ users/logout.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
blob - 4d5166deea9de3e0a4bd3e449c74ab00a7b577ec
blob + e7bc2eca9e5559676c5ce5dab9c9497dfa71f70d
--- users/main.php
+++ users/main.php
@@ -13,7 +13,7 @@
 //
 // -none-
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // -none-
 //
@@ -27,3 +27,4 @@ include '../templates/header.tpl';
 include '../templates/users_menu.tpl';
 include '../templates/users_main.tpl';
 include '../templates/footer.tpl';
+?>
blob - 9ddb89b1266bada35563c128942aeb00f533dc60
blob + 69a34facf2dcad6449b83ca82aab1a3f440a54d2
--- users/password.php
+++ users/password.php
@@ -13,7 +13,7 @@
 //
 // message
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // password_current
 // password1
blob - b7bca0b787af639fce6e2090515e7fbd2cfd3ae5
blob + 2ca242c85c7b52a02e36c8e1f564b879560473bd
--- users/vacation.php
+++ users/vacation.php
@@ -15,7 +15,7 @@
 // tSubject
 // tBody
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // fSubject
 // fBody
blob - f6c4ee5d6c9949a0c45bf04149884e46b2edc67d
blob + 6ccfcb46d477c60b9f47672563dc9e4f306ea4d4
--- viewlog.php
+++ viewlog.php
@@ -13,7 +13,7 @@
 //
 // log
 //
-// Form POST \ GET Variables:
+// Form POST / GET Variables:
 //
 // domain
 //