New subject: [aur-dev] [PATCH 2/8] acctfuncs.inc.php: Fix comment style

6 Feb 2014

Use "true" instead of "TRUE" and "false" instead of "FALSE" or "False".

Signed-off-by: Lukas Fleischer 
---
 web/html/packages.php    |  6 +++---
 web/lib/Archive/Tar.php  |  2 +-
 web/lib/gettext.php      |  4 ++--
 web/lib/pkgfuncs.inc.php | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/web/html/packages.php b/web/html/packages.php
index a9f6263..f5ecf94 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -64,11 +64,11 @@ if (check_token()) {
 	} elseif (current_action("do_Adopt")) {
 		list($ret, $output) = pkg_adopt($atype, $ids, true);
 	} elseif (current_action("do_Disown")) {
-		list($ret, $output) = pkg_adopt($atype, $ids, False);
+		list($ret, $output) = pkg_adopt($atype, $ids, false);
 	} elseif (current_action("do_Vote")) {
 		list($ret, $output) = pkg_vote($atype, $ids, true);
 	} elseif (current_action("do_UnVote")) {
-		list($ret, $output) = pkg_vote($atype, $ids, False);
+		list($ret, $output) = pkg_vote($atype, $ids, false);
 	} elseif (current_action("do_Delete")) {
 		if (isset($_POST['confirm_Delete'])) {
 			if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) {
@@ -92,7 +92,7 @@ if (check_token()) {
 	} elseif (current_action("do_Notify")) {
 		list($ret, $output) = pkg_notify($atype, $ids);
 	} elseif (current_action("do_UnNotify")) {
-		list($ret, $output) = pkg_notify($atype, $ids, False);
+		list($ret, $output) = pkg_notify($atype, $ids, false);
 	} elseif (current_action("do_DeleteComment")) {
 		list($ret, $output) = pkg_delete_comment($atype);
 	} elseif (current_action("do_ChangeCategory")) {
diff --git a/web/lib/Archive/Tar.php b/web/lib/Archive/Tar.php
index 9249a06..32a2ccc 100644
--- a/web/lib/Archive/Tar.php
+++ b/web/lib/Archive/Tar.php
@@ -1566,7 +1566,7 @@ class Archive_Tar extends PEAR
 
     while (strlen($v_binary_data = $this->_readBlock()) != 0)
     {
-      $v_extract_file = FALSE;
+      $v_extract_file = false;
       $v_extraction_stopped = 0;
 
       if (!$this->_readHeader($v_binary_data, $v_header))
diff --git a/web/lib/gettext.php b/web/lib/gettext.php
index 5064047..4ccd75d 100644
--- a/web/lib/gettext.php
+++ b/web/lib/gettext.php
@@ -410,7 +410,7 @@ class gettext_reader {
   function pgettext($context, $msgid) {
     $key = $context . chr(4) . $msgid;
     $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
+    if (strpos($ret, "\004") !== false) {
       return $msgid;
     } else {
       return $ret;
@@ -420,7 +420,7 @@ class gettext_reader {
   function npgettext($context, $singular, $plural, $number) {
     $key = $context . chr(4) . $singular;
     $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
+    if (strpos($ret, "\004") !== false) {
       return $singular;
     } else {
       return $ret;
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 72daaf4..72c64f6 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -20,7 +20,7 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) {
 	}
 	if ($atype == "Trusted User" || $atype == "Developer") {
 		# A TU/Dev can delete any comment
-		return TRUE;
+		return true;
 	}
 	$dbh = DB::connect();
 	$q = "SELECT COUNT(ID) AS CNT ";
@@ -31,10 +31,10 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) {
 	if ($result != NULL) {
 		$row = $result->fetch(PDO::FETCH_ASSOC);
 		if ($row['CNT'] > 0) {
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 /**
@@ -55,12 +55,12 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) {
 		return false;
 	} elseif ($atype == "Trusted User" || $atype == "Developer") {
 		# A TU/Dev can delete any comment
-		return TRUE;
+		return true;
 	} else if ($comment['UsersID'] == $uid) {
 		# User's own comment
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 /**
@@ -76,10 +76,10 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) {
 function canSubmitBlacklisted($atype = "") {
 	if ($atype == "Trusted User" || $atype == "Developer") {
 		# Only TUs/Devs can submit blacklisted packages.
-		return TRUE;
+		return true;
 	}
 	else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -1194,7 +1194,7 @@ function pkg_notify ($atype, $ids, $action=true) {
 		}
 
 		if ($first)
-			$first = False;
+			$first = false;
 		else
 			$output .= ", ";
 
-- 
1.8.5.3

    

[aur-dev] [PATCH 1/8] Style fixes: Capitalization of "true" and "false"

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

Lukas Fleischer

canyonknight

Lukas Fleischer

tags

participants (2)