Added support for Slim apps running in subdirs. (Fixes #6)

itsgoingd · Oct 15, 2013 · 7597ef2 · 7597ef2
1 parent 20df69a
commit 7597ef2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Clockwork/Support/Slim/ClockworkMiddleware.php b/Clockwork/Support/Slim/ClockworkMiddleware.php
@@ -34,12 +34,8 @@ public function call()
 
 		$this->app->config('clockwork', $this->clockwork);
 
-		if ($this->app->config('debug')) {
-			if (preg_match('#/__clockwork(/(?<id>[0-9\.]+))?#', $this->app->request()->getPathInfo(), $matches)) {
-				return $this->retrieveRequest($matches['id']);
-			}
-
-			$this->app->response()->header('X-Clockwork-Version', Clockwork::VERSION);
+		if ($this->app->config('debug') && preg_match('#/__clockwork(/(?<id>[0-9\.]+))?#', $this->app->request()->getPathInfo(), $matches)) {
+			return $this->retrieveRequest($matches['id']);
 		}
 
 		try {
@@ -63,6 +59,12 @@ protected function logRequest()
 
 		if ($this->app->config('debug')) {
 			$this->app->response()->header('X-Clockwork-Id', $this->clockwork->getRequest()->id);
+			$this->app->response()->header('X-Clockwork-Version', Clockwork::VERSION);
+
+			$env = $this->app->environment();
+			if ($env['SCRIPT_NAME']) {
+				$this->app->response()->header('X-Clockwork-Path', $env['SCRIPT_NAME'] . '/__clockwork/');
+			}
 		}
 	}
 }