ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved request parser to support subdirectories

Browse Source 
Leading components in the request string are checked to see if they match template subdirectories before looking for valid page names.
Index files are checked if the request string ends on a valid subdirectory
If no valid page is found within a subdirectory, the last name is rechecked to see if it was a valid page file
This commit is contained in:
Ben Roberts
2010-03-21 01:35:48 +00:00
parent 3cbc12e918
commit 86d8d65dd8
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
HandBrakeCluster/RequestParser.class.php
View File

@@ -3,7 +3,7 @@
class HandBrakeCluster_RequestParser {
private $request_string;
private $page = 'home';
private $page = array();
private $vars = array();
public function __construct($request_string) {
@@ -22,8 +22,38 @@ class HandBrakeCluster_RequestParser {
return;
}
// The first token is the page to execute
$this->page = array_shift($components);
// Read through the components list looking for elements matching known directories and files
// to determine which page this request is for
$base_dir = 'templates';
while (true) {
if ($components && ! $components[0]) {
// Skip over any empty components before we find a page
array_shift($components);
}
if ($components && is_dir($base_dir . '/' . $components[0])) {
$base_dir .= '/' . $components[0];
array_push($this->page, array_shift($components));
} elseif ($components && is_file($base_dir . '/' . $components[0] . '.tpl')) {
// We have found a valid page, so break the loop here,
// leaving the remaining components as key/value pairs
array_push($this->page, array_shift($components));
break;
} else {
// See if we've already seen a component and assumed it referred to a dir when a file of the same name exists
if ($this->page && is_file($base_dir . '.tpl')) {
break;
} elseif ( ! $components && is_file($base_dir . '/index.tpl')) {
// The last component in the path was a valid directory, and a directory index exists
array_push($this->page, 'index');
break;
} else {
// No valid page was found, so display an error page
$this->page = array('404');
return;
}
}
}
// The subsequent tokens are parameters for this page in key value pairs
while ($components) {
@@ -32,7 +62,7 @@ class HandBrakeCluster_RequestParser {
}
public function page() {
return $this->page;
return join('/', $this->page);
}
public function get($key) {