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

Removed logic that interacted with passed IDs. This logic belongs in the .htaccess file (assuming it's even necessary for the site).

Browse source
This commit is contained in:
Josh Sherman 2010-12-26 14:27:45 -05:00
parent 453d9b4033
commit bef224d5ec
1 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

37
classes/Controller.php
View file

@ -85,41 +85,22 @@ class Controller extends Object
Error::fatal($_SERVER['SERVER_NAME'] . ' is currently<br />down for maintenance');
}
// Loads the requested module's information
// Checks the passed request for validity
if (isset($_REQUEST['request']) && trim($_REQUEST['request']) != '')
{
$request = explode('/', $_REQUEST['request']);
$last_part = end($request);
// Checks if a return type was passed in
if (strpos($last_part, '.') !== false)
{
list($last_part, $return_type) = explode('.', $last_part);
}
// Checks if an ID (integer) was passed in
if (preg_match('/^\d*$/', $last_part) == 1)
{
$requested_id = $last_part;
array_pop($request);
}
else
{
$request[key($request)] = $last_part;
}
list($module_class, $module_filename, $template_basename, $css_class, $js_basename) = $this->prepareVariables(implode('/', $request));
unset($last_part, $request);
$request = $_REQUEST['request'];
}
// Loads the default module information (if any)
// Loads the default module information if we don't have a valid request
else
{
$default_module = isset($this->config->pickles['module']) ? $this->config->pickles['module'] : 'home';
list($module_class, $module_filename, $template_basename, $css_class, $js_basename) = $this->prepareVariables($default_module);
$request = isset($this->config->pickles['module']) ? $this->config->pickles['module'] : 'home';
}
// Loads the module's information
list($module_class, $module_filename, $template_basename, $css_class, $js_basename) = $this->prepareVariables($request);
unset($request);
$module_exists = (isset($module_filename) && $module_filename != null && file_exists($module_filename));
// Instantiates an instance of the module