diff options
| author | Kamil Domanski <kdomanski@kdemail.net> | 2011-06-21 22:16:41 +0200 |
|---|---|---|
| committer | Kamil Domanski <kdomanski@kdemail.net> | 2011-06-21 22:17:53 +0200 |
| commit | e047feb2ad90c3b103c92d35f794988767b2ba21 (patch) | |
| tree | 78cbff89498262f9df8a85b25c9594120fc1cc7d /lib/setup.php | |
| parent | ee0f1490e1872cbe6071f5758e292ae1646ab1af (diff) | |
| download | nextcloud-server-e047feb2ad90c3b103c92d35f794988767b2ba21.tar.gz nextcloud-server-e047feb2ad90c3b103c92d35f794988767b2ba21.zip | |
install shipped apps also in "installed apps" page
Diffstat (limited to 'lib/setup.php')
| -rw-r--r-- | lib/setup.php | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/lib/setup.php b/lib/setup.php index bdb5dcc4e24..281f24db507 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -136,7 +136,7 @@ class OC_SETUP { OC_GROUP::addToGroup($username, 'admin'); //guess what this does - self::installShippedApps(); + OC_INSTALLER::installShippedApps(true); //create htaccess files for apache hosts self::createHtaccess(); //TODO detect if apache is used @@ -186,32 +186,6 @@ class OC_SETUP { $content = "deny from all"; file_put_contents(OC_CONFIG::getValue('datadirectory', $SERVERROOT.'/data').'/.htaccess', $content); } - - private static function installShippedApps(){ - global $SERVERROOT; - $dir = opendir( "$SERVERROOT/apps" ); - while( false !== ( $filename = readdir( $dir ))){ - if( substr( $filename, 0, 1 ) != '.' and is_dir("$SERVERROOT/apps/$filename") ){ - if( file_exists( "$SERVERROOT/apps/$filename/appinfo/app.php" )){ - if(!OC_INSTALLER::isInstalled($filename)){ - //install the database - if(is_file("$SERVERROOT/apps/$filename/appinfo/database.xml")){ - OC_DB::createDbFromStructure("$SERVERROOT/apps/$filename/appinfo/database.xml"); - } - - //run appinfo/install.php - if(is_file("$SERVERROOT/apps/$filename/appinfo/install.php")){ - include("$SERVERROOT/apps/$filename/appinfo/install.php"); - } - $info=OC_APP::getAppInfo("$SERVERROOT/apps/$filename/appinfo/info.xml"); - OC_APPCONFIG::setValue($filename,'installed_version',$info['version']); - OC_APPCONFIG::setValue($filename,'enabled','yes'); - } - } - } - } - closedir( $dir ); - } } ?> |