Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
665bb41c
Commit
665bb41c
authored
12 years ago
by
Thomas Müller
Browse files
Options
Downloads
Patches
Plain Diff
style fixes
parent
5112dac1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/app.php
+11
-10
11 additions, 10 deletions
lib/app.php
with
11 additions
and
10 deletions
lib/app.php
+
11
−
10
View file @
665bb41c
...
@@ -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 ship
p
ed 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 ship
p
ed 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
]);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment