diff options
author | neoraider <devnull@localhost> | 2006-09-19 00:53:00 +0200 |
---|---|---|
committer | neoraider <devnull@localhost> | 2006-09-19 00:53:00 +0200 |
commit | e5a1418503a1b0f7d20a0c5c51d44f10a881411a (patch) | |
tree | fc2e19d958382a93e778faecfd6db300d4e6cfea /pages | |
parent | 2390cba867a49e96156e9cf57cbf591182f98bd7 (diff) | |
download | neon-e5a1418503a1b0f7d20a0c5c51d44f10a881411a.tar neon-e5a1418503a1b0f7d20a0c5c51d44f10a881411a.zip |
Interne Modulverwaltung neu geschrieben;
Basis modularisiert;
das gesamte System an die neue Modulverwaltung angepasst.
Diffstat (limited to 'pages')
-rw-r--r-- | pages/content/Login.xml | 5 | ||||
-rw-r--r-- | pages/content/Logout.xml | 5 | ||||
-rw-r--r-- | pages/content/Modules.xml | 10 | ||||
-rw-r--r-- | pages/content/Modules:Enable.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages:Copy.xml | 5 | ||||
-rw-r--r-- | pages/content/Pages:Delete.xml | 3 | ||||
-rw-r--r-- | pages/content/Pages:Edit.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages:Handle.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages:New.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages:Privs.xml | 4 | ||||
-rw-r--r-- | pages/content/Pages:Rename.xml | 4 | ||||
-rw-r--r-- | pages/content/Users.xml | 4 | ||||
-rw-r--r-- | pages/content/Users:Delete.xml | 3 | ||||
-rw-r--r-- | pages/content/Users:Group.xml | 3 | ||||
-rw-r--r-- | pages/content/Users:Handle.xml | 5 | ||||
-rw-r--r-- | pages/content/Users:New.xml | 4 | ||||
-rw-r--r-- | pages/content/Users:Password.xml | 4 | ||||
-rw-r--r-- | pages/content/Users:Rename.xml | 4 | ||||
-rw-r--r-- | pages/editor/default.xml | 2 | ||||
-rw-r--r-- | pages/editor/phpexec.xml | 2 | ||||
-rw-r--r-- | pages/nav/Login.xml | 6 |
22 files changed, 30 insertions, 63 deletions
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">'; |