From c8ef6f06beafe500b85cdb252477217d9e017114 Mon Sep 17 00:00:00 2001 From: neoraider Date: Fri, 22 Sep 2006 13:05:04 +0000 Subject: Bugfix in messages.inc.php; Provisorischen base-Seitentyp hinzugef?gt. --- base.xml | 3 +++ code/message.inc.php | 10 +++++----- core/modules.inc.php | 2 +- index.php | 37 +++++++------------------------------ lang/de.inc.php | 10 +++++----- pages/base/default.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 41 deletions(-) create mode 100644 pages/base/default.xml diff --git a/base.xml b/base.xml index a350b20..625f42e 100644 --- a/base.xml +++ b/base.xml @@ -12,6 +12,8 @@ templates user util + + default Login Logout Modules @@ -35,6 +37,7 @@ default phpexec Login + diff --git a/code/message.inc.php b/code/message.inc.php index 8545a01..fb9e8fa 100644 --- a/code/message.inc.php +++ b/code/message.inc.php @@ -1,11 +1,11 @@ pages[$name . '.' . $type]['path'] . 'pages/' . - strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav')) . '/' . $name . '.xml'; + strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav', 'b' => 'base')) . '/' . $name . '.xml'; } function GetTemplatePath($name) { diff --git a/index.php b/index.php index ae92eaf..cef78c6 100644 --- a/index.php +++ b/index.php @@ -4,40 +4,17 @@ require_once('core/modules.inc.php'); require_once('core/xmlparser.inc.php'); - Uses('message', 'util', 'pages', 'nav', 'links'); + Uses('util', 'pages', 'links'); header('Content-type: text/html;charset=UTF-8'); if($_GET['page']) $page = Unquote($_GET['page']); - else $page = $config['home']; + else $page = $GLOBALS['config']['home']; - if($_GET['mode'] == 'edit') $data = $pages->GetEditor($page, 'c', $GLOBALS['links']->GetNeonLink($page, null, false)); - else $data = $pages->Get($page, 'c'); + if($_GET['mode'] == 'edit') $data = $GLOBALS['pages']->GetEditor($page, 'c', $GLOBALS['links']->GetNeonLink($page, null, false)); + else $data = $GLOBALS['pages']->Get($page, 'c'); - echo ''; + $base = $pages->Get($GLOBALS['config']['default_base'], 'b'); + + echo $base['content']; ?> - - - - - <?PHP echo $config['title'] . $data['title']; ?> - - - - -
- HasWriteAccess($page, 'c') && $_GET['mode'] != 'edit') { - $backlink = $GLOBALS['links']->GetNeonLink($page); - - echo 'Bearbeiten'; - } - - echo $data['content']; - ?> -
- - diff --git a/lang/de.inc.php b/lang/de.inc.php index 868301b..2eaa333 100644 --- a/lang/de.inc.php +++ b/lang/de.inc.php @@ -1,7 +1,7 @@ diff --git a/pages/base/default.xml b/pages/base/default.xml new file mode 100644 index 0000000..b28aa56 --- /dev/null +++ b/pages/base/default.xml @@ -0,0 +1,45 @@ + + + + base + + 9:0 + b + + + + '; +?> + + + + + <?PHP echo $config['title'] . $data['title']; ?> + + + + +
+ HasWriteAccess($GLOBALS['page'], 'c') && $_GET['mode'] != 'edit') { + $backlink = $GLOBALS['links']->GetNeonLink($GLOBALS['page']); + + echo 'Bearbeiten'; + } + + echo $GLOBALS['data']['content']; + ?> +
+ + + ]]> + + + -- cgit v1.2.3