cache resource value: secure quoted html output

lib/Foomo/Jobs/Runner.php

@@ -60,7 +60,7 @@ public static function runAJob(AbstractJob $job) {
 		$locked = false;
 		$pid = getmypid();
 		if ($job->getLock()) {
-			$locked = \Foomo\Lock::lock($jobId, $blocking = false);
+			$locked = \Foomo\Lock::lockResource($jobId, $blocking = false);
 			if (!$locked) {
 				$lockData = \Foomo\Lock::getLockInfo($job->getId());
 				if ($lockData['lock_age'] < $job->getMaxExecutionTime()) {
@@ -82,7 +82,7 @@ public static function runAJob(AbstractJob $job) {
 		Utils::updateStatusJobDone($jobId, $pid, $locked);
 		if ($job->getLock()) {
 			// clean up
-			\Foomo\Lock::release($job->getId());
+			\Foomo\Lock::releaseResource($job->getId());
 			Utils::updateStatusJobDone($jobId, $pid, false);
 			self::$callback = false;
 		}

lib/Foomo/MVC.php

@@ -260,8 +260,8 @@ public static function getBaseUrl($baseURL=null, $force=false)
 		} else if (is_null($baseURL)) {
 			if(strpos($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']) === 0 || !self::$hideScript) {
 				return $_SERVER['SCRIPT_NAME'];
-			} else if(strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0 && self::$hideScript) {
-				return dirname($_SERVER['SCRIPT_NAME']);
+//			} else if(strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0 && self::$hideScript) {
+//				return dirname($_SERVER['SCRIPT_NAME']);
 			} else {
 				return '';
 			}
@@ -459,4 +459,4 @@ public static function redirect($action, $parameters = array())
 		header('Location: ' . self::getCurrentURLHandler()->renderMethodURL($action, $parameters));
 		exit;
 	}
-}
+}

tests/Foomo/LockTest.php

@@ -38,15 +38,15 @@ public function tearDown() {
 	public function testGetLock() {
 		$lockName1 = 'testLock1';
 		$lockName2 = 'testLock2';
-		$lockObtained = \Foomo\Lock::lock($lockName1, $blocking = true);
+		$lockObtained = \Foomo\Lock::lockResource($lockName1, $blocking = true);
 		$this->assertTrue($lockObtained, 'should be able to obtain first lock');
 
 		//issue another process
 		$sucess = file_get_contents(\Foomo\Utils::getServerUrl() . '/foomo/lock.php?lockName=' . $lockName1);
 
 		$this->assertFalse($sucess != 'false', 'should not be able to obtain second lock');
 
-		$lockReleased = \Foomo\Lock::release($lockName1);
+		$lockReleased = \Foomo\Lock::releaseResource($lockName1);
 		$this->assertTrue($lockReleased);
 
 		// after the release it should work
@@ -57,7 +57,7 @@ public function testGetLock() {
 
 	public function testLockAge() {
 		$lockName1 = 'testLock1';
-		$lockObtained = \Foomo\Lock::lock($lockName1, $blocking = false);
+		$lockObtained = \Foomo\Lock::lockResource($lockName1, $blocking = false);
 		sleep(3);
 		$lockInfo = \Foomo\Lock::getLockInfo($lockName1);
 		$this->assertEquals(3, $lockInfo['lock_age']);
@@ -66,15 +66,15 @@ public function testLockAge() {
 	public function testGetInfo() {
 		//get a lock from this process
 		$lockName1 = 'testLock1';
-		$lockObtained = \Foomo\Lock::lock($lockName1, $blocking = true);
+		$lockObtained = \Foomo\Lock::lockResource($lockName1, $blocking = true);
 		$this->assertTrue($lockObtained, 'should be able to obtain first lock');
 		$info = \Foomo\Lock::getLockInfo($lockName1);
 		$this->assertTrue($info['is_locked'], 'should be locked after lock call');
 		$this->assertTrue($info['caller_is_owner'], 'should owned by us');
 		$this->assertLessThanOrEqual(5, $info['lock_age']);
 
 		//release and lock from another process
-		\Foomo\Lock::release($lockName1);
+		\Foomo\Lock::releaseResource($lockName1);
 
 		//start second process but do not wait for return!
 

tests/Foomo/lock.php

@@ -7,12 +7,12 @@
 }
 
 if ($sleep == 0) {
-	$lockObtained = \Foomo\Lock::lock($lockName, $blocking = false);
+	$lockObtained = \Foomo\Lock::lockResource($lockName, $blocking = false);
 	echo $lockObtained ? 'true' : 'false';
 	exit;
 } else {
 
-	$lockObtained = \Foomo\Lock::lock($lockName, $blocking = false, 'description');
+	$lockObtained = \Foomo\Lock::lockResource($lockName, $blocking = false, 'description');
 	//trigger_error('lock obtained ' . ($lockObtained ? 'true' : 'false'));
 	echo $lockObtained ? 'true' : 'false';
 	$info = \Foomo\Lock::getLockInfo($lockName);
@@ -21,7 +21,7 @@
 
 
 	sleep($sleep);
-	$release = \Foomo\Lock::release($lockName);
+	$release = \Foomo\Lock::releaseResource($lockName);
 	trigger_error('lock released ' . ($release ? 'true' : 'false'));
 
 	exit;

views/Foomo/Cache/Frontend/partials/resourcesList.tpl

@@ -1,4 +1,3 @@
-
 <?
 	foreach ($resources as $resource):
 		 $valid = ($resource->status == \Foomo\Cache\CacheResource::STATUS_VALID) || ($resource->expirationTime < \time());
@@ -93,7 +92,7 @@
 
 					<h2>Value</h2>
 					<div class="greyBox">
-					<?= var_dump($resource->value) ?>
+					<?= htmlspecialchars(var_export($resource->value, true), ENT_QUOTES) ?>
 					</div>
 
 				</div>