Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
|
b82b04b121 | ||
|
0c3b239417 | ||
|
d8e6c43868 | ||
|
ed90ee3501 | ||
|
8752540f31 |
5 changed files with 16 additions and 16 deletions
|
@ -170,21 +170,12 @@ class Config extends Object
|
||||||
|
|
||||||
// Defaults profiler to true if it doesn't match an option exactly
|
// Defaults profiler to true if it doesn't match an option exactly
|
||||||
if (isset($this->data['pickles']['profiler']))
|
if (isset($this->data['pickles']['profiler']))
|
||||||
{
|
|
||||||
if ($this->data['pickles']['profiler'] !== true)
|
|
||||||
{
|
{
|
||||||
// If we have an array convert to a string
|
// If we have an array convert to a string
|
||||||
if (is_array($this->data['pickles']['profiler']))
|
if (is_array($this->data['pickles']['profiler']))
|
||||||
{
|
{
|
||||||
$this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
|
$this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Checks that one of our known values exists, if not, force true
|
|
||||||
if (preg_match('/(objects|timers|queries|explains)/', $this->data['pickles']['profiler'] == false))
|
|
||||||
{
|
|
||||||
$this->data['pickles']['profiler'] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -487,7 +487,14 @@ class Controller extends Object
|
||||||
// Scrubs class names with hyphens
|
// Scrubs class names with hyphens
|
||||||
if (strpos($module_class, '-') !== false)
|
if (strpos($module_class, '-') !== false)
|
||||||
{
|
{
|
||||||
$module_class = preg_replace('/(-(.{1}))/e', 'strtoupper("$2")', $module_class);
|
$module_class = preg_replace_callback(
|
||||||
|
'/(-(.{1}))/',
|
||||||
|
function ($matches)
|
||||||
|
{
|
||||||
|
return strtoupper($matches[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);
|
||||||
|
|
|
@ -227,7 +227,7 @@ class Database_PDO_Common extends Database_Common
|
||||||
$end_time = microtime(true);
|
$end_time = microtime(true);
|
||||||
$duration = $end_time - $start_time;
|
$duration = $end_time - $start_time;
|
||||||
|
|
||||||
if ($duration >= 1)
|
if ($duration >= 1 && isset($loggable_query))
|
||||||
{
|
{
|
||||||
Log::slowQuery($duration . ' seconds: ' . $loggable_query);
|
Log::slowQuery($duration . ' seconds: ' . $loggable_query);
|
||||||
}
|
}
|
||||||
|
|
|
@ -255,12 +255,14 @@ class Security
|
||||||
if (self::checkSession() == true && isset($_SESSION['__pickles']['security']['user_id']))
|
if (self::checkSession() == true && isset($_SESSION['__pickles']['security']['user_id']))
|
||||||
{
|
{
|
||||||
// Checks the session against the cookie
|
// Checks the session against the cookie
|
||||||
|
/*
|
||||||
if (isset($_SESSION['__pickles']['security']['token'], $_COOKIE['pickles_security_token'])
|
if (isset($_SESSION['__pickles']['security']['token'], $_COOKIE['pickles_security_token'])
|
||||||
&& $_SESSION['__pickles']['security']['token'] != $_COOKIE['pickles_security_token'])
|
&& $_SESSION['__pickles']['security']['token'] != $_COOKIE['pickles_security_token'])
|
||||||
{
|
{
|
||||||
Security::logout();
|
Security::logout();
|
||||||
}
|
}
|
||||||
elseif (isset($_SESSION['__pickles']['security']['level']) && $_SESSION['__pickles']['security']['level'] != null)
|
else*/
|
||||||
|
if (isset($_SESSION['__pickles']['security']['level']) && $_SESSION['__pickles']['security']['level'] != null)
|
||||||
{
|
{
|
||||||
return $_SESSION['__pickles']['security']['level'];
|
return $_SESSION['__pickles']['security']['level'];
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,7 +140,7 @@ function __autoload($class)
|
||||||
|
|
||||||
if ($class == 'AYAH')
|
if ($class == 'AYAH')
|
||||||
{
|
{
|
||||||
$loaded = require_once PICKLES_VENDOR_PATH . '/ayah/' . $filename;
|
$loaded = require_once PICKLES_VENDOR_PATH . '/ayah/' . strtolower($filename);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue