Combine these if statements into one to reduce the cyclomatic complex…

…ity.
shish · Apr 26, 2014 · a8dd045 · a8dd045
1 parent efb5038
commit a8dd045
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/ext/notes/main.php b/ext/notes/main.php
@@ -323,26 +323,16 @@ private function update_note()
 		$noteText = mysql_real_escape_string(html_escape($_POST["note_text"]));
 
 		// validate parameters
-		if(is_null($imageID) || !is_numeric($imageID))
-			return;
-
-		if(is_null($noteID) || !is_numeric($noteID))
-			return;
-
-		if(is_null($noteX1) || !is_numeric($noteX1))
-			return;
-
-		if(is_null($noteY1) || !is_numeric($noteY1))
-			return;
-
-		if(is_null($noteHeight) || !is_numeric($noteHeight))
-			return;
-
-		if(is_null($noteWidth) || !is_numeric($noteWidth))
-			return;
-
-		if(is_null($noteText) || strlen($noteText) == 0)
+		if (is_null($imageID)    || !is_numeric($imageID)        ||
+			is_null($noteID)     || !is_numeric($noteID)         ||
+			is_null($noteX1)     || !is_numeric($noteX1)         ||
+			is_null($noteY1)     || !is_numeric($noteY1)         ||
+			is_null($noteHeight) || !is_numeric($noteHeight)     ||
+			is_null($noteWidth)  || !is_numeric($noteWidth)      ||
+			is_null($noteText)   || strlen($noteText) == 0)
+		{
 			return;
+		}
 
 		global $database;
 		$database->execute("UPDATE notes ".
@@ -369,11 +359,11 @@ private function delete_note()
 		$noteID = int_escape($_POST["note_id"]);
 
 		// validate parameters
-		if(is_null($imageID) || !is_numeric($imageID))
-			return;
-
-		if(is_null($noteID) || !is_numeric($noteID))
+		if( is_null($imageID) || !is_numeric($imageID) ||
+			is_null($noteID)  || !is_numeric($noteID))
+		{
 			return;
+		}
 
 		global $database;
 

diff --git a/ext/notes/theme.php b/ext/notes/theme.php
@@ -235,5 +235,5 @@ public function display_history($histories, $pageNumber, $totalPages) {
 
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
-}		
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
     	}
-    }
+    }