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

Dropped dot syntax

Browse source 
Too much juggling to make sure the proper assets were loaded. Opened up a security issue that allowed some pages to be accessed even if data was missing, just a headache, best to move away from it and allow users to defining custom routing in inde.php. Perhaps down the road allowing a Route class that the user can define everything in.
This commit is contained in:
Josh Sherman 2013-09-12 17:59:29 -04:00
parent d671cfa977
commit 4d9eb54b13
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
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, $dot_syntax) = $this->prepareVariables($request); list($module_class, $module_filename, $template_basename, $css_class, $js_basename) = $this->prepareVariables($request);
unset($request); unset($request);
@ -116,11 +116,7 @@ class Controller extends Object
} }
else else
{ {
if ($dot_syntax) if ($this->config->pickles['logging'] === true)
{
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);
} }
@ -476,14 +472,6 @@ class Controller extends Object
*/ */
public function prepareVariables($basename) public function prepareVariables($basename)
{ {
$dot_syntax = strpos($basename, '.') !== false;
if ($dot_syntax)
{
list($basename, $action) = explode('.', $basename, 2);
$action = str_replace('.', '_', $action);
}
// Sets up all of our variables // Sets up all of our variables
$module_class = strtr($basename, '/', '_'); $module_class = strtr($basename, '/', '_');
$module_filename = SITE_MODULE_PATH . $basename . '.php'; $module_filename = SITE_MODULE_PATH . $basename . '.php';
@ -505,7 +493,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, $dot_syntax); return array($module_class, $module_filename, $template_basename, $css_class, $js_basename);
} }
} }