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

Updated the paths.

Browse source
This commit is contained in:
Josh Sherman 2010-05-15 22:39:25 -04:00
parent 489edfd61d
commit fcc6533be7
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/Controller.php
View file

@ -77,7 +77,7 @@ class Controller extends Object
$basename = strtr($request, '-', '_');
$module_class = strtr($basename, '/', '_');
$module_filename = MODULE_PATH . $basename . '.php';
$module_filename = SITE_MODULE_PATH . $basename . '.php';
$template_basename = $basename;
$css_class = strtr($basename, '_', '-');
$js_basename = $basename;
@ -89,7 +89,7 @@ class Controller extends Object
{
$basename = $this->config->module['default'];
$module_class = strtr($basename, '/', '_');
$module_filename = MODULE_PATH . $basename . '.php';
$module_filename = SITE_MODULE_PATH . $basename . '.php';
$template_basename = $basename;
$css_class = strtr($basename, '_', '-');
$js_basename = $basename;

2
classes/Display/Common.php
View file

@ -91,7 +91,7 @@ abstract class Display_Common extends Object
// Loops through each passed template and variables it
foreach (func_get_args() as $template)
{
$template = TEMPLATE_PATH . $template . ($this->extension != false ? '.' . $this->extension : '');
$template = SITE_TEMPLATE_PATH . $template . ($this->extension != false ? '.' . $this->extension : '');
if (file_exists($template) && is_file($template) && is_readable($template))
{

2
classes/Display/Smarty.php
View file

@ -48,7 +48,7 @@ class Display_Smarty extends Display_Common
$this->smarty = new Smarty();
// Establishes our paths
$this->smarty->template_dir = TEMPLATE_PATH;
$this->smarty->template_dir = SITE_TEMPLATE_PATH;
$cache_dir = SMARTY_PATH . 'cache';
$compile_dir = SMARTY_PATH . 'compile';

18
pickles.php
View file

@ -33,15 +33,17 @@ if (ini_get('date.timezone') == '')
ini_set('date.timezone', 'America/New_York');
}
// Establishes our paths
define('PICKLES_PATH', dirname(__FILE__) . '/');
define('SITE_PATH', getcwd() . '/../');
// Establishes our PICKLES paths
define('PICKLES_PATH', dirname(__FILE__) . '/');
define('PICKLES_CLASS_PATH', PICKLES_PATH . 'classes/');
define('CLASS_PATH', PICKLES_PATH . 'classes/');
// Establishes our site paths
define('SITE_PATH', getcwd() . '/../');
define('MODEL_PATH', SITE_PATH . 'models/');
define('MODULE_PATH', SITE_PATH . 'modules/');
define('TEMPLATE_PATH', SITE_PATH . 'templates/');
define('SITE_CLASS_PATH', SITE_PATH . 'classes/');
define('SITE_MODEL_PATH', SITE_PATH . 'models/');
define('SITE_MODULE_PATH', SITE_PATH . 'modules/');
define('SITE_TEMPLATE_PATH', SITE_PATH . 'templates/');
define('PRIVATE_PATH', SITE_PATH . 'private/');
define('LOG_PATH', PRIVATE_PATH . 'logs/');
@ -79,7 +81,7 @@ function __autoload($class)
{
$filename = preg_replace('/_/', '/', $class) . '.php';
$paths = array(CLASS_PATH, MODEL_PATH, MODULE_PATH);
$paths = array(PICKLES_CLASS_PATH, SITE_CLASS_PATH, SITE_MODEL_PATH, SITE_MODULE_PATH);
foreach ($paths as $path)
{