diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-09-28 12:29:07 +0400 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-09-28 12:29:07 +0400 |
| commit | 8e42b02a224f0f476ecd7ac306a7a9cddeba8ebf (patch) | |
| tree | 2bf082f9899e557642d333d9c5aa8d2d91533283 | |
| parent | 8c405a59d80898b56e411f40bfb07456f910cc49 (diff) | |
| parent | c6f78fbe43dbe3f6875b72b34592bde25fc78d0b (diff) | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | apps/calendar/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/contacts/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/files_imageviewer/appinfo/info.xml | 3 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/info.xml | 3 | ||||
| -rw-r--r-- | apps/files_textviewer/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/media/appinfo/info.xml | 3 | ||||
| -rw-r--r-- | apps/user_openid/appinfo/info.xml | 3 | ||||
| -rw-r--r-- | lib/installer.php | 8 | ||||
| -rw-r--r-- | lib/setup.php | 2 |
9 files changed, 17 insertions, 8 deletions
diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml index c846fc1eebc..6b1ecd2337f 100644 --- a/apps/calendar/appinfo/info.xml +++ b/apps/calendar/appinfo/info.xml @@ -7,4 +7,5 @@ <author>Georg Ehrke (Userinterface), Jakob Sack</author> <require>2</require> <description>Calendar with CalDAV support</description> + <default_enable/> </info> diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml index 77c9dc91bfc..d18a19c3aea 100644 --- a/apps/contacts/appinfo/info.xml +++ b/apps/contacts/appinfo/info.xml @@ -7,4 +7,5 @@ <author>Jakob Sack</author> <require>2</require> <description>Address book with CardDAV support.</description> + <default_enable/> </info> diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml index f3b5a67960e..00b55c254dd 100644 --- a/apps/files_imageviewer/appinfo/info.xml +++ b/apps/files_imageviewer/appinfo/info.xml @@ -7,4 +7,5 @@ <licence>AGPL</licence> <author>Robin Appelman</author> <require>2</require> -</info>
\ No newline at end of file + <default_enable/> +</info> diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 2fbb3300f69..abf847b4483 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -7,4 +7,5 @@ <licence>AGPL</licence> <author>Michael Gapczynski</author> <require>2</require> -</info>
\ No newline at end of file + <default_enable/> +</info> diff --git a/apps/files_textviewer/appinfo/info.xml b/apps/files_textviewer/appinfo/info.xml index 209b4140346..becfd5e35c8 100644 --- a/apps/files_textviewer/appinfo/info.xml +++ b/apps/files_textviewer/appinfo/info.xml @@ -6,4 +6,5 @@ <licence>AGPL</licence> <author>Robin Appelman</author> <require>2</require> + <default_enable/> </info> diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml index 044abade53f..795c9a4dd71 100644 --- a/apps/media/appinfo/info.xml +++ b/apps/media/appinfo/info.xml @@ -7,4 +7,5 @@ <licence>AGPL</licence> <author>Robin Appelman</author> <require>2</require> -</info>
\ No newline at end of file + <default_enable/> +</info> diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml index 32525009d61..332d2199dd3 100644 --- a/apps/user_openid/appinfo/info.xml +++ b/apps/user_openid/appinfo/info.xml @@ -7,4 +7,5 @@ <licence>AGPL</licence> <author>Robin Appelman</author> <require>2</require> -</info>
\ No newline at end of file + <default_enable/> +</info> diff --git a/lib/installer.php b/lib/installer.php index 9416a42c972..0febb2cab46 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -243,13 +243,14 @@ class OC_Installer{ * If $enabled is true, apps are installed as enabled. * If $enabled is false, apps are installed as disabled. */ - public static function installShippedApps( $enabled ){ + public static function installShippedApps(){ $dir = opendir( OC::$SERVERROOT."/apps" ); while( false !== ( $filename = readdir( $dir ))){ if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$SERVERROOT."/apps/$filename") ){ if( file_exists( OC::$SERVERROOT."/apps/$filename/appinfo/app.php" )){ if(!OC_Installer::isInstalled($filename)){ - OC_Installer::installShippedApp($filename); + $info = OC_Installer::installShippedApp($filename); + $enabled = isset($info['default_enable']); if( $enabled ){ OC_Appconfig::setValue($filename,'enabled','yes'); }else{ @@ -265,7 +266,7 @@ class OC_Installer{ /** * install an app already placed in the app folder * @param string $app id of the app to install - * @return bool + * @returns array see OC_App::getAppInfo */ public static function installShippedApp($app){ //install the database @@ -279,5 +280,6 @@ class OC_Installer{ } $info=OC_App::getAppInfo(OC::$SERVERROOT."/apps/$app/appinfo/info.xml"); OC_Appconfig::setValue($app,'installed_version',$info['version']); + return $info; } } diff --git a/lib/setup.php b/lib/setup.php index 7b205acd705..8d3079720cc 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -206,7 +206,7 @@ class OC_Setup { OC_User::login($username, $password); //guess what this does - OC_Installer::installShippedApps(true); + OC_Installer::installShippedApps(); //create htaccess files for apache hosts if (strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { |