Commit 345b3216 authored by canyonknight's avatar canyonknight Committed by Lukas Fleischer
Browse files

Be consistent in PHP logical operator usage



A mix of logical operator styles are currently in use. The predominant style
uses "&&" and "||" instead of "and" and "or", respectively. This inconsistency
is minor, but is easily avoided.
Signed-off-by: default avatarcanyonknight <canyonknight@gmail.com>
Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent e7f6deeb
......@@ -13,7 +13,7 @@ if (isset($_COOKIE["AURSID"])) {
$atype = "";
}
if ($atype == "Trusted User" OR $atype == "Developer") {
if ($atype == "Trusted User" || $atype == "Developer") {
$dbh = db_connect();
if (!empty($_POST['addVote'])) {
......
......@@ -19,7 +19,7 @@ if (isset($_COOKIE["AURSID"])) {
$atype = account_from_sid($_COOKIE["AURSID"]);
}
if ($atype == "Trusted User" OR $atype == "Developer") {
if ($atype == "Trusted User" || $atype == "Developer") {
if (isset($_GET['id'])) {
if (is_numeric($_GET['id'])) {
......@@ -123,7 +123,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") {
else
$by = 'desc';
if (!empty($offset) AND is_numeric($offset)) {
if (!empty($offset) && is_numeric($offset)) {
if ($offset >= 1) {
$off = $offset;
} else {
......
......@@ -1105,8 +1105,8 @@ function pkg_change_category($atype, $dbh=NULL) {
}
$uid = uid_from_sid($_COOKIE["AURSID"], $dbh);
if ($uid == $pkg["MaintainerUID"] or
($atype == "Developer" or $atype == "Trusted User")) {
if ($uid == $pkg["MaintainerUID"] ||
($atype == "Developer" || $atype == "Trusted User")) {
$q = "UPDATE Packages ";
$q.= "SET CategoryID = ".intval($category_id)." ";
$q.= "WHERE ID = ".intval($pid);
......
......@@ -9,8 +9,8 @@ else {
$pkgid = pkgid_from_name($_REQUEST['N']);
}
if ($uid == $row["MaintainerUID"] or
($atype == "Developer" or $atype == "Trusted User")) {
if ($uid == $row["MaintainerUID"] ||
($atype == "Developer" || $atype == "Trusted User")) {
$catarr = pkgCategories();
$edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n";
......@@ -55,7 +55,7 @@ if ($row["MaintainerUID"]) {
}
$votes = __('Votes') . ': ' . $row['NumVotes'];
if ($atype == "Developer" or $atype == "Trusted User") {
if ($atype == "Developer" || $atype == "Trusted User") {
$votes = "<a href=\"voters.php?ID=$pkgid\">$votes</a>";
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment