1 files changed, 85 insertions, 14 deletions

diff --git a/settings/apps.php b/settings/apps.php
index e613814fe94..a1c1bf6aa53 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -29,45 +29,116 @@ OC_Util::addStyle( "settings", "settings" );
 OC_Util::addScript( "settings", "apps" );
 OC_App::setActiveNavigationEntry( "core_apps" );
 
-$registeredApps=OC_App::getAllApps();
-$apps=array();
+$installedApps = OC_App::getAllApps();
 
-//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
-$blacklist=array('files');//we dont want to show configuration for these
+//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature?
 
-foreach($registeredApps as $app) {
-	if(array_search($app, $blacklist)===false) {
+$blacklist = array('files');//we dont want to show configuration for these
+
+$appList = array();
+
+foreach ( $installedApps as $app ) {
+
+	if ( array_search( $app, $blacklist ) === false ) {
+	
 		$info=OC_App::getAppInfo($app);
+		
 		if (!isset($info['name'])) {
+		
 			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
+			
 			continue;
+			
 		}
-		$active=(OC_Appconfig::getValue($app, 'enabled', 'no')=='yes')?true:false;
-		$info['active']=$active;
+		
+		if ( OC_Appconfig::getValue( $app, 'enabled', 'no') == 'yes' ) {
+		
+			$active = true;
+			
+		} else {
+		
+			$active = false;
+			
+		}
+		
+		$info['active'] = $active;
+		
 		if(isset($info['shipped']) and ($info['shipped']=='true')) {
+		
 			$info['internal']=true;
+			
 			$info['internallabel']='Internal App';
+		
 		}else{
+		
 			$info['internal']=false;
+			
 			$info['internallabel']='3rd Party App';
+		
 		}
-		$info['preview']='trans.png';
-		$info['version']=OC_App::getAppVersion($app);
-		$apps[]=$info;
+		
+		$info['preview'] = 'trans.png';
+		
+		$info['version'] = OC_App::getAppVersion($app);
+		
+		$appList[] = $info;
+		
 	}
 }
 
-function app_sort($a, $b) {
+$remoteApps = OC_App::getAppstoreApps();
+
+if ( $remoteApps ) {
+
+	// Remove duplicates
+	foreach ( $appList as $app ) {
+
+		foreach ( $remoteApps AS $key => $remote ) {
+		
+			if ( 
+			$app['name'] == $remote['name']
+			// To set duplicate detection to use OCS ID instead of string name, 
+			// enable this code, remove the line of code above, 
+			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app: 
+			// OR $app['ocs_id'] == $remote['ocs_id']
+			) {
+				
+				unset( $remoteApps[$key]);
+			
+			}
+		
+		}
+		
+	}
+
+	$combinedApps = array_merge( $appList, $remoteApps );
+
+} else {
+
+	$combinedApps = $appList;
+	
+}
+
+function app_sort( $a, $b ) {
+
 	if ($a['active'] != $b['active']) {
+	
 		return $b['active'] - $a['active'];
+		
 	}
+	
 	return strcmp($a['name'], $b['name']);
+	
 }
-usort($apps, 'app_sort');
+
+usort( $combinedApps, 'app_sort' );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps', $apps, false);
+
+$tmpl->assign('apps', $combinedApps, false);
+
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
+
 $tmpl->assign('appid', $appid);
 
 $tmpl->printPage();