diff options
| author | Kamil Domanski <kdomanski@kdemail.net> | 2011-06-19 22:42:33 +0200 |
|---|---|---|
| committer | Kamil Domanski <kdomanski@kdemail.net> | 2011-06-19 22:46:05 +0200 |
| commit | ee247a21a49c801a4bf96b42a2d6ea28c9446ee6 (patch) | |
| tree | 90e15357f213ff5a1f6fed24e8468cdc60da13ab /lib/installer.php | |
| parent | 37f9e037725de58bd9b611fff759f7d12cc6ee5a (diff) | |
| download | nextcloud-server-ee247a21a49c801a4bf96b42a2d6ea28c9446ee6.tar.gz nextcloud-server-ee247a21a49c801a4bf96b42a2d6ea28c9446ee6.zip | |
shipped apps are no longer hardcoded
Diffstat (limited to 'lib/installer.php')
| -rw-r--r-- | lib/installer.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/installer.php b/lib/installer.php index 02b71027cd7..91b7ea7da67 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -108,7 +108,7 @@ class OC_INSTALLER{ $basedir=$SERVERROOT.'/apps/'.$info['id']; //check if an app with the same id is already installed - if(self::isInstalled( $info['id'] ))){ + if(self::isInstalled( $info['id'] )){ error_log("App already installed"); OC_HELPER::rmdirr($extractDir); if($data['source']=='http'){ @@ -118,14 +118,14 @@ class OC_INSTALLER{ } //check if the destination directory already exists -+ if(is_dir($basedir)){ -+ error_log("App's directory already exists"); -+ OC_HELPER::rmdirr($extractDir); -+ if($data['source']=='http'){ -+ unlink($path); -+ } -+ return false; -+ } + if(is_dir($basedir)){ + error_log("App's directory already exists"); + OC_HELPER::rmdirr($extractDir); + if($data['source']=='http'){ + unlink($path); + } + return false; + } if(isset($data['pretent']) and $data['pretent']==true){ return false; |