diff --git a/apps/admin_dependencies_chk/appinfo/info.xml b/apps/admin_dependencies_chk/appinfo/info.xml index a9c1c68c5d4..d5f8bd3783d 100644 --- a/apps/admin_dependencies_chk/appinfo/info.xml +++ b/apps/admin_dependencies_chk/appinfo/info.xml @@ -2,7 +2,6 @@ admin_dependencies_chk Owncloud dependencies info - 0.01 AGPL Brice Maron (eMerzh) 2 diff --git a/apps/admin_dependencies_chk/appinfo/version b/apps/admin_dependencies_chk/appinfo/version new file mode 100644 index 00000000000..d1c6331b310 --- /dev/null +++ b/apps/admin_dependencies_chk/appinfo/version @@ -0,0 +1 @@ +0.01 \ No newline at end of file diff --git a/apps/admin_migrate/appinfo/info.xml b/apps/admin_migrate/appinfo/info.xml index 67fc3f9c5a0..51721579002 100644 --- a/apps/admin_migrate/appinfo/info.xml +++ b/apps/admin_migrate/appinfo/info.xml @@ -3,7 +3,6 @@ admin_migrate ownCloud Instance Migration Import/Export your owncloud instance - 0.1 AGPL Thomas Schmidt and Tom Needham 2 diff --git a/apps/admin_migrate/appinfo/version b/apps/admin_migrate/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/admin_migrate/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml index 862ab805a60..39779483d85 100644 --- a/apps/bookmarks/appinfo/info.xml +++ b/apps/bookmarks/appinfo/info.xml @@ -3,7 +3,6 @@ bookmarks Bookmarks Bookmark manager for ownCloud - 0.2 AGPL Arthur Schiwon, Marvin Thomas Rabe 2 diff --git a/apps/bookmarks/appinfo/version b/apps/bookmarks/appinfo/version new file mode 100644 index 00000000000..2f4536184bc --- /dev/null +++ b/apps/bookmarks/appinfo/version @@ -0,0 +1 @@ +0.2 \ No newline at end of file diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml index 4ac3c5bf099..101840aa1fa 100644 --- a/apps/calendar/appinfo/info.xml +++ b/apps/calendar/appinfo/info.xml @@ -2,7 +2,6 @@ calendar Calendar - 0.2.1 AGPL Georg Ehrke, Bart Visscher, Jakob Sack 2 diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version new file mode 100644 index 00000000000..7dff5b89211 --- /dev/null +++ b/apps/calendar/appinfo/version @@ -0,0 +1 @@ +0.2.1 \ No newline at end of file diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml index 0e2b1336006..55ddf42ccc1 100644 --- a/apps/contacts/appinfo/info.xml +++ b/apps/contacts/appinfo/info.xml @@ -2,7 +2,6 @@ contacts Contacts - 0.1 AGPL Jakob Sack 2 diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/contacts/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/external/appinfo/info.xml b/apps/external/appinfo/info.xml index 05f5709916d..83130f17e62 100644 --- a/apps/external/appinfo/info.xml +++ b/apps/external/appinfo/info.xml @@ -3,7 +3,6 @@ external External Show external Application in the ownCloud menu - 1.0 AGPL Frank Karlitschek 2 diff --git a/apps/external/appinfo/version b/apps/external/appinfo/version new file mode 100644 index 00000000000..9f8e9b69a33 --- /dev/null +++ b/apps/external/appinfo/version @@ -0,0 +1 @@ +1.0 \ No newline at end of file diff --git a/apps/files_archive/appinfo/info.xml b/apps/files_archive/appinfo/info.xml index 236b5a64b05..b04498aa089 100644 --- a/apps/files_archive/appinfo/info.xml +++ b/apps/files_archive/appinfo/info.xml @@ -3,7 +3,6 @@ files_archive Archive support Transparent opening of archives - 0.1 AGPL Robin Appelman 3 diff --git a/apps/files_archive/appinfo/version b/apps/files_archive/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/files_archive/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml index 691b265bf60..c2e1aa96043 100644 --- a/apps/files_encryption/appinfo/info.xml +++ b/apps/files_encryption/appinfo/info.xml @@ -3,7 +3,6 @@ files_encryption Encryption Server side encryption of files - 0.1 AGPL Robin Appelman 3 diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/files_encryption/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index fb58297ff17..1918925389d 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -3,7 +3,6 @@ files_external External storage support Mount external storage sources - 0.1 AGPL Robin Appelman 3 diff --git a/apps/files_external/appinfo/version b/apps/files_external/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/files_external/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml index 00b55c254dd..dbc78ffba0f 100644 --- a/apps/files_imageviewer/appinfo/info.xml +++ b/apps/files_imageviewer/appinfo/info.xml @@ -3,7 +3,6 @@ files_imageviewer Image Viewer Simple image viewer for owncloud - 1.0 AGPL Robin Appelman 2 diff --git a/apps/files_imageviewer/appinfo/version b/apps/files_imageviewer/appinfo/version new file mode 100644 index 00000000000..9f8e9b69a33 --- /dev/null +++ b/apps/files_imageviewer/appinfo/version @@ -0,0 +1 @@ +1.0 \ No newline at end of file diff --git a/apps/files_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml index f133f1900d7..0e81729a8bc 100755 --- a/apps/files_pdfviewer/appinfo/info.xml +++ b/apps/files_pdfviewer/appinfo/info.xml @@ -3,7 +3,6 @@ files_pdfviewer PDF Viewer Inline PDF viewer (pdfjs-based) - 0.1 GPL Joan Creus 2 diff --git a/apps/files_pdfviewer/appinfo/version b/apps/files_pdfviewer/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/files_pdfviewer/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 8fda775520b..490ffaca890 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -3,7 +3,6 @@ files_sharing Share Files File sharing between users - 0.1 AGPL Michael Gapczynski 2 diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/files_sharing/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/files_texteditor/appinfo/info.xml b/apps/files_texteditor/appinfo/info.xml index da1cdba15dd..83c057f38fd 100644 --- a/apps/files_texteditor/appinfo/info.xml +++ b/apps/files_texteditor/appinfo/info.xml @@ -3,7 +3,6 @@ files_texteditor Text Editor Simple plain text editor based on Ace editor. - 0.3 AGPL Tom Needham 2 diff --git a/apps/files_texteditor/appinfo/version b/apps/files_texteditor/appinfo/version new file mode 100644 index 00000000000..1d71ef97443 --- /dev/null +++ b/apps/files_texteditor/appinfo/version @@ -0,0 +1 @@ +0.3 \ No newline at end of file diff --git a/apps/files_versioning/appinfo/info.xml b/apps/files_versioning/appinfo/info.xml index 4c67894f9f9..b9f56f674a0 100644 --- a/apps/files_versioning/appinfo/info.xml +++ b/apps/files_versioning/appinfo/info.xml @@ -2,7 +2,6 @@ files_versioning Versioning and Backup - 1.0.0 GPLv2 Craig Roberts 3 diff --git a/apps/files_versioning/appinfo/version b/apps/files_versioning/appinfo/version new file mode 100644 index 00000000000..afaf360d37f --- /dev/null +++ b/apps/files_versioning/appinfo/version @@ -0,0 +1 @@ +1.0.0 \ No newline at end of file diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml index 4c8c1cee242..7dc85374b0b 100644 --- a/apps/gallery/appinfo/info.xml +++ b/apps/gallery/appinfo/info.xml @@ -2,7 +2,6 @@ gallery Pictures - 0.4 AGPL Bartek Przybylski 2 diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version new file mode 100644 index 00000000000..e6adf3fc7bb --- /dev/null +++ b/apps/gallery/appinfo/version @@ -0,0 +1 @@ +0.4 \ No newline at end of file diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml index 4a642bf889d..01145d4a944 100644 --- a/apps/media/appinfo/info.xml +++ b/apps/media/appinfo/info.xml @@ -3,7 +3,6 @@ media Media Media player and server for ownCloud - 0.3 AGPL Robin Appelman 2 diff --git a/apps/media/appinfo/version b/apps/media/appinfo/version new file mode 100644 index 00000000000..1d71ef97443 --- /dev/null +++ b/apps/media/appinfo/version @@ -0,0 +1 @@ +0.3 \ No newline at end of file diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml index 1f9618a3334..1875e70a300 100644 --- a/apps/remoteStorage/appinfo/info.xml +++ b/apps/remoteStorage/appinfo/info.xml @@ -3,7 +3,6 @@ remoteStorage remoteStorage compatibility Enables you to use ownCloud as their remote storage for unhosted applications. This app requires the Webfinger app to be installed and enabled correctly. More info on the website of the unhosted movement. - 0.6 AGPL or MIT Michiel de Jong 2 diff --git a/apps/remoteStorage/appinfo/version b/apps/remoteStorage/appinfo/version new file mode 100644 index 00000000000..490f510fc27 --- /dev/null +++ b/apps/remoteStorage/appinfo/version @@ -0,0 +1 @@ +0.6 \ No newline at end of file diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index 99830dd1ffd..fe7e61fb5c3 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -3,7 +3,6 @@ user_ldap LDAP user backend Authenticate Users by LDAP - 0.1 AGPL Dominik Schmidt 2 diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/user_ldap/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/user_migrate/appinfo/info.xml b/apps/user_migrate/appinfo/info.xml index 6abcb4af92c..4c3646f770c 100644 --- a/apps/user_migrate/appinfo/info.xml +++ b/apps/user_migrate/appinfo/info.xml @@ -3,7 +3,6 @@ user_migrate User Account Migration Migrate your user accounts - 0.1 AGPL Tom Needham 2 diff --git a/apps/user_migrate/appinfo/version b/apps/user_migrate/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/user_migrate/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml index 721db1877e3..6214229c0a1 100644 --- a/apps/user_openid/appinfo/info.xml +++ b/apps/user_openid/appinfo/info.xml @@ -3,7 +3,6 @@ user_openid OpenID user backend Allow login through OpenID - 0.1 AGPL Robin Appelman 2 diff --git a/apps/user_openid/appinfo/version b/apps/user_openid/appinfo/version new file mode 100644 index 00000000000..ceab6e11ece --- /dev/null +++ b/apps/user_openid/appinfo/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml index d47fb723a3a..fe1d4371863 100644 --- a/apps/user_webfinger/appinfo/info.xml +++ b/apps/user_webfinger/appinfo/info.xml @@ -3,7 +3,6 @@ user_webfinger Webfinger Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for external applications. Other apps can provide information for webfinger requests, such as remoteStorage compatibility. - 0.3 AGPL or MIT Michiel de Jong, Florian Hülsmann 2 diff --git a/apps/user_webfinger/appinfo/version b/apps/user_webfinger/appinfo/version new file mode 100644 index 00000000000..1d71ef97443 --- /dev/null +++ b/apps/user_webfinger/appinfo/version @@ -0,0 +1 @@ +0.3 \ No newline at end of file diff --git a/lib/app.php b/lib/app.php index 807d8955d8f..b499e1a8ef2 100755 --- a/lib/app.php +++ b/lib/app.php @@ -307,6 +307,20 @@ class OC_App{ return $list; } + + /** + * get the last version of the app, either from appinfo/version or from appinfo/info.xml + */ + public static function getAppVersion($appid){ + $file=OC::$APPSROOT.'/apps/'.$appid.'/appinfo/version'; + $version=@file_get_contents($file); + if($version){ + return $version; + }else{ + $appData=self::getAppInfo($appid); + return $appData['version']; + } + } /** * @brief Read app metadata from the info.xml file @@ -441,9 +455,8 @@ class OC_App{ // The rest comes here $versions = self::getAppVersions(); foreach( $versions as $app=>$installedVersion ){ - $appInfo=OC_App::getAppInfo($app); - if (isset($appInfo['version'])) { - $currentVersion=$appInfo['version']; + $currentVersion=OC_App::getAppVersion($app); + if ($currentVersion) { if (version_compare($currentVersion, $installedVersion, '>')) { OC_App::updateApp($app); OC_Appconfig::setValue($app,'installed_version',$appInfo['version']);