joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Dot syntax URIs weren't erroring correctly

Browse source 
Instead of routing to a 404 or home, was just returning [] (empty JSON array). Updated to redirect home for the time being. 404 handling needs to be addressed soon anyway, it's kinda junk right now
This commit is contained in:
Josh Sherman 2013-09-09 16:05:52 -04:00
parent 050871ebe6
commit 1a0f66cc9c
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
classes/Controller.php
View file

@ -98,7 +98,7 @@ class Controller extends Object
} }
// Loads the module's information // Loads the module's information
list($module_class, $module_filename, $template_basename, $css_class, $js_basename) = $this->prepareVariables($request); list($module_class, $module_filename, $template_basename, $css_class, $js_basename, $dot_syntax) = $this->prepareVariables($request);
unset($request); unset($request);
@ -116,7 +116,11 @@ class Controller extends Object
} }
else else
{ {
if ($this->config->pickles['logging'] === true) if ($dot_syntax)
{
Browser::goHome();
}
elseif ($this->config->pickles['logging'] === true)
{ {
Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename); Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename);
} }
@ -326,7 +330,7 @@ class Controller extends Object
$valid_request = false; $valid_request = false;
$valid_security_hash = false; $valid_security_hash = false;
$error_message = 'An unexpected error has occurred'; $error_message = 'An unexpected error has occurred.';
// Determines if the request method is valid for this request // Determines if the request method is valid for this request
if ($module->method !== false) if ($module->method !== false)
@ -477,7 +481,9 @@ class Controller extends Object
*/ */
public function prepareVariables($basename) public function prepareVariables($basename)
{ {
if (strpos($basename, '.') !== false) $dot_syntax = strpos($basename, '.') !== false;
if ($dot_syntax)
{ {
list($basename, $action) = explode('.', $basename, 2); list($basename, $action) = explode('.', $basename, 2);
$action = str_replace('.', '_', $action); $action = str_replace('.', '_', $action);
@ -504,7 +510,7 @@ class Controller extends Object
$module_class = preg_replace('/(-(.{1}))/e', 'strtoupper("$2")', $module_class); $module_class = preg_replace('/(-(.{1}))/e', 'strtoupper("$2")', $module_class);
} }
return array($module_class, $module_filename, $template_basename, $css_class, $js_basename); return array($module_class, $module_filename, $template_basename, $css_class, $js_basename, $dot_syntax);
} }
} }