Fix A LOT of type problems, logic flaws, uninitialized variables etc.

Most of them were found by phpstorm, so I put in some time and
went through the list, fixing quite a bunch of them.

3 files changed, 15 insertions, 16 deletions

diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js
index 5c9776b2..bd29c06c 100644
--- a/modules-available/roomplanner/clientscript.js
+++ b/modules-available/roomplanner/clientscript.js
@@ -11,6 +11,9 @@ var selectMachinInitialized = false;
 
 var placedMachines = [];
 
+var $modal, $selectizeSearch;
+var currentCallback = false;
+
 function makeCombinedFieldSingle(item)
 {
 	item.combined = (item.machineuuid + " " + item.hostname + " " + item.clientip + " " + item.macaddr + " " + item.macaddr.replace(/-/g, ':')).toLocaleLowerCase();
diff --git a/modules-available/roomplanner/inc/pvsgenerator.inc.php b/modules-available/roomplanner/inc/pvsgenerator.inc.php
index 292441d4..cda32fce 100644
--- a/modules-available/roomplanner/inc/pvsgenerator.inc.php
+++ b/modules-available/roomplanner/inc/pvsgenerator.inc.php
@@ -54,7 +54,6 @@ class PvsGenerator
 		/* collect names and build room blocks - filter empty rooms while at it */
 		$roomNames = array();
 		$roomBlocks = '';
-		$overrides = [];
 		foreach ($rooms as $room) {
 			if (is_null($room['notnull']) || isset($room['skip'])) // Not leaf
 				continue;
diff --git a/modules-available/roomplanner/js/lib/jquery-collision.js b/modules-available/roomplanner/js/lib/jquery-collision.js
index 98e37882..eae7ef85 100644
--- a/modules-available/roomplanner/js/lib/jquery-collision.js
+++ b/modules-available/roomplanner/js/lib/jquery-collision.js
@@ -175,11 +175,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	{
 		if( ! inclusive ) inclusive = false;
 		var epsilon = ( inclusive ? -1 : +1 ) * CollisionCoords.EPSILON;
-		if( ( x > ( this.x1 + epsilon ) && x < ( this.x2 - epsilon ) ) &&
-				( y > ( this.y1 + epsilon ) && y < ( this.y2 - epsilon ) )    )
-			return true;
-		else
-			return false;
+		return (x > (this.x1 + epsilon) && x < (this.x2 - epsilon)) &&
+			(y > (this.y1 + epsilon) && y < (this.y2 - epsilon));
 	};
 	
 	CollisionCoords.prototype.overlaps = function( other, inclusive )
@@ -189,16 +186,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 				hit = other._overlaps( this, inclusive );
 		if( hit.length > 0 )
 		{
-			hit[0].dir = hit[0].dir == "Inside"  ? "Outside" :
-									 hit[0].dir == "Outside" ? "Inside"  :
-									 hit[0].dir == "N"       ? "S"       :
-									 hit[0].dir == "S"       ? "N"       :
-									 hit[0].dir == "W"       ? "E"       :
-									 hit[0].dir == "E"       ? "W"       :
-									 hit[0].dir == "NE"      ? "SW"      :
-									 hit[0].dir == "SW"      ? "NE"      :
-									 hit[0].dir == "SE"      ? "NW"      :
-									 hit[0].dir == "NW"      ? "SE"      :
+			hit[0].dir = hit[0].dir === "Inside"  ? "Outside" :
+									 hit[0].dir === "Outside" ? "Inside"  :
+									 hit[0].dir === "N"       ? "S"       :
+									 hit[0].dir === "S"       ? "N"       :
+									 hit[0].dir === "W"       ? "E"       :
+									 hit[0].dir === "E"       ? "W"       :
+									 hit[0].dir === "NE"      ? "SW"      :
+									 hit[0].dir === "SW"      ? "NE"      :
+									 hit[0].dir === "SE"      ? "NW"      :
+									 hit[0].dir === "NW"      ? "SE"      :
 																						 undefined;
 		}
 		return hit || [];