Roundup of issues reported by PHPStorm

Mostly redundant checks, logic errors, dead code, etc.

2 files changed, 1 insertions, 7 deletions

diff --git a/modules-available/dozmod/api.inc.php b/modules-available/dozmod/api.inc.php
index 17298bb7..90e663aa 100644
--- a/modules-available/dozmod/api.inc.php
+++ b/modules-available/dozmod/api.inc.php
@@ -327,18 +327,14 @@ $location_ids = Location::getLocationRootChain($location_ids);
 if ($resource === 'list') {
 	outputLectureXmlForLocation($location_ids);
 	// Won't return on success...
-	fatalDozmodUnreachable();
-
 } elseif ($resource === 'imagemeta') {
 	$image = readImageParam();
 	outputResource($image, $resource);
-	fatalDozmodUnreachable();
-
 } else {
 	$lecture = readLectureParam($location_ids);
 	outputResource($lecture, $resource);
-	fatalDozmodUnreachable();
 }
+fatalDozmodUnreachable();
 
 Header('HTTP/1.1 400 Bad Request');
 die("I don't know how to give you that resource");
diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php
index a38c9d9d..bf2a6fa4 100644
--- a/modules-available/dozmod/page.inc.php
+++ b/modules-available/dozmod/page.inc.php
@@ -78,7 +78,6 @@ class Page_DozMod extends Page
 		/* different pages for different sections */
 		if ($this->haveSubPage !== false) {
 			SubPage::doRender();
-			return;
 		}
 
 	}
@@ -90,7 +89,6 @@ class Page_DozMod extends Page
 
 		if ($this->haveSubPage !== false) {
 			SubPage::doAjax();
-			return;
 		}
 
 	}