Seiten verschoben.

24 files changed, 82 insertions, 41 deletions

diff --git a/code/modules.inc.php b/code/modules.inc.php
index 02aa9f2..605f8ca 100644
--- a/code/modules.inc.php
+++ b/code/modules.inc.php
@@ -1,5 +1,6 @@
 <?PHP
   require_once('code/xmlparser.inc.php');
+  require_once('code/db.inc.php');
   
   function require_mod($file) {
     if(isset($GLOBALS['modules']->code[$file]))
@@ -11,16 +12,13 @@
   }
   
   class Modules {
-    var $modules;
-    var $pages;
-    var $code;
-    var $templates;
+    var $modules = array();
+    var $modules_enabled = array();
+    var $pages = array();
+    var $code = array();
+    var $templates = array();
     
     function Modules() {
-      $this->modules = array();
-      $this->code = array();
-      $this->templates = array();
-      
       $dir = opendir('modules');
       
       while($moddir = readdir($dir)) {
@@ -36,11 +34,15 @@
           if(!$name) continue;
           if(count($name['children']) != 1) continue;
           if(!is_string($name['children'][0])) continue;
-          
           $name = $name['children'][0];
           
-          $this->module[$name] = array('name' => $name, 'code' => array(),
-                                       'templates' => array());
+          $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, 'desc' => $desc, 'code' => array(), 'templates' => array());
           
           $files = $GLOBALS['xmlparser']->FindTag($data, 'files');
           if(!$files) continue;
@@ -56,24 +58,21 @@
                 if(!$type) $type = 'c';
                 
                 $pagename =  $file['children'][0] . '.' . $type;
-                $realname = 'modules/' . $moddir . '/pages/' . strtr($file['children'][0], array(':' => '/'))
-                          . '.' . $type . '.xml';
+                $realname = 'modules/' . $moddir . '/pages/' . strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav'))
+                          . '/' . $file['children'][0] . '.xml';
                 
-                $this->pages[$pagename] = $realname;
                 $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->code[$filename] = $realname;
                 $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->templates[$filename] = $realname;
                 $this->modules[$name]['templates'][$filename] = $realname;
             }
           }
@@ -81,6 +80,18 @@
       }
       
       closedir($dir);
+      
+      $res = $GLOBALS['db']->Execute('SELECT name FROM modules WHERE enabled = 1');
+      
+      while($row = $res->FetchRow()) {
+        if(!array_key_exists($row[0], $this->modules)) continue;
+        
+        $this->modules_enabled[$row[0]] = $this->modules[$row[0]];
+        
+        $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']);
+      }
     }
   }
   
diff --git a/code/pages.inc.php b/code/pages.inc.php
index 129167a..a6d9085 100644
--- a/code/pages.inc.php
+++ b/code/pages.inc.php
@@ -9,6 +9,7 @@
     var $pages = array(
       'Login.c' => null,
       'Logout.c' => null,
+      'Modules.c' => null,
       'Pages.c' => null,
       'Pages:Copy.c' => null,
       'Pages:Delete.c' => null,
@@ -115,7 +116,8 @@
         }
         else {
           $filename = $GLOBALS['modules']->pages[$page . '.' . $type];
-          if(!$filename) $filename = 'pages/' . strtr($page, array(':' => '/')) . '.' . $type . '.xml';
+          if(!$filename) $filename = 'pages/' . strtr($type, array('c' => 'content', 'e' => 'editor', 'n' => 'nav'))
+                                   . '/' . $page . '.xml';
           
           $xmldata = $GLOBALS['xmlparser']->ParseFile($filename);
           if(!$xmldata) return null;
diff --git a/pages/Login.c.xml b/pages/content/Login.xml
index 3f69400..3f69400 100644
--- a/pages/Login.c.xml
+++ b/pages/content/Login.xml
diff --git a/pages/Logout.c.xml b/pages/content/Logout.xml
index 9447dca..9447dca 100644
--- a/pages/Logout.c.xml
+++ b/pages/content/Logout.xml
diff --git a/pages/content/Modules.xml b/pages/content/Modules.xml
new file mode 100644
index 0000000..4aa2cda
--- /dev/null
+++ b/pages/content/Modules.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<page>
+  <info>
+    <name>Modules</name>
+    <template>phpexec</template>
+    <access>0:0</access>
+    <type>c</type>
+  </info>
+  <data>
+    <code>
+      <![CDATA[
+<?PHP
+  require_once('code/links.inc.php');
+  require_once('code/modules.inc.php');
+  
+  $title = 'Module';
+  
+  echo '<h2>Module</h2>';
+  
+  $modules = array_keys($GLOBALS['modules']->modules);
+  sort($modules);
+  
+  foreach($modules as $module) {
+    echo '<div class="modinfo">';
+    
+    echo '<h3>' . htmlspecialchars($module) . '</h3>';
+    
+    echo htmlspecialchars($GLOBALS['modules']->modules[$module]['desc']);
+    
+    echo '</div>';
+  }
+?>
+      ]]>
+    </code>
+  </data>
+</page>
diff --git a/pages/Pages.c.xml b/pages/content/Pages.xml
index f9db838..f9db838 100644
--- a/pages/Pages.c.xml
+++ b/pages/content/Pages.xml
diff --git a/pages/Pages/Copy.c.xml b/pages/content/Pages:Copy.xml
index 79becca..79becca 100644
--- a/pages/Pages/Copy.c.xml
+++ b/pages/content/Pages:Copy.xml
diff --git a/pages/Pages/Delete.c.xml b/pages/content/Pages:Delete.xml
index 07e6ff3..07e6ff3 100644
--- a/pages/Pages/Delete.c.xml
+++ b/pages/content/Pages:Delete.xml
diff --git a/pages/Pages/Edit.c.xml b/pages/content/Pages:Edit.xml
index dfe9a51..dfe9a51 100644
--- a/pages/Pages/Edit.c.xml
+++ b/pages/content/Pages:Edit.xml
diff --git a/pages/Pages/Handle.c.xml b/pages/content/Pages:Handle.xml
index 734c62d..c2b6602 100644
--- a/pages/Pages/Handle.c.xml
+++ b/pages/content/Pages:Handle.xml
@@ -14,6 +14,7 @@
   require_once('code/links.inc.php');
   require_once('code/templates.inc.php');
   
+  
   if($_POST['type'] != 'c' && $_POST['type'] != 'n' && $_POST['type'] != 'e')
     exit();
   
diff --git a/pages/Pages/New.c.xml b/pages/content/Pages:New.xml
index 6dd1b68..6dd1b68 100644
--- a/pages/Pages/New.c.xml
+++ b/pages/content/Pages:New.xml
diff --git a/pages/Pages/Privs.c.xml b/pages/content/Pages:Privs.xml
index 5023d1e..5023d1e 100644
--- a/pages/Pages/Privs.c.xml
+++ b/pages/content/Pages:Privs.xml
diff --git a/pages/Pages/Rename.c.xml b/pages/content/Pages:Rename.xml
index 236b709..236b709 100644
--- a/pages/Pages/Rename.c.xml
+++ b/pages/content/Pages:Rename.xml
diff --git a/pages/Users.c.xml b/pages/content/Users.xml
index 2dcd181..2dcd181 100644
--- a/pages/Users.c.xml
+++ b/pages/content/Users.xml
diff --git a/pages/Users/Delete.c.xml b/pages/content/Users:Delete.xml
index 8c32935..8c32935 100644
--- a/pages/Users/Delete.c.xml
+++ b/pages/content/Users:Delete.xml
diff --git a/pages/Users/Group.c.xml b/pages/content/Users:Group.xml
index b48e369..b48e369 100644
--- a/pages/Users/Group.c.xml
+++ b/pages/content/Users:Group.xml
diff --git a/pages/Users/Handle.c.xml b/pages/content/Users:Handle.xml
index abed354..abed354 100644
--- a/pages/Users/Handle.c.xml
+++ b/pages/content/Users:Handle.xml
diff --git a/pages/Users/New.c.xml b/pages/content/Users:New.xml
index ac6bed9..ac6bed9 100644
--- a/pages/Users/New.c.xml
+++ b/pages/content/Users:New.xml
diff --git a/pages/Users/Password.c.xml b/pages/content/Users:Password.xml
index c08cd02..c08cd02 100644
--- a/pages/Users/Password.c.xml
+++ b/pages/content/Users:Password.xml
diff --git a/pages/Users/Rename.c.xml b/pages/content/Users:Rename.xml
index def6aa4..def6aa4 100644
--- a/pages/Users/Rename.c.xml
+++ b/pages/content/Users:Rename.xml
diff --git a/pages/default.e.xml b/pages/editor/default.xml
index 3c0c79e..3c0c79e 100644
--- a/pages/default.e.xml
+++ b/pages/editor/default.xml
diff --git a/pages/phpexec.e.xml b/pages/editor/phpexec.xml
index a2c390d..a2c390d 100644
--- a/pages/phpexec.e.xml
+++ b/pages/editor/phpexec.xml
diff --git a/pages/Login.n.xml b/pages/nav/Login.xml
index 71fb2b3..71fb2b3 100644
--- a/pages/Login.n.xml
+++ b/pages/nav/Login.xml
diff --git a/styles/TheWhiteOne/style.css b/styles/TheWhiteOne/style.css
index b64835b..7aa8062 100644
--- a/styles/TheWhiteOne/style.css
+++ b/styles/TheWhiteOne/style.css
@@ -7,7 +7,12 @@ body {
   margin-left:0;
 }
 
+h1, h3, h4, h5, h6 {
+  margin-top:0;
+}
+
 h2 {
+  margin-top:0;
   font-size:x-large;
   font-weight:normal;
   border-bottom:solid #AAAAAA 1px;
@@ -32,6 +37,12 @@ a.active_page_link {
   font-weight:bold;
 }
 
+a.editlink {
+  position:absolute;
+  top:2em;
+  right:1em;
+}
+
 .spaced-top {
   margin-top:0.8em;
 }
@@ -48,26 +59,10 @@ textarea.pageedit {
   width:100%;
 }
 
-table.privtab {
-  border-collapse:collapse;
-}
-
-table.privtab tr.line2 {
-  background-color:#DDDDDD;
-}
-
-table.privtab tr td {
-  text-align:center;
-  padding-left:15px;
-}
-
-table.privtab tr.group td {
-  font-weight:bold;
-}
-
-table.privtab tr td.page, table.privtab tr td.submit {
-  text-align:left;
-  padding-left:0;
+div.modinfo {
+  border:solid #AAAAAA 1px;
+  padding:1.5em;
+  margin:1em 3em;
 }
 
 div#content {
@@ -135,10 +130,6 @@ div#nav li.nav_\%21Login {
   list-style-image:none;
 }
 
-h1, h2, h3, h4, h5, h6 {
-  margin-top:0;
-}
-
 .error {
   color:#FF0000;
 }