diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/app.php | 24 | ||||
| -rw-r--r-- | lib/setup.php | 16 |
2 files changed, 19 insertions, 21 deletions
diff --git a/lib/app.php b/lib/app.php index e373331850d..4e67da3c414 100644 --- a/lib/app.php +++ b/lib/app.php @@ -57,28 +57,10 @@ class OC_APP{ } // The rest comes here - $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_APPCONFIG::getValue($filename,'installed_version',0)==0){ //check if the plugin is fully installed - //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=self::getAppInfo("$SERVERROOT/apps/$filename/appinfo/info.xml"); - OC_APPCONFIG::setValue($filename,'installed_version',$info['version']); - } - require( "apps/$filename/appinfo/app.php" ); - } - } + $apps = OC_APPCONFIG::getApps(); + foreach( $apps as $app ){ + require( "apps/$app/appinfo/app.php" ); } - closedir( $dir ); self::$init = true; diff --git a/lib/setup.php b/lib/setup.php index c2757021f20..e9cb3da686c 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -31,6 +31,7 @@ else { class OC_SETUP { public static function install($options) { + global $SERVERROOT; $error = array(); $dbtype = $options['dbtype']; @@ -133,6 +134,21 @@ class OC_SETUP { OC_GROUP::createGroup('admin'); OC_GROUP::addToGroup($username, 'admin'); + foreach( array( "files_imageviewer", "files_publiclink" ) as $app ){ + + if(is_file("$SERVERROOT/apps/$app/appinfo/database.xml")){ + OC_DB::createDbFromStructure("$SERVERROOT/apps/$app/appinfo/database.xml"); + } + + //run appinfo/install.php + if(is_file("$SERVERROOT/apps/$app/appinfo/install.php")){ + include("$SERVERROOT/apps/$app/appinfo/install.php"); + } + + $info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml"); + OC_APPCONFIG::setValue($app,'installed_version',$info['version']); + } + //create htaccess files for apache hosts self::createHtaccess(); //TODO detect if apache is used |