From ae5dc3efdffef75c48e5ef7cac6b40cd5720442b Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Thu, 3 Mar 2011 21:55:32 +0100
Subject: New classes for owncloud: OC_APP for applications, OC_PREFERENCES for
 user preferences

---
 admin/appinfo.php     | 12 ------------
 admin/appinfo/app.php | 12 ++++++++++++
 admin/index.php       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 admin/appinfo.php
 create mode 100644 admin/appinfo/app.php

(limited to 'admin')

diff --git a/admin/appinfo.php b/admin/appinfo.php
deleted file mode 100644
index 0b2e4dbf85d..00000000000
--- a/admin/appinfo.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-OC_UTIL::addApplication( array( "id" => "admin", "name" => "Administration" ));
-if( OC_USER::ingroup( $_SESSION['username'], 'admin' ))
-{
-	OC_UTIL::addNavigationEntry( array( "app" => "admin", "file" => "index.php", "name" => "Administration" ));
-}
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "system.php", "name" => "System Settings" ));
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "users.php", "name" => "Users" ));
-OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "plugins.php", "name" => "Plugins" ));
-
-?>
diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
new file mode 100644
index 00000000000..befe8e678f0
--- /dev/null
+++ b/admin/appinfo/app.php
@@ -0,0 +1,12 @@
+<?php
+
+OC_APP::register( array( "id" => "admin", "name" => "Administration" ));
+if( OC_USER::ingroup( $_SESSION['username'], 'admin' ))
+{
+	OC_UTIL::addNavigationEntry( array( "app" => "admin", "file" => "index.php", "name" => "Administration" ));
+}
+OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "system.php", "name" => "System Settings" ));
+OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "users.php", "name" => "Users" ));
+OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "plugins.php", "name" => "Plugins" ));
+
+?>
diff --git a/admin/index.php b/admin/index.php
index cfcb70d056b..96fa2007244 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,7 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin'
 
 $adminpages = array();
 
-foreach( OC_UTIL::$adminpages as $i ){
+foreach( OC_APP::list() as $i ){
 	// Do some more work here soon
 	$adminpages[] = $i;
 }
-- 
cgit v1.2.3