@@ -36,9 +36,9 @@ include_dir(SYSTEM_DIR); include_dir(LIB_DIR); // Load the site's main config files -$master = Spyc::YAMLLoad(CONFIG_DIR.'master.yaml'); -$templates = Spyc::YAMLLoad(CONFIG_DIR.'templates.yaml'); -$nested_pages = Spyc::YAMLLoad(CONFIG_DIR.'pages.yaml'); +$config['master'] = Spyc::YAMLLoad(CONFIG_DIR.'master.yaml'); +$config['templates'] = Spyc::YAMLLoad(CONFIG_DIR.'templates.yaml'); +$config['nested_pages'] = Spyc::YAMLLoad(CONFIG_DIR.'pages.yaml'); // Load the database connection file if(file_exists(CONFIG_DIR.'db.yaml')) @@ -51,7 +51,7 @@ if(!empty($db_conf)) { } // Get the default page -$home_page = array_key_exists('home_page', $master) ? $master['home_page'] : DEFAULT_HOME_PAGE; +$home_page = array_key_exists('home_page', $config['master']) ? $config['master']['home_page'] : DEFAULT_HOME_PAGE; // Get the path $path = array_key_exists('path', $_GET) ? $_GET['path'] : $home_page; @@ -65,7 +65,7 @@ if(array_key_exists('path', $_GET) && $_GET['path'] == $home_page) { // Reformat nested_pages array to flat list of pages $pages = array(); -extract_pages($nested_pages); +extract_pages($config['nested_pages']); // If the path doesn't exist in the pages array, reset the path to 404 if(!array_key_exists($path, $pages)) { @@ -90,22 +90,22 @@ if(array_key_exists($path, $pages)) { // Combine page values with master values foreach($page as $key => $value) { - if(array_key_exists($key, $master)) { + if(array_key_exists($key, $config['master'])) { // Querystring is a special case switch($key) { case 'querystring': break; default: if(is_array($value)) { - $page[$key] = array_merge_recursive($master[$key], $value); + $page[$key] = array_merge_recursive($config['master'][$key], $value); } elseif(is_string($value)) { $page[$key] = $value; } } - unset($master[$key]); + unset($config['master'][$key]); } } - $page = array_merge($page, $master); + $page = array_merge($page, $config['master']); // Add get vars to $page['vars'] if(isset($_GET['querystring'])) { @@ -143,8 +143,8 @@ if(array_key_exists($path, $pages)) { $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]; + if(array_key_exists($template, $config['templates'])) { + $parts = $config['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; phooey/system/boot.php @@ -241,12 +241,12 @@ function nav_data($depth=1000, $parent=false) { - global $nested_pages; + global $config; global $pages; if($parent && array_key_exists('subpages', $pages[$parent])) { return nav_data_from_tree(1, $depth, $pages[$parent]['subpages'], $parent.'/'); } else { - return nav_data_from_tree(1, $depth, $nested_pages, ''); + return nav_data_from_tree(1, $depth, $config['nested_pages'], ''); } } @@ -295,7 +295,7 @@ { global $page; global $pages; - global $nested_pages; + global $config; global $home_page; $page_path = $for_page ? $for_page : $page['path']; $page_data = $pages[$page_path]; phooey/system/phooey_helpers.php c7d81a5ba39444426cb25b84e9326dd88a10cc44 Jason T Johnson design@postpostmodern.com http://github.com/postpostmodern/phooey/commit/09b68014cb0415218c307c35f3e4fb4c1729d068 09b68014cb0415218c307c35f3e4fb4c1729d068 2009-03-10T13:57:13-07:00 2009-03-10T13:57:13-07:00 Put config vars into array e61b37697287758b9f09ff8a326ca16c166c6aa4 Jason T Johnson design@postpostmodern.com