diff options
| author | deva <deva> | 2010-03-02 15:00:35 +0000 |
|---|---|---|
| committer | deva <deva> | 2010-03-02 15:00:35 +0000 |
| commit | c34ccc130e2a507c266ee54a163cdf3a5886d63d (patch) | |
| tree | 42f170422c068bf6c901d2770be938e54fb8b608 /htdocs | |
| parent | e10832ad013881909cf1a051bbecae732b9e4cad (diff) | |
Made a lot of changes, making it possible to entirely remove th config.php file from the project. These changes includes the creation of a new rss config module, the adding of some config vars in both the events and news modules.
Diffstat (limited to 'htdocs')
| -rw-r--r-- | htdocs/config.php.defaults | 28 | ||||
| -rw-r--r-- | htdocs/index.php | 16 |
2 files changed, 12 insertions, 32 deletions
diff --git a/htdocs/config.php.defaults b/htdocs/config.php.defaults deleted file mode 100644 index 84d7c52..0000000 --- a/htdocs/config.php.defaults +++ /dev/null @@ -1,28 +0,0 @@ -<?php -/* -*- Mode: php; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ - -$PAGE_DIR = "../pages"; -$DATA_DIR = "../data"; -$ALBUMS_DIR = "gfx/albums"; -$ICONS_DIR = "gfx/icons"; -$MEMBERS_DIR = "gfx/members"; -$UTIL_DIR = "../utils"; -$MODULES_DIR = $UTIL_DIR . "/modules"; - -$MODULES = array("news", "events", "pages", "gallery", "config", "icons", "members"); - -$DEFAULT_PAGE = "news"; - -$ADMIN_TIMEOUT = 60*60; // 60 min timeout - -$PRELOAD = array("gfx/biography_hover.jpg", - "gfx/contact_hover.jpg", - "gfx/discography_hover.jpg" , - "gfx/downloads_hover.jpg", - "gfx/gallery_hover.jpg", - "gfx/guestbook_hover.jpg", - "gfx/live_hover.jpg", - "gfx/members_hover.jpg", - "gfx/news_hover.jpg", - "gfx/shop_hover.jpg"); -?>
\ No newline at end of file diff --git a/htdocs/index.php b/htdocs/index.php index 823c388..a550f77 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -1,7 +1,17 @@ <?php $start_time = microtime(true); -include_once("config.php"); +if(file_exists("config.php")) include_once("config.php"); + +if(!isset($DATA_DIR)) $DATA_DIR = "../data"; +if(!isset($ALBUMS_DIR)) $ALBUMS_DIR = "gfx/albums"; +if(!isset($ICONS_DIR)) $ICONS_DIR = "gfx/icons"; +if(!isset($MEMBERS_DIR)) $MEMBERS_DIR = "gfx/members"; +if(!isset($UTIL_DIR)) $UTIL_DIR = "../utils"; +if(!isset($MODULES_DIR)) $MODULES_DIR = $UTIL_DIR . "/modules"; +if(!isset($IMAGECACHE)) $IMAGECACHE = $DATA_DIR . "/imagecache"; +if(!isset($ADMIN_TIMEOUT)) $ADMIN_TIMEOUT = 60*60; // 60 min timeout +if(!isset($JPEG_CACHE_QUALITY)) $JPEG_CACHE_QUALITY = 85; if($mode == "imagecache") { include_once($UTIL_DIR. "/imagecache.php"); @@ -41,7 +51,7 @@ if($config->value('splash') == "true") { <link href="/favicon.ico" rel="shortcut icon"/> <link rel="stylesheet" type="text/css" href="<?php echo $config->value('css'); ?>" media="screen"/> </head> -<body> +<body class="splashbody"> <div class="splash"> <?php $p = $pages->getPage($config->value('splashpage')); @@ -56,7 +66,6 @@ if($config->value('splash') == "true") { } } - ?> <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> @@ -70,7 +79,6 @@ if($config->value('splash') == "true") { <link rel="author" title="Bent Bisballe Nyeng" href="http://www.aasimon.org"/> <link href="/favicon.ico" rel="shortcut icon"/> <link rel="stylesheet" type="text/css" href="<?php echo $config->value('css'); ?>" media="screen"/> -<!-- <link rel="stylesheet" type="text/css" href="handheld.css" media="handheld"/> --> <link rel="stylesheet" type="text/css" href="admin.css" media="screen"/> <script type="text/javascript"> // <!-- |