diff options
author | neoraider <devnull@localhost> | 2006-01-13 00:49:05 +0100 |
---|---|---|
committer | neoraider <devnull@localhost> | 2006-01-13 00:49:05 +0100 |
commit | 8b89c8c8a9001c5f5b38465ceb58306fc6f0659e (patch) | |
tree | a5b57b8809365c8e3184ae81bd193986367e31b8 | |
parent | ecb8233cd7e9fbacd7614028115161565e841d87 (diff) | |
download | neon-8b89c8c8a9001c5f5b38465ceb58306fc6f0659e.tar neon-8b89c8c8a9001c5f5b38465ceb58306fc6f0659e.zip |
Navigationsleiste verbessert (ungenutzte Eintr?ge werden ausgeblendet); einige kleinere ?nderungen + Bugs gefixt
-rw-r--r-- | code/content.inc.php | 35 | ||||
-rw-r--r-- | code/links.inc.php | 4 | ||||
-rw-r--r-- | code/nav.inc.php | 15 | ||||
-rw-r--r-- | code/pages.inc.php | 53 | ||||
-rw-r--r-- | config/config.inc.php | 2 | ||||
-rw-r--r-- | handlers/default.inc.php | 2 | ||||
-rw-r--r-- | index.php | 9 | ||||
-rw-r--r-- | styles/GreenGrid/style.css | 12 |
8 files changed, 87 insertions, 45 deletions
diff --git a/code/content.inc.php b/code/content.inc.php deleted file mode 100644 index 8a20507..0000000 --- a/code/content.inc.php +++ /dev/null @@ -1,35 +0,0 @@ -<?PHP - if(!defined('CONTENT_INC')) { - define('CONTENT_INC', 1); - - include('code/db.inc.php'); - include('code/user.inc.php'); - include('code/handlers.inc.php'); - - function GetPage($name) { - $user = $GLOBALS['user']; - - $res = DBQuery('SELECT access, handler, data FROM pages WHERE name = ?', $name); - - if(!$res->RecordCount()) { - $message = $GLOBALS['handlers']['default']->HandleErrorMessage('PageNotFound', array('page' => $name)); - - if(!$message['title']) $message['title'] = $name; - - return $message; - } - - if((($user->GetUid() == 0) || ($user->GetGid() != 0)) && ($res->fields[0] & (1 << $user->GetGid())) == 0) { - $message = $GLOBALS['handlers'][$res->fields[1]]->HandleErrorMessage('Forbidden', array('page' => $name)); - - if(!$message['title']) $message['title'] = $name; - - return $message; - } - parse_str($res->fields[2], $data); - $data['_page'] = $name; - - return $GLOBALS['handlers'][$res->fields[1]]->HandleContentData($data); - } - } -?> diff --git a/code/links.inc.php b/code/links.inc.php index ab3b786..39a1ae2 100644 --- a/code/links.inc.php +++ b/code/links.inc.php @@ -4,7 +4,9 @@ class Links { function GetNeonLink($page) { - return 'index.php?page=' . $page; + if($GLOBALS['pages']->HasAccess($page)) + return 'index.php?page=' . $page; + return ''; } function GetExternalLink($link) { diff --git a/code/nav.inc.php b/code/nav.inc.php index f6f0782..245e208 100644 --- a/code/nav.inc.php +++ b/code/nav.inc.php @@ -65,6 +65,7 @@ } function Parse() { + $ccount = 0; $ret = '<li>'; $link = $GLOBALS['links']->ParseNavLink($this->link); @@ -77,12 +78,22 @@ if(count($this->children) > 0) { $ret .= '<ul>'; - foreach($this->children as $child) - $ret .= $child->Parse(); + foreach($this->children as $child) { + $cret = $child->Parse(); + + if($cret) { + $ret .= $cret; + + $ccount++; + } + } $ret .= '</ul>'; } + if(!$ccount && !$link) + return ''; + return $ret . '</li>'; } } diff --git a/code/pages.inc.php b/code/pages.inc.php new file mode 100644 index 0000000..d529602 --- /dev/null +++ b/code/pages.inc.php @@ -0,0 +1,53 @@ +<?PHP + if(!defined('PAGES_INC')) { + define('PAGES_INC', 1); + + include('code/db.inc.php'); + include('code/user.inc.php'); + include('code/handlers.inc.php'); + + class Pages { + function Get($name) { + if(!$this->Exists($name)) { + $message = $GLOBALS['handlers']['default']->HandleErrorMessage('PageNotFound', array('page' => $name)); + + if(!$message['title']) $message['title'] = $name; + + return $message; + } + + $res = DBQuery('SELECT handler, data FROM pages WHERE name = ?', $name); + + if(!$this->HasAccess($name)) { + $message = $GLOBALS['handlers'][$res->fields[0]]->HandleErrorMessage('Forbidden', array('page' => $name)); + + if(!$message['title']) $message['title'] = $name; + + return $message; + } + + parse_str($res->fields[1], $data); + $data['_page'] = $name; + + return $GLOBALS['handlers'][$res->fields[0]]->HandleContentData($data); + } + + function Exists($name) { + $res = DBQuery('SELECT id FROM pages WHERE name = ?', $name); + + return ($res->RecordCount() > 0); + } + + function HasAccess($name) { + $user = $GLOBALS['user']; + + $res = DBQuery('SELECT access FROM pages WHERE name = ?', $name); + + return ((($user->GetUid() != 0) && ($user->GetGid() == 0)) + || ($res->fields[0] & (1 << $user->GetGid())) != 0); + } + } + + $pages = new Pages; + } +?> diff --git a/config/config.inc.php b/config/config.inc.php index 5f778d0..b69ea2f 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -5,7 +5,7 @@ // main options $config['language'] = 'de'; - $config['home'] = 'Test:LoremIpsum'; + $config['home'] = 'Home:Startseite'; // database connection diff --git a/handlers/default.inc.php b/handlers/default.inc.php index 0ea0a7b..2e2cd96 100644 --- a/handlers/default.inc.php +++ b/handlers/default.inc.php @@ -9,7 +9,7 @@ $title = strtr($data['title'], $tr); else $title = strtr($data['_page'], array(':' => ' - ')); - $content = strtr($data['content'], $tr); + $content = '<h2>' . $title . '</h2>' . strtr($data['content'], $tr); return array('title' => $title, 'content' => $content); } @@ -3,7 +3,7 @@ include('code/message.inc.php'); include('code/util.inc.php'); - include('code/content.inc.php'); + include('code/pages.inc.php'); include('code/nav.inc.php'); header('Content-type: text/html;charset=UTF-8'); @@ -17,7 +17,10 @@ $template_data = join('', file('templates/' . $template)); - $data = GetPage($page); + $data = $pages->Get($page); - echo Subst($template_data, array('title' => $config['title'] . $data['title'], 'stylesheet' => 'styles/' . $style . '/style.css', 'content' => $data['content'], 'nav' => $nav->ParseEntries())); + echo Subst($template_data, array('title' => $config['title'] . $data['title'], + 'stylesheet' => 'styles/' . $style . '/style.css', + 'content' => $data['content'], + 'nav' => $nav->ParseEntries())); ?> diff --git a/styles/GreenGrid/style.css b/styles/GreenGrid/style.css index 1a702ac..a46151d 100644 --- a/styles/GreenGrid/style.css +++ b/styles/GreenGrid/style.css @@ -47,8 +47,7 @@ div#nav { div#nav ul { padding-left:0; - margin-top:0; - margin-bottom:1em; + margin:0; } div#nav ul li { @@ -57,15 +56,24 @@ div#nav ul li { list-style-type:none; } +div#nav ul li ul { + margin-bottom:0.8em; +} + div#nav ul li ul li { text-align:left; font-weight:normal; } div#nav ul li ul li ul { + margin-bottom:0; padding-left:0.8em; } +h1, h2, h3, h4, h5, h6 { + margin-top:0; +} + .error { color:#FF0000; } |