added basic "installed apps" page

4 files changed, 98 insertions, 44 deletions

diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 775575e22a8..d01b7d5d624 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -7,6 +7,6 @@ OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HE
 OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
 
 // Add subentries for App installer
-OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some&parameters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
 
 ?>
diff --git a/admin/apps.php b/admin/apps.php
index 5b4e65e340e..725128a7523 100644
--- a/admin/apps.php
+++ b/admin/apps.php
@@ -34,65 +34,74 @@ OC_UTIL::addStyle( "admin", "apps" );
 
 if(isset($_GET['id']))  $id=$_GET['id']; else $id=0;
 if(isset($_GET['cat'])) $cat=$_GET['cat']; else $cat=0;
+if(isset($_GET['installed'])) $installed=true; else $installed=false;
+
+if($installed){
+	global $SERVERROOT;
+	$apps = OC_APPCONFIG::getApps();
+	$records = array();
+
+	OC_APP::setActiveNavigationEntry( "core_apps_installed" );
+	echo count($apps);
+	foreach($apps as $app){
+		$info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
+		$record = array( 'id' => $app,
+				 'name' => $info['name'],
+				 'version' => $info['version'],
+				 'author' => $info['author'],
+				 'enabled' => OC_APP::isEnabled( $app ));
+		$records[]=$record;
+	}
 
-$categories=OC_OCSCLIENT::getCategories();
-if($categories==NULL){
-	OC_APP::setActiveNavigationEntry( "core_apps" );
-
-	$tmpl = new OC_TEMPLATE( "admin", "app_noconn", "admin" );
+	$tmpl = new OC_TEMPLATE( "admin", "appsinst", "admin" );
+	$tmpl->assign( "apps", $records );
 	$tmpl->printPage();
 	unset($tmpl);
 	exit();
-}
-/*
-
-All
-Installed Apps
-
+}else{
 
+	$categories=OC_OCSCLIENT::getCategories();
+	if($categories==NULL){
+		OC_APP::setActiveNavigationEntry( "core_apps" );
 
-foreach($categories as $key=>$value) {
-print_r($value);
-}
+		$tmpl = new OC_TEMPLATE( "admin", "app_noconn", "admin" );
+		$tmpl->printPage();
+		unset($tmpl);
+		exit();
+	}
 
 
-*/
+	if($id==0) {
+		OC_APP::setActiveNavigationEntry( "core_apps" );
 
-// OC_APP::setActiveNavigationEntry( "core_apps_installed" );
+		if($cat==0){
+			$numcats=array();
+			foreach($categories as $key=>$value) $numcats[]=$key;
+			$apps=OC_OCSCLIENT::getApplications($numcats);
+		}else{
+			$apps=OC_OCSCLIENT::getApplications($cat);
+		}
 
+		// return template
+		$tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
 
-if($id==0) {
-	OC_APP::setActiveNavigationEntry( "core_apps" );
+		$tmpl->assign( "categories", $categories );
+		$tmpl->assign( "apps", $apps );
+		$tmpl->printPage();
+		unset($tmpl);
 
-	if($cat==0){
-		$numcats=array();
-		foreach($categories as $key=>$value) $numcats[]=$key;
-		$apps=OC_OCSCLIENT::getApplications($numcats);
 	}else{
-		$apps=OC_OCSCLIENT::getApplications($cat);
-	}
+		OC_APP::setActiveNavigationEntry( "core_apps" );
 
-	// return template
-	$tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
+		$app=OC_OCSCLIENT::getApplication($id);
 
-	$tmpl->assign( "categories", $categories );
-	$tmpl->assign( "apps", $apps );
-	$tmpl->printPage();
-	unset($tmpl);
-
-}else{
-	OC_APP::setActiveNavigationEntry( "core_apps" );
-
-	$app=OC_OCSCLIENT::getApplication($id);
-
-	$tmpl = new OC_TEMPLATE( "admin", "app", "admin" );
-	$tmpl->assign( "categories", $categories );
-	$tmpl->assign( "app", $app );
-	$tmpl->printPage();
-	unset($tmpl);
+		$tmpl = new OC_TEMPLATE( "admin", "app", "admin" );
+		$tmpl->assign( "categories", $categories );
+		$tmpl->assign( "app", $app );
+		$tmpl->printPage();
+		unset($tmpl);
 
+	}
 }
 
-
 ?>
-
diff --git a/admin/css/apps.css b/admin/css/apps.css
index 7063762204a..fbbd4fce4b5 100644
--- a/admin/css/apps.css
+++ b/admin/css/apps.css
@@ -7,6 +7,24 @@ table td.date
     text-align: right;
 }
 
+table td.version, table td.enabled, table td.disabled
+{
+    padding: 0.5em 1em;
+    text-align: center;
+}
+
+table td.enabled
+{
+    color: #006600;
+    font-weight: bold;
+}
+
+table td.disabled
+{
+    color: #660000;
+    font-weight: bold;
+}
+
 .preview 
 {
     padding: 3px;
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
new file mode 100644
index 00000000000..c1acc09d5d3
--- /dev/null
+++ b/admin/templates/appsinst.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * Template for Installed Apps
+ */
+?>
+<h1><?php echo $l->t( 'Installed Applications' ); ?></h1>
+
+<table>
+	<thead>
+		<tr>
+			<th><?php echo $l->t( 'Name' ); ?></th>
+			<th><?php echo $l->t( 'Version' ); ?></th>
+			<th><?php echo $l->t( 'Author' ); ?></th>
+			<th><?php echo $l->t( 'Status' ); ?></th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach($_["apps"] as $app): ?>
+			<tr>
+				<td class="name" width="200"><?php echo($app['name']); ?></td>
+				<td class="version"><?php echo($app['version']); ?></td>
+				<td><?php echo($app['author']); ?></td>
+				<td class="<?php echo $app['enabled'] ? 'enabled' : 'disabled' ?>"><?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?></td>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
\ No newline at end of file