Interne Modulverwaltung neu geschrieben;

Basis modularisiert; 
das gesamte System an die neue Modulverwaltung angepasst.

37 files changed, 253 insertions, 247 deletions

diff --git a/base.xml b/base.xml
new file mode 100644
index 0000000..a350b20
--- /dev/null
+++ b/base.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+  <info>
+    <name>Neon</name>
+    <version>0.1</version>
+  </info>
+  <files>
+    <code>links</code>
+    <code>message</code>
+    <code>nav</code>
+    <code>pages</code>
+    <code>templates</code>
+    <code>user</code>
+    <code>util</code>
+    <page type="c">Login</page>
+    <page type="c">Logout</page>
+    <page type="c">Modules</page>
+    <page type="c">Modules:Config</page>
+    <page type="c">Modules:Enable</page>
+    <page type="c">Pages</page>
+    <page type="c">Pages:Copy</page>
+    <page type="c">Pages:Delete</page>
+    <page type="c">Pages:Edit</page>
+    <page type="c">Pages:Handle</page>
+    <page type="c">Pages:New</page>
+    <page type="c">Pages:Privs</page>
+    <page type="c">Pages:Rename</page>
+    <page type="c">Users</page>
+    <page type="c">Users:Delete</page>
+    <page type="c">Users:Group</page>
+    <page type="c">Users:Handle</page>
+    <page type="c">Users:New</page>
+    <page type="c">Users:Password</page>
+    <page type="c">Users:Rename</page>
+    <page type="e">default</page>
+    <page type="e">phpexec</page>
+    <page type="n">Login</page>
+    <template>default</template>
+    <template>phpexec</template>
+  </files>
+</module>
diff --git a/code/links.inc.php b/code/links.inc.php
index 4484a72..cb264cd 100644
--- a/code/links.inc.php
+++ b/code/links.inc.php
@@ -1,5 +1,5 @@
 <?PHP
-  require_once('code/user.inc.php');
+  Uses('user');
   
   class Links {
     function GetNeonLink($page, $extra = '', $html = true) {
diff --git a/code/message.inc.php b/code/message.inc.php
index 092f4ec..8545a01 100644
--- a/code/message.inc.php
+++ b/code/message.inc.php
@@ -1,6 +1,5 @@
 <?PHP
-  require_once('code/config.inc.php');
-  require_once('code/util.inc.php');
+  Uses('util');
   
   $message['Error']		= 'Error';
   $message['PageNotFound']	= 'The page \'$page\' does not exist.';
diff --git a/code/modules.inc.php b/code/modules.inc.php
deleted file mode 100644
index 4a4a889..0000000
--- a/code/modules.inc.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?PHP
-  require_once('code/xmlparser.inc.php');
-  require_once('code/db.inc.php');
-  
-  function require_mod($file) {
-    if(isset($GLOBALS['modules']->code[$file]))
-      require_once($GLOBALS['modules']->code[$file]);
-    elseif(isset($GLOBALS['modules']->templates[$file]))
-      require_once($GLOBALS['modules']->templates[$file]);
-    else
-      require_once($file);
-  }
-  
-  class Modules {
-    var $modules = array();
-    var $pages = array();
-    var $code = array();
-    var $templates = array();
-    
-    function Modules() {
-      $dir = opendir('modules');
-      
-      while($moddir = readdir($dir)) {
-        if($moddir[0] != '.' && is_dir('modules/' . $moddir) && is_file('modules/' . $moddir . '/module.xml')) {
-          $data = $GLOBALS['xmlparser']->ParseFile('modules/' . $moddir . '/module.xml');
-          
-          if(!$data) continue;
-          
-          $info = $GLOBALS['xmlparser']->FindTag($data, 'info');
-          if(!$info) continue;
-          
-          $name = $GLOBALS['xmlparser']->FindTag($info, 'name');
-          if(!$name) continue;
-          if(count($name['children']) != 1) continue;
-          if(!is_string($name['children'][0])) continue;
-          $name = $name['children'][0];
-          
-          $version = $GLOBALS['xmlparser']->FindTag($info, 'version');
-          if(!$version) continue;
-          if(count($version['children']) != 1) continue;
-          if(!is_string($version['children'][0])) continue;
-          $version = $version['children'][0];
-          
-          $desc = $GLOBALS['xmlparser']->FindTag($info, 'desc');
-          if(!$desc) continue;
-          if(count($desc['children']) != 1) continue;
-          if(!is_string($desc['children'][0])) continue;
-          $desc = $desc['children'][0];
-          
-          $this->modules[$name] = array('name' => $name, 'version' => $version, 'desc' => $desc, 'code' => array(),
-                                        'templates' => array(), 'config' => false, 'enabled' => false);
-          
-          if($GLOBALS['xmlparser']->FindTag($info, 'config')) $this->modules[$name]['config'] = true;
-          
-          $files = $GLOBALS['xmlparser']->FindTag($data, 'files');
-          if(!$files) continue;
-          
-          foreach($files['children'] as $file) {
-            if(!is_array($file)) continue;
-            if(count($file['children']) != 1) continue;
-            if(!is_string($file['children'][0])) continue;
-            
-            switch($file['tag']) {
-              case 'page':
-                $type = $file['attribs']['type'];
-                if(!$type) $type = 'c';
-                
-                $pagename =  $file['children'][0] . '.' . $type;
-                $realname = 'modules/' . $moddir . '/pages/' . strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav'))
-                          . '/' . $file['children'][0] . '.xml';
-                
-                $this->modules[$name]['pages'][$pagename] = $realname;
-                break;
-              case 'code':
-                $filename = 'code/' . $file['children'][0] . '.inc.php';
-                $realname = 'modules/' . $moddir . '/code/' . $file['children'][0] . '.inc.php';
-                
-                $this->modules[$name]['code'][$filename] = $realname;
-                break;
-              case 'template':
-                $filename = 'templates/' . $file['children'][0] . '.inc.php';
-                $realname = 'modules/' . $moddir . '/templates/' . $file['children'][0] . '.inc.php';
-                
-                $this->modules[$name]['templates'][$filename] = $realname;
-            }
-          }
-        }
-      }
-      
-      closedir($dir);
-      
-      $res = $GLOBALS['db']->Execute('SELECT name, enabled FROM modules');
-      
-      while($row = $res->FetchRow()) {
-        if(!array_key_exists($row[0], $this->modules)) {
-          $GLOBALS['db']->Execute('DELETE FROM modules WHERE name = ?', $row[0]);
-          continue;
-        }
-        
-        if(!$row[1]) continue;
-        
-        $this->modules[$row[0]]['enabled'] = true;
-        
-        $this->pages = array_merge($this->pages, $this->modules[$row[0]]['pages']);
-        $this->code = array_merge($this->code, $this->modules[$row[0]]['code']);
-        $this->templates = array_merge($this->templates, $this->modules[$row[0]]['templates']);
-      }
-    }
-    
-    function Exists($name) {
-      return array_key_exists($name, $this->modules);
-    }
-    
-    function Enabled($name) {
-      return $this->Exists($name) && $this->modules[$name]['enabled'];
-    }
-    
-    function HasConfig($name) {
-      if(!$this->Exists($name)) return false;
-      
-      return $this->modules[$name]['config'];
-    }
-    
-    function Enable($name, $enable = true) {
-      if(!$this->Exists($name)) return false;
-      
-      if($this->Enabled($name) == $enable) return true;
-      
-      $res = $GLOBALS['db']->Execute('SELECT id FROM modules WHERE name = ?', $name);
-      
-      if($res->RecordCount()) {
-        $GLOBALS['db']->Execute('UPDATE modules SET enabled = ? WHERE name = ?', array(intval($enable), $name));
-      
-        return ($GLOBALS['db']->Affected_Rows() > 0);
-      }
-      
-      $GLOBALS['db']->Execute('INSERT INTO modules (name, enabled) VALUES (?, ?)', array($name, intval($enable)));
-      
-      return ($GLOBALS['db']->Affected_Rows() > 0);
-    }
-    
-    function Disable($name) {
-      return $this->Enable($name, false);
-    }
-  }
-  
-  $GLOBALS['modules'] = new Modules;
-?>
diff --git a/code/nav.inc.php b/code/nav.inc.php
index bb7ce12..d5ede02 100644
--- a/code/nav.inc.php
+++ b/code/nav.inc.php
@@ -1,5 +1,5 @@
 <?PHP
-  require_once('code/links.inc.php');
+  Uses('links');
 
   class Nav {
     var $entries = array();
diff --git a/code/pages.inc.php b/code/pages.inc.php
index 6f0e383..290b4bd 100644
--- a/code/pages.inc.php
+++ b/code/pages.inc.php
@@ -1,9 +1,6 @@
 <?PHP
-  require_once('code/db.inc.php');
-  require_once('code/user.inc.php');
-  require_once('code/templates.inc.php');
-  require_once('code/xmlparser.inc.php');
-  require_once('code/modules.inc.php');
+  Uses('user', 'templates');
+  
   
   class Pages {
     var $pages = array(
@@ -117,9 +114,8 @@
                                                     'access' => '', 'data' => $data);
         }
         else {
-          $filename = $GLOBALS['modules']->pages[$page . '.' . $type];
-          if(!$filename) $filename = 'pages/' . strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav'))
-                                   . '/' . $page . '.xml';
+          $filename = $GLOBALS['modules']->pages[$page . '.' . $type]['path'] .  'pages/'
+                    . strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav')) . '/' . $page . '.xml';
           
           $xmldata = $GLOBALS['xmlparser']->ParseFile($filename);
           if(!$xmldata) return null;
diff --git a/code/templates.inc.php b/code/templates.inc.php
index 7abfe79..9db1ff2 100644
--- a/code/templates.inc.php
+++ b/code/templates.inc.php
@@ -1,14 +1,4 @@
 <?PHP
-  require_once('code/modules.inc.php');
-  
-  $dir = opendir('templates');
-  
-  while($file = readdir($dir))
-    if($file[0] != '.' && substr($file, -8) == '.inc.php')
-      include('templates/' . $file);
-  
-  closedir($dir);
-  
-  foreach($GLOBALS['modules']->templates as $file)
-    include($file);
+  foreach($GLOBALS['modules']->templates as $file => $module)
+    require_once($module['path'] . 'templates/' . $file . '.inc.php');
 ?>
diff --git a/code/user.inc.php b/code/user.inc.php
index 4912bcc..7c9b907 100644
--- a/code/user.inc.php
+++ b/code/user.inc.php
@@ -1,6 +1,4 @@
 <?PHP
-  require_once('code/db.inc.php');
-  
   class User {
     var $uid = 0, $gid = 0;
     var $login_key = '', $login_type = '';
diff --git a/code/config.inc.php b/core/config.inc.php
index b94a74e..5318341 100644
--- a/code/config.inc.php
+++ b/core/config.inc.php
@@ -1,7 +1,7 @@
 <?PHP
   require_once('config/config.inc.php');
   
-  require_once('code/db.inc.php');
+  require_once('core/db.inc.php');
   
   
   $res = $GLOBALS['db']->Execute('SELECT name, value FROM config WHERE module = 0');
diff --git a/code/db.inc.php b/core/db.inc.php
index 706f63d..706f63d 100644
--- a/code/db.inc.php
+++ b/core/db.inc.php
diff --git a/core/modules.inc.php b/core/modules.inc.php
new file mode 100644
index 0000000..c1ebc80
--- /dev/null
+++ b/core/modules.inc.php
@@ -0,0 +1,164 @@
+<?PHP
+  require_once('core/xmlparser.inc.php');
+  require_once('core/db.inc.php');
+  
+  function Uses() {
+    foreach(func_get_args() as $file) {
+      if(isset($GLOBALS['modules']->code[$file]))
+        require_once($GLOBALS['modules']->code[$file]['path'] . 'code/' . $file . '.inc.php');
+      else
+        die('Fatal: a required code file was not found.');
+    }
+  }
+  
+  class Modules {
+    var $modules = array();
+    var $pages = array();
+    var $code = array();
+    var $templates = array();
+    
+    function Modules() {
+      $module = $this->Load('base.xml');
+      if(!$module) die('Fatal: could not load Neon base.');
+      
+      $module['path'] = '';
+      
+      $this->modules['base'] = $module;
+      
+      
+      $dir = opendir('modules');
+      
+      while($moddir = readdir($dir)) {
+        if($moddir[0] == '.' || !is_dir('modules/' . $moddir) || !is_file('modules/' . $moddir . '/module.xml'))
+          continue;
+        
+        $module = $this->Load('modules/' . $moddir . '/module.xml');
+        
+        if(!$module) continue;
+        
+        $module['path'] = 'modules/' . $moddir . '/';
+        $this->modules[$module['name']] = $module;
+      }
+      
+      closedir($dir);
+      
+      $res = $GLOBALS['db']->Execute('SELECT name, enabled FROM modules');
+      
+      $row[0] = 'base';
+      $row[1] = 1;
+      
+      do {
+        if(!array_key_exists($row[0], $this->modules)) {
+          $GLOBALS['db']->Execute('DELETE FROM modules WHERE name = ?', $row[0]);
+          continue;
+        }
+        
+        if(!$row[1]) continue;
+        
+        $this->modules[$row[0]]['enabled'] = true;
+        
+        foreach($this->modules[$row[0]]['pages'] as $page)
+          $this->pages[$page] = &$this->modules[$row[0]];
+        foreach($this->modules[$row[0]]['code'] as $code)
+          $this->code[$code] = &$this->modules[$row[0]];
+        foreach($this->modules[$row[0]]['templates'] as $template)
+          $this->templates[$template] = &$this->modules[$row[0]];
+      } while($row = $res->FetchRow());
+    }
+    
+    function Load($file) {
+      if(!is_file($file)) return null;
+      
+      $data = $GLOBALS['xmlparser']->ParseFile($file);
+      if(!$data) return null;
+      
+      $info = $GLOBALS['xmlparser']->FindTag($data, 'info');
+      if(!$info) return null;
+      
+      $name = $GLOBALS['xmlparser']->FindTag($info, 'name');
+      if(!$name) return null;
+      if(count($name['children']) != 1) return null;
+      if(!is_string($name['children'][0])) return null;
+      $name = $name['children'][0];
+      
+      $version = $GLOBALS['xmlparser']->FindTag($info, 'version');
+      if(!$version) return null;
+      if(count($version['children']) != 1) return null;
+      if(!is_string($version['children'][0])) return null;
+      $version = $version['children'][0];
+      
+      $desc = $GLOBALS['xmlparser']->FindTag($info, 'desc');
+      if($desc && (count($desc['children']) == 1) && is_string($desc['children'][0])) $desc = $desc['children'][0];
+      else $desc = '';
+      
+      
+      $module = array('name' => $name, 'version' => $version, 'desc' => $desc, 'code' => array(),
+                      'pages' => array(), 'templates' => array(), 'config' => false, 'enabled' => false);
+      
+      if($GLOBALS['xmlparser']->FindTag($info, 'config')) $module['config'] = true;
+      
+      $files = $GLOBALS['xmlparser']->FindTag($data, 'files');
+      if(!$files) return $module;
+      
+      foreach($files['children'] as $file) {
+        if(!is_array($file)) continue;
+        if(count($file['children']) != 1) continue;
+        if(!is_string($file['children'][0])) continue;
+        
+        switch($file['tag']) {
+          case 'page':
+            $type = $file['attribs']['type'];
+            if(!$type) $type = 'c';
+            
+            array_push($module['pages'], $file['children'][0] . '.' . $type);
+            break;
+          case 'code':
+            array_push($module['code'], $file['children'][0]);
+            break;
+          case 'template':
+            array_push($module['templates'], $file['children'][0]);
+        }
+      }
+      
+      return $module;
+    }
+    
+    function Exists($name) {
+      return array_key_exists($name, $this->modules);
+    }
+    
+    function Enabled($name) {
+      return $this->Exists($name) && $this->modules[$name]['enabled'];
+    }
+    
+    function HasConfig($name) {
+      if(!$this->Exists($name)) return false;
+      
+      return $this->modules[$name]['config'];
+    }
+    
+    function Enable($name, $enable = true) {
+      if(!$this->Exists($name)) return false;
+      
+      if($this->Enabled($name) == $enable) return true;
+      
+      $res = $GLOBALS['db']->Execute('SELECT id FROM modules WHERE name = ?', $name);
+      
+      if($res->RecordCount()) {
+        $GLOBALS['db']->Execute('UPDATE modules SET enabled = ? WHERE name = ?', array(intval($enable), $name));
+      
+        return ($GLOBALS['db']->Affected_Rows() > 0);
+      }
+      
+      $GLOBALS['db']->Execute('INSERT INTO modules (name, enabled) VALUES (?, ?)', array($name, intval($enable)));
+      
+      return ($GLOBALS['db']->Affected_Rows() > 0);
+    }
+    
+    function Disable($name) {
+      return $this->Enable($name, false);
+    }
+  }
+  
+  $GLOBALS['modules'] = new Modules;
+?>
diff --git a/code/xmlparser.inc.php b/core/xmlparser.inc.php
index 0666c5a..0666c5a 100644
--- a/code/xmlparser.inc.php
+++ b/core/xmlparser.inc.php
diff --git a/index.php b/index.php
index f66ba01..ae92eaf 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 <?PHP
-  require_once('code/config.inc.php');
-  require_once('code/message.inc.php');
-  require_once('code/util.inc.php');
-  require_once('code/pages.inc.php');
-  require_once('code/nav.inc.php');
-  require_once('code/links.inc.php');
+  require_once('core/config.inc.php');
+  require_once('core/db.inc.php');
+  require_once('core/modules.inc.php');
+  require_once('core/xmlparser.inc.php');
+  
+  Uses('message', 'util', 'pages', 'nav', 'links');
   
   header('Content-type: text/html;charset=UTF-8');
   
diff --git a/pages/content/Login.xml b/pages/content/Login.xml
index 3f69400..6bbaf7c 100644
--- a/pages/content/Login.xml
+++ b/pages/content/Login.xml
@@ -11,10 +11,7 @@
       <![CDATA[
 <?PHP
   if($_POST['name'] && $_POST['password'] && $_POST['page']) {
-    require_once('code/user.inc.php');
-    require_once('code/links.inc.php');
-    require_once('code/message.inc.php');
-    require_once('code/util.inc.php');
+    Uses('user', 'links', 'message', 'util');
     
     if($GLOBALS['user']->Login(Unquote($_POST['name']), Unquote($_POST['password']))) {
       header('Location: ' . $GLOBALS['links']->GetNeonLink($_POST['page'], null, false));
diff --git a/pages/content/Logout.xml b/pages/content/Logout.xml
index 8cff751..5f2b95c 100644
--- a/pages/content/Logout.xml
+++ b/pages/content/Logout.xml
@@ -10,10 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/config.inc.php');
-  
-  require_once('code/user.inc.php');
-  require_once('code/links.inc.php');
+  Uses('user', 'links');
   
   $GLOBALS['user']->Logout();
   
diff --git a/pages/content/Modules.xml b/pages/content/Modules.xml
index d6d7950..86a031b 100644
--- a/pages/content/Modules.xml
+++ b/pages/content/Modules.xml
@@ -10,22 +10,22 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/links.inc.php');
-  require_once('code/modules.inc.php');
+  Uses('links');
   
   $title = 'Module';
   
   echo '<h2>Module</h2>';
   
   $modules = array_keys($GLOBALS['modules']->modules);
+  unset($modules[array_search('base', $modules)]);
   sort($modules);
   
   foreach($modules as $module) {
     echo '<div class="modinfo">';
     
-    if($GLOBALS['modules']->HasConfig($module))
-      echo '<h3><a href="' . $GLOBALS['links']->GetNeonLink('Modules:Config', 'name=' . urlencode($module)) . '">' . htmlspecialchars($module) . '</a></h3>';
-    else
+    //if($GLOBALS['modules']->HasConfig($module))
+    //  echo '<h3><a href="' . $GLOBALS['links']->GetNeonLink('Modules:Config', 'name=' . urlencode($module)) . '">' . htmlspecialchars($module) . '</a></h3>';
+    //else
       echo '<h3>' . htmlspecialchars($module) . '</h3>';
     
     echo htmlspecialchars($GLOBALS['modules']->modules[$module]['version']);
diff --git a/pages/content/Modules:Enable.xml b/pages/content/Modules:Enable.xml
index d0e2741..d12f63a 100644
--- a/pages/content/Modules:Enable.xml
+++ b/pages/content/Modules:Enable.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/links.inc.php');
-  require_once('code/modules.inc.php');
-  require_once('code/util.inc.php');
+  Uses('links', 'util');
   
   if(!$_GET['name']) exit();
   
diff --git a/pages/content/Pages.xml b/pages/content/Pages.xml
index f9db838..fb9ef56 100644
--- a/pages/content/Pages.xml
+++ b/pages/content/Pages.xml
@@ -10,8 +10,8 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/links.inc.php');
-  require_once('code/pages.inc.php');
+  Uses('links', 'pages');
+  
   
   $title = 'Seiten';
   
diff --git a/pages/content/Pages:Copy.xml b/pages/content/Pages:Copy.xml
index 79becca..7c02aec 100644
--- a/pages/content/Pages:Copy.xml
+++ b/pages/content/Pages:Copy.xml
@@ -10,10 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/util.inc.php');
-  
+  Uses('pages', 'links', 'util');
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
     exit();
diff --git a/pages/content/Pages:Delete.xml b/pages/content/Pages:Delete.xml
index 07e6ff3..bdcb148 100644
--- a/pages/content/Pages:Delete.xml
+++ b/pages/content/Pages:Delete.xml
@@ -10,8 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
+  Uses('pages', 'links');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Pages:Edit.xml b/pages/content/Pages:Edit.xml
index 973b9f0..9d36d54 100644
--- a/pages/content/Pages:Edit.xml
+++ b/pages/content/Pages:Edit.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/util.inc.php');
+  Uses('pages', 'links', 'util');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Pages:Handle.xml b/pages/content/Pages:Handle.xml
index f96cd4a..24bed6f 100644
--- a/pages/content/Pages:Handle.xml
+++ b/pages/content/Pages:Handle.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/templates.inc.php');
+  Uses('pages', 'links', 'templates');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Pages:New.xml b/pages/content/Pages:New.xml
index 6dd1b68..3421ff1 100644
--- a/pages/content/Pages:New.xml
+++ b/pages/content/Pages:New.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/util.inc.php');
+  Uses('pages', 'links', 'util');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Pages:Privs.xml b/pages/content/Pages:Privs.xml
index 5023d1e..fd8658e 100644
--- a/pages/content/Pages:Privs.xml
+++ b/pages/content/Pages:Privs.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/util.inc.php');
+  Uses('pages', 'links', 'util');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Pages:Rename.xml b/pages/content/Pages:Rename.xml
index 236b709..35aef52 100644
--- a/pages/content/Pages:Rename.xml
+++ b/pages/content/Pages:Rename.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/pages.inc.php');
-  require_once('code/links.inc.php');
-  require_once('code/util.inc.php');
+  Uses('pages', 'links', 'util');
   
   
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
diff --git a/pages/content/Users.xml b/pages/content/Users.xml
index 2dcd181..bd70234 100644
--- a/pages/content/Users.xml
+++ b/pages/content/Users.xml
@@ -10,8 +10,8 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/db.inc.php');
-  require_once('code/links.inc.php');
+  Uses('links');
+  
   
   $title = 'Benutzer';
   
diff --git a/pages/content/Users:Delete.xml b/pages/content/Users:Delete.xml
index 8c32935..b6db8b4 100644
--- a/pages/content/Users:Delete.xml
+++ b/pages/content/Users:Delete.xml
@@ -10,8 +10,7 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/user.inc.php');
-          require_once('code/links.inc.php');
+          Uses('user', 'links');
           
           
           if($_POST['back']) {
diff --git a/pages/content/Users:Group.xml b/pages/content/Users:Group.xml
index b48e369..4a4b004 100644
--- a/pages/content/Users:Group.xml
+++ b/pages/content/Users:Group.xml
@@ -10,8 +10,7 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/user.inc.php');
-          require_once('code/links.inc.php');
+          Uses('user', 'links');
           
           
           if($_POST['back']) {
diff --git a/pages/content/Users:Handle.xml b/pages/content/Users:Handle.xml
index 69339bc..27b5a3e 100644
--- a/pages/content/Users:Handle.xml
+++ b/pages/content/Users:Handle.xml
@@ -10,9 +10,8 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/db.inc.php');
-          require_once('code/links.inc.php');
-          require_once('code/user.inc.php');
+          Uses('links', 'user');
+          
           
           if(isset($_POST['new'])) {
             $title = 'Neuer Benutzer';  
diff --git a/pages/content/Users:New.xml b/pages/content/Users:New.xml
index ac6bed9..098644f 100644
--- a/pages/content/Users:New.xml
+++ b/pages/content/Users:New.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/user.inc.php');
-          require_once('code/links.inc.php');
-          require_once('code/util.inc.php');
+          Uses('user', 'links', 'util');
           
           
           if($_POST['back']) {
diff --git a/pages/content/Users:Password.xml b/pages/content/Users:Password.xml
index c08cd02..da7db38 100644
--- a/pages/content/Users:Password.xml
+++ b/pages/content/Users:Password.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/user.inc.php');
-          require_once('code/links.inc.php');
-          require_once('code/util.inc.php');
+          Uses('user', 'links', 'util');
           
           
           if($_POST['back']) {
diff --git a/pages/content/Users:Rename.xml b/pages/content/Users:Rename.xml
index def6aa4..13f2ae0 100644
--- a/pages/content/Users:Rename.xml
+++ b/pages/content/Users:Rename.xml
@@ -10,9 +10,7 @@
     <code>
       <![CDATA[
         <?PHP
-          require_once('code/user.inc.php');
-          require_once('code/links.inc.php');
-          require_once('code/util.inc.php');
+          Uses('user', 'links', 'util');
           
           
           if($_POST['back']) {
diff --git a/pages/editor/default.xml b/pages/editor/default.xml
index 40769dd..f2b3118 100644
--- a/pages/editor/default.xml
+++ b/pages/editor/default.xml
@@ -10,7 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/links.inc.php');
+  Uses('links');
   
   
   $title = 'Edit \'' . $data['_data']['_page'] . '\'';
diff --git a/pages/editor/phpexec.xml b/pages/editor/phpexec.xml
index 051fc8f..451f653 100644
--- a/pages/editor/phpexec.xml
+++ b/pages/editor/phpexec.xml
@@ -10,7 +10,7 @@
     <code>
       <![CDATA[
 <?PHP
-  require_once('code/links.inc.php');
+  Uses('links');
   
   
   $title = 'Edit \'' . $data['_data']['_page'] . '\'';
diff --git a/pages/nav/Login.xml b/pages/nav/Login.xml
index 71fb2b3..6379199 100644
--- a/pages/nav/Login.xml
+++ b/pages/nav/Login.xml
@@ -10,11 +10,9 @@
     <code>
       <![CDATA[
 <?PHP
+  Uses('user', 'links', 'util');
+  
   if(!$GLOBALS['user']->uid) {
-    require_once('code/user.inc.php');
-    require_once('code/links.inc.php');
-    require_once('code/util.inc.php');
-    
     echo '<form action="';
     echo $GLOBALS['links']->GetNeonLink('Login');
     echo '" method="post">';
diff --git a/templates/default.inc.php b/templates/default.inc.php
index 5ec0c75..12609c6 100644
--- a/templates/default.inc.php
+++ b/templates/default.inc.php
@@ -1,5 +1,5 @@
 <?PHP
-  require_once('code/message.inc.php');
+  Uses('message');
   
   class default_template {
     function Get($data) {
diff --git a/templates/phpexec.inc.php b/templates/phpexec.inc.php
index 0d0404d..3e542df 100644
--- a/templates/phpexec.inc.php
+++ b/templates/phpexec.inc.php
@@ -1,6 +1,5 @@
 <?PHP
-  require_once('code/message.inc.php');
-  require_once('code/links.inc.php');
+  Uses('message', 'links');
   
   class phpexec_template {
     function Get($data) {