phooey/site/config/db.yaml phooey/site/config/master.yaml phooey/site/config/pages.yaml phooey/site/config/templates.yaml phooey/site/content/contact.page phooey/site/content/guide.page phooey/site/content/home.page phooey/site/lib/Actions.class.php phooey/site/lib/Helper.class.php phooey/site/lib/PostPostMailer.class.php phooey/site/templates/close.part phooey/site/templates/footer.part phooey/site/templates/header.part phooey/site/templates/open.part @@ -2,14 +2,15 @@ // Directories -define('PRIVATE_DIR', dirname(__FILE__).'/../'); +define('PHOOEY_DIR', dirname(__FILE__).'/../'); define('PUBLIC_DIR', dirname(__FILE__).'/../../public/'); -define('CONFIG_DIR', PRIVATE_DIR.'config/'); -define('LIB_DIR', PRIVATE_DIR.'lib/'); -define('SYSTEM_DIR', PRIVATE_DIR.'system/'); -define('TEMPLATE_DIR', PRIVATE_DIR.'templates/'); -define('CONTENT_DIR', PRIVATE_DIR.'content/'); -define('PLUGINS_DIR', PRIVATE_DIR.'plugins/'); +define('SITE_DIR', PHOOEY_DIR.'site/'); +define('CONFIG_DIR', SITE_DIR.'config/'); +define('LIB_DIR', SITE_DIR.'lib/'); +define('TEMPLATE_DIR', SITE_DIR.'templates/'); +define('CONTENT_DIR', SITE_DIR.'content/'); +define('SYSTEM_DIR', PHOOEY_DIR.'system/'); +define('PLUGINS_DIR', PHOOEY_DIR.'plugins/'); define('FILTERS_DIR', PLUGINS_DIR.'content_filters/'); // Defaults @@ -54,138 +55,3 @@ if(array_key_exists('db', $config) && !empty($config['db'])) { $request = new Request(); $site = new Site($config); $site->serve($request); - -// Get the default page -// $home_page = array_key_exists('home_page', $master) ? $master['home_page'] : DEFAULT_HOME_PAGE; - -// Get the path -// $path = array_key_exists('path', $_GET) ? $_GET['path'] : $home_page; -// $path = trim($path, '/'); - -// Redirect /home to / -// if(array_key_exists('path', $_GET) && $_GET['path'] == $home_page) { -// header("Location: /"); -// exit; -// } - -// Reformat nested_pages array to flat list of pages -// $pages = array(); -// extract_pages($nested_pages); - -// If the path doesn't exist in the pages array, reset the path to 404 -// if(!array_key_exists($path, $pages)) { -// $path = '404'; -// } - -// Find the page's entry in the pages array -// if(array_key_exists($path, $pages)) { -// // Set the page's path in the $page array -// $page = $pages[$path]; -// $page['path'] = $path; -// $page['vars'] = is_array($page['vars']) ? $page['vars'] : array(); - - // Check for redirect - // if(array_key_exists('redirect', $page)) { - // header('Location: '.$page['redirect']); - // exit; - // } - - // Set the page's content file - // $content_file = CONTENT_DIR.$path.'.page'; - - // Combine page values with master values - // foreach($page as $key => $value) { - // if(array_key_exists($key, $master)) { - // // Querystring is a special case - // switch($key) { - // case 'querystring': - // break; - // default: - // if(is_array($value)) { - // $page[$key] = array_merge_recursive($master[$key], $value); - // } elseif(is_string($value)) { - // $page[$key] = $value; - // } - // } - // unset($master[$key]); - // } - // } - // $page = array_merge($page, $master); - - // Add get vars to $page['vars'] - // if(isset($_GET['querystring'])) { - // $var_values = explode('/', $_GET['querystring']); - // $var_keys = explode('/', $page['querystring']); - // foreach($var_keys as $key => $val) { - // if(array_key_exists($key, $var_values)) { - // $page['vars'][$val] = $var_values[$key]; - // } - // } - // } - - /* Check for and evaluate action - if(array_key_exists('action', $page)) { - require_once(LIB_DIR.'actions.php'); - if(is_callable($page['action'])) { - $page['vars'] = call_user_func($page['action'], $page['vars']); - } - } - - // Check for and evaluate multiple actions - if(array_key_exists('actions', $page) && is_array($page['actions'])) { - require_once(LIB_DIR.'actions.php'); - foreach($page['actions'] as $action) { - if(is_callable($action)) { - $page['vars'] = call_user_func($action, $page['vars']); - } - } - } - */ - // $vars is a shortcut for $page['vars'] - // $vars = $page['vars']; - - // Establish which template to use - // $template = array_key_exists('template', $page) ? $page['template'] : DEFAULT_TEMPLATE; - - // Build page parts based on template - // if(array_key_exists($template, $templates)) { - // $parts = $templates[$template]; - // $has_content = in_array('CONTENT', $parts) && file_exists($content_file); - // $eval_php = (!array_key_exists('eval_php', $page) || $page['eval_php'] === true); - // $content_filter = array_key_exists('content_filter', $page) ? $page['content_filter'] : false; - // - // if($has_content) { - // if($eval_php) { - // ob_start(); - // require_once($content_file); - // $content = ob_get_contents(); - // ob_end_clean(); - // } else { - // $content = file_get_contents($content_file); - // } - // if($content_filter) { - // if(!is_array($content_filter)) { - // $content_filter = array($content_filter); - // } - // foreach($content_filter as $filter) { - // require_once(FILTERS_DIR . $filter . '/init.php'); - // $content = call_user_func($filter, $content); - // } - // } - // } else { - // $content = ''; - // } - - // foreach($parts as $part) { - // if($part == 'CONTENT') { - // echo $content; - // } elseif(file_exists(TEMPLATE_DIR.$part.'.part')) { - // include(TEMPLATE_DIR.$part.'.part'); - // } - // } -// } -// } else { - // If all of the above fails... - // header("HTTP/1.0 404 Not Found"); - // echo "404 Not Found"; -// } phooey/system/boot.php phooey/config/db.yaml phooey/config/master.yaml phooey/config/pages.yaml phooey/config/templates.yaml phooey/content/contact.page phooey/content/guide.page phooey/content/home.page phooey/lib/Actions.class.php phooey/lib/Helper.class.php phooey/lib/PostPostMailer.class.php phooey/templates/close.part phooey/templates/footer.part phooey/templates/header.part phooey/templates/open.part 012f89aec5c40b632de8e297ce497dfc5a48492d Jason T Johnson design@postpostmodern.com http://github.com/postpostmodern/phooey/commit/8787c16920bf375e1aa315881fef422803eea91b 8787c16920bf375e1aa315881fef422803eea91b 2009-03-18T14:04:25-07:00 2009-03-18T14:04:25-07:00 Moved site (user) files into site dir cd2740d2038b9b89ca2245e67952a00d0aad4e58 Jason T Johnson design@postpostmodern.com