Base-Type durch Subst-Erweiterungen unnoetig gemacht; Type-Konzept entfernt.

21 files changed, 13 insertions, 107 deletions

diff --git a/pages/content/Login.xml b/pages/Login.xml
index 4a6471a..3eac6e6 100644
--- a/pages/content/Login.xml
+++ b/pages/Login.xml
@@ -4,7 +4,6 @@
     <name>Login</name>
     <template>phpexec</template>
     <access>1:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Logout.xml b/pages/Logout.xml
index 5f2b95c..c706e2f 100644
--- a/pages/content/Logout.xml
+++ b/pages/Logout.xml
@@ -4,7 +4,6 @@
     <name>Logout</name>
     <template>phpexec</template>
     <access>8:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Modules.xml b/pages/Modules.xml
index f8f52e2..a57d38b 100644
--- a/pages/content/Modules.xml
+++ b/pages/Modules.xml
@@ -4,7 +4,6 @@
     <name>Modules</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Modules:Config.xml b/pages/Modules:Config.xml
index c0940bb..ebe848a 100644
--- a/pages/content/Modules:Config.xml
+++ b/pages/Modules:Config.xml
@@ -4,7 +4,6 @@
     <name>Modules:Config</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Modules:Enable.xml b/pages/Modules:Enable.xml
index d12f63a..5788204 100644
--- a/pages/content/Modules:Enable.xml
+++ b/pages/Modules:Enable.xml
@@ -4,7 +4,6 @@
     <name>Modules:Enable</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Pages.xml b/pages/Pages.xml
index 6db0710..b438efa 100644
--- a/pages/content/Pages.xml
+++ b/pages/Pages.xml
@@ -4,7 +4,6 @@
     <name>Pages</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -19,13 +18,10 @@
   
   echo '<form method="post" action="' . $GLOBALS['links']->GetNeonLink('Pages:Handle') . '">';
   
-  echo '<input type="hidden" name="type" value="c" />';
-  
   echo '<select name="name" size="15" class="pagelist spaced-bottom">';
   
   foreach($GLOBALS['pages']->GetList() as $page)
-    if($page[strlen($page)-1] == 'c')
-      echo '<option>' . substr($page, 0, -2) . '</option>';
+      echo '<option>' . $page . '</option>';
   
   echo '</select>';
   echo '<br />';
diff --git a/pages/content/Pages:Copy.xml b/pages/Pages:Copy.xml
index a8925f2..cfec18c 100644
--- a/pages/content/Pages:Copy.xml
+++ b/pages/Pages:Copy.xml
@@ -4,7 +4,6 @@
     <name>Pages:Copy</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -12,9 +11,6 @@
 <?PHP
   Uses('pages', 'links', 'util');
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
     exit();
@@ -22,7 +18,7 @@
   
   if(!$_POST['name'] || !$_POST['newname']) exit();
   
-  $GLOBALS['pages']->Copy(Unquote($_POST['name']), $_POST['type'], Unquote($_POST['newname']));
+  $GLOBALS['pages']->Copy(Unquote($_POST['name']), Unquote($_POST['newname']));
   
   header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
   exit();
diff --git a/pages/content/Pages:Delete.xml b/pages/Pages:Delete.xml
index 26da0bf..7c83c44 100644
--- a/pages/content/Pages:Delete.xml
+++ b/pages/Pages:Delete.xml
@@ -4,7 +4,6 @@
     <name>Pages:Delete</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
     exit();
@@ -23,7 +19,7 @@
   
   if(!$_POST['name']) exit();
   
-  $GLOBALS['pages']->Delete(Unquote($_POST['name']), $_POST['type']);
+  $GLOBALS['pages']->Delete(Unquote($_POST['name']));
   
   header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
   exit();
diff --git a/pages/content/Pages:Edit.xml b/pages/Pages:Edit.xml
index f61084b..e481258 100644
--- a/pages/content/Pages:Edit.xml
+++ b/pages/Pages:Edit.xml
@@ -4,7 +4,6 @@
     <name>Pages:Edit</name>
     <template>phpexec</template>
     <access>9:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links', 'util');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . Unquote($_POST['backlink']));
     exit();
@@ -23,7 +19,7 @@
   
   if(!$_POST['name'] || !$_POST['backlink']) exit();
   
-  if(!$GLOBALS['pages']->HasWriteAccess(Unquote($_POST['name']), $_POST['type']))
+  if(!$GLOBALS['pages']->HasWriteAccess(Unquote($_POST['name'])))
     exit();
   
   $data = array();
@@ -34,7 +30,7 @@
     $data[substr($key, 5)] = Unquote($val);
   }
   
-  $GLOBALS['pages']->Edit(Unquote($_POST['name']), $_POST['type'], $data);
+  $GLOBALS['pages']->Edit(Unquote($_POST['name']), $data);
   
   header('Location: ' . Unquote($_POST['backlink']));
   exit();
diff --git a/pages/content/Pages:Handle.xml b/pages/Pages:Handle.xml
index 9abc7d9..85deebc 100644
--- a/pages/content/Pages:Handle.xml
+++ b/pages/Pages:Handle.xml
@@ -4,7 +4,6 @@
     <name>Pages:Handle</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links', 'templates');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if(isset($_POST['view'])) {
     if($_POST['name']) {
       header('Location: ' . $GLOBALS['links']->GetNeonLink(Unquote($_POST['name']), null, false));
@@ -28,7 +24,6 @@
   <h2>{{New page}}</h2>
   
   <form method="post" action="<?PHP echo $GLOBALS['links']->GetNeonLink('Pages:New'); ?>">
-    <input type="hidden" name="type" value="<?PHP echo $_POST['type']; ?>" />
     {{Name}}: <input type="text" id="pagename" name="name" size="70" /><br />
     {{Template}}: <select type="text" class="spaced-top" name="template" size="1" />
     <?PHP
@@ -43,7 +38,7 @@
   }
   elseif(isset($_POST['edit'])) {
     if($_POST['name']) {
-      $data = $GLOBALS['pages']->GetEditor(Unquote($_POST['name']), $_POST['type'], $GLOBALS['links']->GetNeonLink('Pages', null, false));
+      $data = $GLOBALS['pages']->GetEditor(Unquote($_POST['name']), $GLOBALS['links']->GetNeonLink('Pages', null, false));
       
       $title = $data['title'];
       
@@ -58,7 +53,7 @@
         
       echo '<h2>{{Change access to \'' . $name . '\'}}</h2>';
       
-      $access = $GLOBALS['pages']->GetAccess(Unquote($_POST['name']), $_POST['type']);
+      $access = $GLOBALS['pages']->GetAccess(Unquote($_POST['name']));
       $groups = $GLOBALS['user']->ListGroups();
       
       array_unshift($groups, array(0, '{{Guest}}'));
@@ -66,7 +61,6 @@
       echo '<form action="' . $GLOBALS['links']->GetNeonLink('Pages:Privs') . '" method="post">';
       
       echo '<input type="hidden" name="name" value="' . $name . '" />';
-      echo '<input type="hidden" name="type" value="' . $_POST['type'] . '" />';
       
       echo '<table>';
       
@@ -110,7 +104,6 @@
       
       echo '<form method="post" action="' . $GLOBALS['links']->GetNeonLink('Pages:Copy') . '">';
       echo '<input type="hidden" name="name" value="' . $name . '" />';
-      echo '<input type="hidden" name="type" value="' . $_POST['type'] . '" />';
       echo '{{New name}}: <input type="text" name="newname" value="' . $name . '" size="70" /><br />';
       echo '<input type="submit" class="spaced-top" value="{{Copy}}" /> ';
       echo '<input type="submit" class="spaced-top" name="back" value="{{Back}}" />';
@@ -127,7 +120,6 @@
       
       echo '<form method="post" action="' . $GLOBALS['links']->GetNeonLink('Pages:Rename') . '">';
       echo '<input type="hidden" name="name" value="' . $name . '" />';
-      echo '<input type="hidden" name="type" value="' . $_POST['type'] . '" />';
       echo '{{New name}}: <input type="text" name="newname" value="' . $name . '" size="70" /><br />';
       echo '<input type="submit" class="spaced-top" value="{{Rename}}" /> ';
       echo '<input type="submit" class="spaced-top" name="back" value="{{Back}}" />';
@@ -144,7 +136,6 @@
       
       echo '<form method="post" action="' . $GLOBALS['links']->GetNeonLink('Pages:Delete') . '">';
       echo '<input type="hidden" name="name" value="' . $name . '" />';
-      echo '<input type="hidden" name="type" value="' . $_POST['type'] . '" />';
       echo '{{Do you really want to delete the page \'' . $name . '\'?}}<br />';
       echo '<input type="submit" class="spaced-top" value="{{Delete}}" /> ';
       echo '<input type="submit" class="spaced-top" name="back" value="{{Back}}" />';
diff --git a/pages/content/Pages:New.xml b/pages/Pages:New.xml
index b6673b7..28a611f 100644
--- a/pages/content/Pages:New.xml
+++ b/pages/Pages:New.xml
@@ -4,7 +4,6 @@
     <name>Pages:New</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links', 'util');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
     exit();
@@ -23,9 +19,9 @@
   
   if(!$_POST['name'] || !$_POST['template']) exit();
   
-  $GLOBALS['pages']->Add(Unquote($_POST['name']), $_POST['type'], Unquote($_POST['template']));
+  $GLOBALS['pages']->Add(Unquote($_POST['name']), Unquote($_POST['template']));
       
-  $data = $GLOBALS['pages']->GetEditor(Unquote($_POST['name']), $_POST['type'], $GLOBALS['links']->GetNeonLink('Pages', null, false));
+  $data = $GLOBALS['pages']->GetEditor(Unquote($_POST['name']), $GLOBALS['links']->GetNeonLink('Pages', null, false));
         
   $title = $data['title'];
         
diff --git a/pages/content/Pages:Privs.xml b/pages/Pages:Privs.xml
index 318e7a2..875d5f4 100644
--- a/pages/content/Pages:Privs.xml
+++ b/pages/Pages:Privs.xml
@@ -4,7 +4,6 @@
     <name>Pages:Privs</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links', 'util');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
     exit();
@@ -49,7 +45,7 @@
     }
   }
   
-  $GLOBALS['pages']->SetAccess(Unquote($_POST['name']), $_POST['type'], array($readaccess, $writeaccess));
+  $GLOBALS['pages']->SetAccess(Unquote($_POST['name']), array($readaccess, $writeaccess));
   
   header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
   exit();
diff --git a/pages/content/Pages:Rename.xml b/pages/Pages:Rename.xml
index 2169c57..050c031 100644
--- a/pages/content/Pages:Rename.xml
+++ b/pages/Pages:Rename.xml
@@ -4,7 +4,6 @@
     <name>Pages:Rename</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,6 @@
   Uses('pages', 'links', 'util');
   
   
-  if($_POST['type'] != 'c' && $_POST['type'] != 'b')
-    exit();
-  
   if($_POST['back']) {
     header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
     exit();
@@ -23,7 +19,7 @@
   
   if(!$_POST['name'] || !$_POST['newname']) exit();
   
-  $GLOBALS['pages']->Rename(Unquote($_POST['name']), $_POST['type'], Unquote($_POST['newname']));
+  $GLOBALS['pages']->Rename(Unquote($_POST['name']), Unquote($_POST['newname']));
   
   header('Location: ' . $GLOBALS['links']->GetNeonLink('Pages', null, false));
   exit();
diff --git a/pages/content/Users.xml b/pages/Users.xml
index 9833701..aa853b4 100644
--- a/pages/content/Users.xml
+++ b/pages/Users.xml
@@ -4,7 +4,6 @@
     <name>Users</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
@@ -13,9 +12,9 @@
   Uses('links');
   
   
-  $title = 'Benutzer';
+  $title = '{{Users}}';
   
-  echo '<h2>Benutzer</h2>';
+  echo '<h2>{{Users}}</h2>';
   
   $res = $GLOBALS['db']->Execute('SELECT id, user FROM users ORDER BY user');
   
diff --git a/pages/content/Users:Delete.xml b/pages/Users:Delete.xml
index b6db8b4..9e2a362 100644
--- a/pages/content/Users:Delete.xml
+++ b/pages/Users:Delete.xml
@@ -4,7 +4,6 @@
     <name>Users:Delete</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Users:Group.xml b/pages/Users:Group.xml
index 4a4b004..de06d63 100644
--- a/pages/content/Users:Group.xml
+++ b/pages/Users:Group.xml
@@ -4,7 +4,6 @@
     <name>Users:Group</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Users:Handle.xml b/pages/Users:Handle.xml
index 9e949c1..b53d7cf 100644
--- a/pages/content/Users:Handle.xml
+++ b/pages/Users:Handle.xml
@@ -4,7 +4,6 @@
     <name>Users:Handle</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Users:New.xml b/pages/Users:New.xml
index 098644f..e88c84b 100644
--- a/pages/content/Users:New.xml
+++ b/pages/Users:New.xml
@@ -4,7 +4,6 @@
     <name>Users:New</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Users:Password.xml b/pages/Users:Password.xml
index da7db38..a83a068 100644
--- a/pages/content/Users:Password.xml
+++ b/pages/Users:Password.xml
@@ -4,7 +4,6 @@
     <name>Users:Password</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/content/Users:Rename.xml b/pages/Users:Rename.xml
index 13f2ae0..af60b12 100644
--- a/pages/content/Users:Rename.xml
+++ b/pages/Users:Rename.xml
@@ -4,7 +4,6 @@
     <name>Users:Rename</name>
     <template>phpexec</template>
     <access>0:0</access>
-    <type>c</type>
   </info>
   <data>
     <code>
diff --git a/pages/base/default.xml b/pages/base/default.xml
deleted file mode 100644
index de2ef47..0000000
--- a/pages/base/default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<page>
-  <info>
-    <name>base</name>
-    <template>phpexec</template>
-    <access>9:0</access>
-    <type>b</type>
-  </info>
-  <data>
-    <code>
-      <![CDATA[
-<?PHP
-  Uses('nav', 'pages', 'links', 'user');
-  
-  echo '<?xml version="1.0" encoding="UTF-8" ?>';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title><?PHP echo $GLOBALS['config']['title'] . $GLOBALS['data']['title']; ?></title>
-    <link rel="stylesheet" type="text/css" href="styles/<?PHP echo $GLOBALS['config']['default_style']; ?>/style.css" />
-  </head>
-  <body>
-    <div id="nav">
-      <?PHP echo $GLOBALS['nav']->ParseNav($GLOBALS['user']->getGid(), 'default'); ?>
-    </div>
-    <div id="content">
-      <?PHP
-        if($GLOBALS['pages']->HasWriteAccess($GLOBALS['page'], 'c') && $_GET['mode'] != 'edit') {
-          $backlink = $GLOBALS['links']->GetNeonLink($GLOBALS['page']);
-          
-          echo '<a class="editlink" href="' . $GLOBALS['links']->GetNeonLink($GLOBALS['page'], 'mode=edit') . '">{{Edit}}</a>';
-        }
-        
-        echo $GLOBALS['data']['content'];
-      ?>
-    </div>
-  </body>
-</html>
-      ]]>
-    </code>
-  </data>
-</page>