Skip to content
Snippets Groups Projects
Commit 665bb41c authored by Thomas Müller's avatar Thomas Müller
Browse files

style fixes

parent 5112dac1
No related branches found
No related tags found
No related merge requests found
...@@ -215,7 +215,9 @@ class OC_App{ ...@@ -215,7 +215,9 @@ class OC_App{
return false; return false;
}else{ }else{
OC_Appconfig::setValue( $app, 'enabled', 'yes' ); OC_Appconfig::setValue( $app, 'enabled', 'yes' );
if(isset($appdata['id'])) OC_Appconfig::setValue( $app, 'ocsid', $appdata['id'] ); if(isset($appdata['id'])) {
OC_Appconfig::setValue( $app, 'ocsid', $appdata['id'] );
}
return true; return true;
} }
}else{ }else{
...@@ -231,14 +233,13 @@ class OC_App{ ...@@ -231,14 +233,13 @@ class OC_App{
* This function set an app as disabled in appconfig. * This function set an app as disabled in appconfig.
*/ */
public static function disable( $app ) { public static function disable( $app ) {
// check if app is a shiped app or not. if not delete // check if app is a shipped app or not. if not delete
OC_Appconfig::setValue( $app, 'enabled', 'no' ); OC_Appconfig::setValue( $app, 'enabled', 'no' );
// check if app is a shiped app or not. if not delete // check if app is a shipped app or not. if not delete
if(!OC_App::isShipped( $app )){ if(!OC_App::isShipped( $app )){
OC_Installer::removeApp( $app ); OC_Installer::removeApp( $app );
}else{ }
}
} }
/** /**
...@@ -647,15 +648,15 @@ class OC_App{ ...@@ -647,15 +648,15 @@ class OC_App{
} }
$remoteApps = OC_App::getAppstoreApps(); $remoteApps = OC_App::getAppstoreApps();
if ( $remoteApps ) { if ( $remoteApps ) {
// Remove duplicates // Remove duplicates
foreach ( $appList as $app ) { foreach ( $appList as $app ) {
foreach ( $remoteApps AS $key => $remote ) { foreach ( $remoteApps AS $key => $remote ) {
if ( if (
$app['name'] == $remote['name'] $app['name'] == $remote['name']
// To set duplicate detection to use OCS ID instead of string name, // To set duplicate detection to use OCS ID instead of string name,
// enable this code, remove the line of code above, // enable this code, remove the line of code above,
// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app: // and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
// OR $app['ocs_id'] == $remote['ocs_id'] // OR $app['ocs_id'] == $remote['ocs_id']
) { ) {
unset( $remoteApps[$key]); unset( $remoteApps[$key]);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment