Roundup of issues reported by PHPStorm

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

1 files changed, 5 insertions, 6 deletions

diff --git a/modules-available/sysconfig/addmodule_branding.inc.php b/modules-available/sysconfig/addmodule_branding.inc.php
index e6da9edb..f3a90e58 100644
--- a/modules-available/sysconfig/addmodule_branding.inc.php
+++ b/modules-available/sysconfig/addmodule_branding.inc.php
@@ -22,7 +22,6 @@ class Branding_ProcessFile extends AddModule_Base
 
 	private $task;
 	private $svgFile;
-	private $tarFile;
 
 	protected function preprocessInternal()
 	{
@@ -53,9 +52,9 @@ class Branding_ProcessFile extends AddModule_Base
 			Session::set('logo_name', $title);
 		}
 		chmod($this->svgFile, 0644);
-		$this->tarFile = '/tmp/bwlp-' . time() . '-' . mt_rand() . '.tgz';
+		$tarFile = '/tmp/bwlp-' . time() . '-' . mt_rand() . '.tgz';
 		$this->task = Taskmanager::submit('BrandingGenerator', array(
-				'tarFile' => $this->tarFile,
+				'tarFile' => $tarFile,
 				'svgFile' => $this->svgFile
 		));
 		$this->task = Taskmanager::waitComplete($this->task, 5000);
@@ -64,7 +63,7 @@ class Branding_ProcessFile extends AddModule_Base
 			Taskmanager::addErrorMessage($this->task);
 			Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
 		}
-		Session::set('logo_tgz', $this->tarFile);
+		Session::set('logo_tgz', $tarFile);
 	}
 
 	protected function renderInternal()
@@ -196,9 +195,9 @@ class Branding_Finish extends AddModule_Base
 	protected function preprocessInternal()
 	{
 		$title = Request::post('title');
-		if ($title === false || empty($title))
+		if (empty($title))
 			$title = Session::get('logo_name');
-		if ($title === false || empty($title)) {
+		if (empty($title)) {
 			Message::addError('missing-title'); // TODO: Ask for title again instead of starting over
 			Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
 		}