Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
TL;DR: upstream point release update with security fixes
Hi,
Please unblock package owncloud
The 7.0.3 upstream point release was expected on October 22nd (just in
time for the freeze), but was delayed until today to properly fix some
bugs. Furthermore, “Several security fixes” were added on last minute.
In order to minimize the debdiff proposed today, I’ve uploaded in time
for Jessie a pre-rc2 version on October 24th, still, the filtered
debdiff is bigger than I would have hopped:
65 files changed, 678 insertions(+), 208 deletions(-)
As shown by the binary debdiff in P.-S., only two files are actually
added (besides l10n changes). Because I believe shipping an actual point
release version (instead of an homemade pre-rc one) would be best, and
to be on the safe side of including all security fixes (that will only
be disclosed in two weeks per upstream policy) rather sooner than
latter, I kindly ask you to consider this unusual request (I should
probably have asked for a pre-approval earlier, but I already pushed the
rc3 to Sid in the hope of gathering as much testing as possible.
The attached debdiff is filtered using the command:
debdiff --ignore-space ../owncloud_7.0.3{~rc2~20141023,}+dfsg-1.dsc | \
filterdiff -x '*/core/doc/*' \
-x '*/*/l10n/*' -x '*/apps/*/l10n/*' \
-x'*/apps/*/tests/*' -x'*3rdparty/phpass/c/*'
- the documentation ('*/core/doc/*') change is irrelevant, since it’s
provided by owncloud-doc anyway (bug report follows);
- the localisation changes are filtered away too;
- the tests are not shipped (nor used at build time yet since they rely
on an installed ownCloud instance), and the removed phpass/c files
upstream were already removed from the binary Debian package.
The full Debian changelog entries follows. The changes are kept minimal
within the (debian/) packaging, here are the rationales:
* Restrict php-aws-sdk version
(php-aws-sdk 3 was recently uploaded to experimental, but is not
backward compatible withe the version 2. currently needed, as provided
in Jessie)
* Update documentation from Jessie+1 to Stretch
(Just clarifies the release names in README.Debian)
* Update upstream changelog
(Updates the date and adds an entry about security fixes)
* Refresh patches
(Just hunks)
* Drop new JSON and JavaScript translation sources
(The translation sources are not shipped in the binary package, this
changes makes sure this affirmation stays true).
owncloud (7.0.3+dfsg-1) unstable; urgency=medium
[ David Prévot ]
* Restrict php-aws-sdk version
* Update documentation from Jessie+1 to Stretch
* Update upstream changelog
[ Frank Karlitschek ]
* 7.0.3
[ Vincent Petry ]
* Convert StorageNotAvailableException to SabreDAV exception
[ Lukas Reschke ]
* Use proper array key
[ Thomas Müller ]
* Ensure there is a connection object within \OC_DB::enableCaching()
-- David Prévot <taffit@debian.org> Thu, 13 Nov 2014 13:49:51 -0400
owncloud (7.0.3~rc3+dfsg-1) unstable; urgency=medium
* Upload to unstable in order to gather as much testing as possible before
proposing the final version (to the release team) for Jessie
[ Jörn Friedrich Dreyer ]
* fix files_external storage id migration
* allow passing driver options, fixes #11718
* add driver options to config samples
[ Vincent Petry ]
* Properly register sharing hooks and proxies
* Check for cert bundle existence before using it
* Store curl error message directly
[ Frank Karlitschek ]
* 7.0.3 RC3
[ David Prévot ]
* Refresh patches
* Drop new JSON and JavaScript translation sources
-- David Prévot <taffit@debian.org> Fri, 07 Nov 2014 06:49:19 -0400
owncloud (7.0.3~rc2+dfsg-1) experimental; urgency=medium
* Upload to experimental not to prevent the migration of the previous
version into testing
[ Frank Karlitschek ]
* 7.0.3RC1
[ David Prévot ]
* Refresh patches
-- David Prévot <taffit@debian.org> Thu, 30 Oct 2014 15:36:06 -0400
unblock owncloud/7.0.3+dfsg-1
Thanks a lot in advance for considering.
Regards
David
P.-S.: $ debdiff ../owncloud_7.0.3{~rc2~20141023,}+dfsg-1_amd64.changes
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /usr/share/owncloud/apps/bookmarks/l10n/az.php
-rw-r--r-- root/root /usr/share/owncloud/apps/bookmarks/l10n/bn_IN.php
-rw-r--r-- root/root /usr/share/owncloud/apps/bookmarks/l10n/ta_IN.php
-rw-r--r-- root/root /usr/share/owncloud/lib/private/db/adaptermysql.php
-rw-r--r-- root/root /usr/share/owncloud/lib/private/db/sqlitesessioninit.php
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /usr/share/owncloud/apps/bookmarks/l10n/ja_JP.php
-rw-r--r-- root/root /usr/share/owncloud/apps/bookmarks/l10n/zh_CN.GB2312.php
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-26652-] {+26674+}
Recommends: exim4 | mail-transport-agent, [-php-aws-sdk,-] {+php-aws-sdk (<< 3),+} php-crypt-blowfish (>= 1.1.0~RC2-2~), php-dropbox, php-google-api-php-client (<< 1), php5-apcu | php5-xcache, php5-cli, php5-curl, php5-intl, php5-ldap, php5-mcrypt, smbclient
Version: [-7.0.3~rc2~20141023+dfsg-1-] {+7.0.3+dfsg-1+}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/3rdparty/phpass/c/crypt_private.c owncloud-7.0.3+dfsg/3rdparty/phpass/c/crypt_private.c
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/3rdparty/phpass/c/Makefile owncloud-7.0.3+dfsg/3rdparty/phpass/c/Makefile
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/lib/display.php owncloud-7.0.3+dfsg/apps/activity/lib/display.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/lib/display.php 2014-10-23 23:16:34.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/activity/lib/display.php 2014-11-10 12:18:22.000000000 -0400
@@ -57,7 +57,8 @@
unset($rootView);
// show a preview image if the file still exists
- if (!$is_dir && $exist) {
+ $mimetype = \OC_Helper::getFileNameMimeType($activity['file']);
+ if (!$is_dir && \OC::$server->getPreviewManager()->isMimeSupported($mimetype) && $exist) {
$tmpl->assign('previewLink', \OCP\Util::linkTo('files', 'index.php', array('dir' => dirname($activity['file']))));
$tmpl->assign('previewImageLink',
\OCP\Util::linkToRoute('core_ajax_preview', array(
@@ -66,9 +67,9 @@
'y' => 150,
))
);
- } else if ($exist) {
+ } else {
$tmpl->assign('previewLink', \OCP\Util::linkTo('files', 'index.php', array('dir' => $activity['file'])));
- $tmpl->assign('previewImageLink', \OC_Helper::mimetypeIcon('dir'));
+ $tmpl->assign('previewImageLink', \OC_Helper::mimetypeIcon($is_dir ? 'dir' : $mimetype));
$tmpl->assign('previewLinkIsDir', true);
}
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/lib/parameterhelper.php owncloud-7.0.3+dfsg/apps/activity/lib/parameterhelper.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/lib/parameterhelper.php 2014-10-23 23:16:34.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/activity/lib/parameterhelper.php 2014-11-10 12:18:22.000000000 -0400
@@ -153,14 +153,17 @@
$is_dir = $this->rootView->is_dir('/' . User::getUser() . '/files' . $param);
if ($is_dir) {
- $parent_dir = $param;
+ $fileLink = Util::linkTo('files', 'index.php', array('dir' => $param));
} else {
- $parent_dir = (substr_count($param, '/') == 1) ? '/' : dirname($param);
+ $parentDir = (substr_count($param, '/') == 1) ? '/' : dirname($param);
+ $fileName = basename($param);
+ $fileLink = Util::linkTo('files', 'index.php', array(
+ 'dir' => $parentDir,
+ 'scrollto' => $fileName,
+ ));
}
- $fileLink = Util::linkTo('files', 'index.php', array('dir' => $parent_dir));
$param = trim($param, '/');
-
list($path, $name) = $this->splitPathFromFilename($param);
if (!$stripPath || $path === '') {
if (!$highlightParams) {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/tests/datahelpertest.php owncloud-7.0.3+dfsg/apps/activity/tests/datahelpertest.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/activity/tests/parameterhelpertest.php owncloud-7.0.3+dfsg/apps/activity/tests/parameterhelpertest.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/ajax/import.php owncloud-7.0.3+dfsg/apps/bookmarks/ajax/import.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/ajax/import.php 2014-10-23 23:16:03.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/bookmarks/ajax/import.php 2014-11-10 12:17:49.000000000 -0400
@@ -1,7 +1,9 @@
<?php
-OCP\App::checkAppEnabled('bookmarks');
-
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+OCP\JSON::checkAppEnabled('bookmarks');
$l = new OC_l10n('bookmarks');
if(empty($_FILES)) {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/js/bookmarks.js owncloud-7.0.3+dfsg/apps/bookmarks/js/bookmarks.js
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/js/bookmarks.js 2014-10-23 23:16:03.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/bookmarks/js/bookmarks.js 2014-11-10 12:17:49.000000000 -0400
@@ -42,6 +42,14 @@
toggleSettings();
}
}
+
+function checkURL(url) {
+ if(url.substring(0, 3) === "htt") {
+ return url;
+ }
+ return "http://"+url;
+}
+
function toggleSettings() {
if( $('#bookmark_settings').hasClass('open')) { //Close
$('#bookmark_settings').switchClass( "open", "" );
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ach/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ach/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ady/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ady/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/af/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/af/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/af_ZA/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/af_ZA/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/af_ZA.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/af_ZA.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ak/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ak/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/am_ET/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/am_ET/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ar/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ar/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ar.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ar.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ar.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ar.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ar.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ar.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ast/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ast/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ast.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ast.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ast.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ast.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ast.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ast.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/az/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/az/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/az.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/az.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/az.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/az.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/az.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/az.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/be/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/be/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/be.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/be.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bg_BG/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bg_BG/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bg_BG.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bg_BG.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bg_BG.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bg_BG.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bg_BG.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bg_BG.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_BD/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_BD/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_BD.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_BD.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_BD.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_BD.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_BD.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_BD.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_IN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_IN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_IN.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_IN.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_IN.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_IN.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bn_IN.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bn_IN.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bs/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bs/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/bs.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/bs.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ca/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ca/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ca.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ca.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ca.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ca.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ca.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ca.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ca@valencia/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ca@valencia/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cs_CZ/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cs_CZ/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cs_CZ.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cs_CZ.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cs_CZ.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cs_CZ.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cs_CZ.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cs_CZ.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cy_GB/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cy_GB/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cy_GB.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cy_GB.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cy_GB.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cy_GB.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/cy_GB.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/cy_GB.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/da/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/da/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/da.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/da.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/da.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/da.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/da.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/da.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_AT/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_AT/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_AT.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_AT.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_CH/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_CH/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_CH.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_CH.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_CH.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_CH.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_CH.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_CH.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_DE/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_DE/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_DE.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_DE.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_DE.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_DE.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de_DE.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de_DE.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/de.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/de.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/el/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/el/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/el.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/el.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/el.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/el.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/el.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/el.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en_GB/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en_GB/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en_GB.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en_GB.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en_GB.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en_GB.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en_GB.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en_GB.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en_NZ/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en_NZ/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/en@pirate/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/en@pirate/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eo/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eo/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eo.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eo.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eo.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eo.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eo.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eo.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_AR/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_AR/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_AR.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_AR.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_AR.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_AR.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_AR.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_AR.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_BO/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_BO/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_CL/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_CL/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_CL.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_CL.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_CO/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_CO/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_CR/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_CR/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_EC/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_EC/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_MX/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_MX/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_MX.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_MX.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_MX.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_MX.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_MX.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_MX.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_PE/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_PE/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_PY/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_PY/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_US/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_US/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/es_UY/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/es_UY/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/et_EE/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/et_EE/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/et_EE.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/et_EE.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/et_EE.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/et_EE.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/et_EE.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/et_EE.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu_ES/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu_ES/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu_ES.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu_ES.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/eu.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/eu.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fa/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fa/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fa.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fa.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fa.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fa.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fa.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fa.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi_FI/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi_FI/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi_FI.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi_FI.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi_FI.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi_FI.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi_FI.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi_FI.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fi.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fi.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fr/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fr/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fr_CA/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fr_CA/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fr.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fr.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fr.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fr.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/fr.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/fr.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/gl/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/gl/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/gl.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/gl.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/gl.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/gl.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/gl.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/gl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/he/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/he/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/he.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/he.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/he.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/he.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/he.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/he.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hi/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hi/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hi_IN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hi_IN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hi.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hi.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hr/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hr/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hr.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hr.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hu_HU/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hu_HU/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hu_HU.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hu_HU.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hu_HU.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hu_HU.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hu_HU.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hu_HU.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hy/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hy/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/hy.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/hy.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ia/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ia/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ia.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ia.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ia.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ia.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ia.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ia.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/id/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/id/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/id.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/id.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/id.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/id.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/id.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/id.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/is/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/is/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/is.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/is.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/is.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/is.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/is.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/is.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/it/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/it/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/it.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/it.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/it.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/it.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/it.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/it.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ja/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ja/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ja_JP.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ja_JP.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ja.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ja.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ja.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ja.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ja.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ja.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/jv/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/jv/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/jv.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/jv.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ka/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ka/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ka_GE/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ka_GE/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ka_GE.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ka_GE.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ka_GE.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ka_GE.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ka_GE.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ka_GE.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/km/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/km/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/km.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/km.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/km.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/km.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/km.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/km.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/kn/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/kn/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ko/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ko/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ko.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ko.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ko.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ko.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ko.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ko.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ku_IQ/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ku_IQ/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ku_IQ.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ku_IQ.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/l10n.pl owncloud-7.0.3+dfsg/apps/bookmarks/l10n/l10n.pl
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lb/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lb/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lb.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lb.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lb.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lb.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lb.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lb.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lt_LT/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lt_LT/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lt_LT.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lt_LT.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lt_LT.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lt_LT.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lt_LT.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lt_LT.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lv/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lv/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lv.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lv.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lv.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lv.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/lv.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/lv.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/mk/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/mk/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/mk.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/mk.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/mk.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/mk.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/mk.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/mk.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ml/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ml/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ml_IN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ml_IN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/mn/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/mn/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ms_MY/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ms_MY/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ms_MY.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ms_MY.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/my_MM/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/my_MM/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/my_MM.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/my_MM.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nb_NO/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nb_NO/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nb_NO.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nb_NO.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nb_NO.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nb_NO.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nb_NO.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nb_NO.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nds/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nds/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ne/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ne/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nl/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nl/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nl.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nl.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nl.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nl.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nl.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nn_NO/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nn_NO/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nn_NO.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nn_NO.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nn_NO.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nn_NO.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nn_NO.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nn_NO.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/nqo/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/nqo/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/oc/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/oc/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/oc.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/oc.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/or_IN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/or_IN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pa/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pa/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pa.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pa.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl_PL/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl_PL/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pl_PL.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pl_PL.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_BR/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_BR/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_BR.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_BR.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_BR.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_BR.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_BR.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_BR.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_PT/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_PT/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_PT.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_PT.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_PT.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_PT.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/pt_PT.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/pt_PT.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ro/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ro/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ro.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ro.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ro.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ro.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ro.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ro.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru_RU/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru_RU/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ru_RU.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ru_RU.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/si_LK/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/si_LK/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/si_LK.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/si_LK.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/si_LK.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/si_LK.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/si_LK.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/si_LK.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk_SK/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk_SK/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk_SK.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk_SK.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk_SK.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk_SK.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sk_SK.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sk_SK.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sl/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sl/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sl.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sl.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sl.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sl.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sl.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sq/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sq/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sq.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sq.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr@latin/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr@latin/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr@latin.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr@latin.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sr.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sr.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/su/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/su/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sv/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sv/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sv.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sv.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sv.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sv.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sv.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sv.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/sw_KE/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/sw_KE/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_IN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_IN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_IN.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_IN.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_LK/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_LK/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_LK.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_LK.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_LK.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_LK.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ta_LK.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ta_LK.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/te/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/te/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/templates/bookmarks.pot owncloud-7.0.3+dfsg/apps/bookmarks/l10n/templates/bookmarks.pot
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/te.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/te.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/th_TH/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/th_TH/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/th_TH.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/th_TH.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/th_TH.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/th_TH.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/th_TH.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/th_TH.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/tr/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/tr/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/tr.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/tr.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/tr.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/tr.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/tr.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/tr.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/tzm/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/tzm/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ug/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ug/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ug.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ug.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ug.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ug.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ug.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ug.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/uk/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/uk/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/uk.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/uk.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/uk.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/uk.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/uk.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/uk.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ur/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ur/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ur_PK/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ur_PK/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/ur_PK.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/ur_PK.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/uz/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/uz/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/vi/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/vi/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/vi.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/vi.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/vi.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/vi.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/vi.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/vi.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN.GB2312/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN.GB2312/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN.GB2312.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN.GB2312.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_CN.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_CN.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_HK/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_HK/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_HK.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_HK.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_TW/bookmarks.po owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_TW/bookmarks.po
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_TW.js owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_TW.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_TW.json owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_TW.json
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/l10n/zh_TW.php owncloud-7.0.3+dfsg/apps/bookmarks/l10n/zh_TW.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/lib/bookmarks.php owncloud-7.0.3+dfsg/apps/bookmarks/lib/bookmarks.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/lib/bookmarks.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/bookmarks/lib/bookmarks.php 2014-11-10 12:17:49.000000000 -0400
@@ -28,8 +28,8 @@
/**
* @brief Finds all tags for bookmarks
* @param filterTags array of tag to look for if empty then every tag
- * @param offset result offset
- * @param limit number of item to return
+ * @param offset integer offset
+ * @param limit integer of item to return
*/
public static function findTags($filterTags = array(), $offset = 0, $limit = 10){
$params = array_merge($filterTags, $filterTags);
@@ -71,11 +71,11 @@
/**
* @brief Finds all bookmarks, matching the filter
- * @param offset result offset
- * @param sqlSortColumn sort result with this column
+ * @param offset integer offset
+ * @param sqlSortColumn string result with this column
* @param filters can be: empty -> no filter, a string -> filter this, a string array -> filter for all strings
- * @param filterTagOnly if true, filter affects only tags, else filter affects url, title and tags
- * @param limit number of item to return (default 10) if -1 or false then all item are returned
+ * @param filterTagOnly boolean true, filter affects only tags, else filter affects url, title and tags
+ * @param limit integer of item to return (default 10) if -1 or false then all item are returned
* @return void
*/
public static function findBookmarks($offset, $sqlSortColumn, $filters, $filterTagOnly, $limit = 10) {
@@ -88,9 +88,9 @@
$params=array(OCP\USER::getUser());
if($CONFIG_DBTYPE == 'pgsql') {
- $sql = "SELECT * FROM (SELECT *, (select array_to_string(array_agg(`tag`),'') from `*PREFIX*bookmarks_tags` where `bookmark_id` = `b`.`id`) as `tags`
- FROM `*PREFIX*bookmarks` `b`
- WHERE `user_id` = ? ) as `x` WHERE true ";
+ $sql = "SELECT * FROM (SELECT *, (select array_to_string(array_agg(`tag`),',') from `*PREFIX*bookmarks_tags` where `bookmark_id` = `b2`.`id`) as `tags`
+ FROM `*PREFIX*bookmarks` `b2`
+ WHERE `user_id` = ? ) as `b` WHERE true ";
}
else {
$sql = "SELECT *, (SELECT GROUP_CONCAT(`tag`) from `*PREFIX*bookmarks_tags` WHERE `bookmark_id` = `b`.`id`) as `tags`
@@ -371,22 +371,28 @@
/**
* Add a set of tags for a bookmark
- * @param int $bookmark_id The bookmark reference
+ *
+ * @param int $bookmarkId The bookmark reference
* @param array $tags Set of tags to add to the bookmark
* @return null
**/
- private static function addTags($bookmark_id, $tags) {
- $query = OCP\DB::prepare("
- INSERT INTO `*PREFIX*bookmarks_tags`
- (`bookmark_id`, `tag`)
- VALUES (?, ?)");
+ private static function addTags($bookmarkId, $tags) {
+ $sql = 'INSERT INTO `*PREFIX*bookmarks_tags` (`bookmark_id`, `tag`) select ?, ? ';
+ $dbtype = OCP\Config::getSystemValue( 'dbtype', 'sqlite' );
+ if ($dbtype === 'mysql') {
+ $sql .= 'from dual ';
+ }
+ $sql .= 'where not exists(select * from oc_bookmarks_tags where bookmark_id = ? and tag = ?)';
+
+ $query = OCP\DB::prepare($sql);
foreach ($tags as $tag) {
+ $tag = trim($tag);
if(empty($tag)) {
- //avoid saving blankspaces
+ //avoid saving white spaces
continue;
}
- $params = array($bookmark_id, trim($tag));
+ $params = array($bookmarkId, $tag, $bookmarkId, $tag);
$query->execute($params);
}
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/templates/js_tpl.php owncloud-7.0.3+dfsg/apps/bookmarks/templates/js_tpl.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/templates/js_tpl.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/bookmarks/templates/js_tpl.php 2014-11-10 12:17:49.000000000 -0400
@@ -7,7 +7,7 @@
</span>
</p>
<p class="bookmark_title">
- <a href="<&= encodeURI(url) &>" target="_blank" class="bookmark_link">
+ <a href="<&= checkURL(encodeURI(url)) &>" target="_blank" class="bookmark_link" rel="noreferrer">
<&= escapeHTML(title == '' ? encodeURI(url) : title ) &>
</a>
<span class="bookmark_edit bookmark_edit_btn">
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/templates/settings.php owncloud-7.0.3+dfsg/apps/bookmarks/templates/settings.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/templates/settings.php 2014-10-23 23:16:03.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/bookmarks/templates/settings.php 2014-11-10 12:17:49.000000000 -0400
@@ -5,6 +5,7 @@
* later.
* See the COPYING-README file.
*/
+/** @var array $_ */
?>
<fieldset class="personalblock">
@@ -14,6 +15,7 @@
<form id="import_bookmark" action="<?php print_unescaped(OCP\Util::linkTo( "bookmarks", "ajax/import.php" ));?>"
method="post" enctype="multipart/form-data">
+ <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>"/>
<fieldset class="personalblock">
<?php if(isset($_['error'])): ?>
<h3><?php p($_['error']['error']); ?></h3>
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/tests/bootstrap.php owncloud-7.0.3+dfsg/apps/bookmarks/tests/bootstrap.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/tests/lib_bookmark.php owncloud-7.0.3+dfsg/apps/bookmarks/tests/lib_bookmark.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/tests/lib_bookmark_test.php owncloud-7.0.3+dfsg/apps/bookmarks/tests/lib_bookmark_test.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/bookmarks/tests/phpunit.xml owncloud-7.0.3+dfsg/apps/bookmarks/tests/phpunit.xml
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/controller/groupcontroller.php owncloud-7.0.3+dfsg/apps/contacts/lib/controller/groupcontroller.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/controller/groupcontroller.php 2014-10-23 23:16:49.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/contacts/lib/controller/groupcontroller.php 2014-11-10 12:18:35.000000000 -0400
@@ -258,7 +258,7 @@
$response = new JSONResponse();
$params = $this->request->urlParams;
$categoryId = $params['categoryId'];
- $categoryname = $this->request->post['name'];
+ $categoryName = $this->request->post['name'];
$ids = $this->request->post['contactIds'];
//$response->debug('request: '.print_r($this->request->post, true));
@@ -305,7 +305,7 @@
return $response;
}
- if ($obj->removeFromGroup($categoryname)) {
+ if ($obj->removeFromGroup($categoryName)) {
$backend->updateContact(null, $contactId, $obj, array('noCollection' => true));
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/hooks.php owncloud-7.0.3+dfsg/apps/contacts/lib/hooks.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/hooks.php 2014-10-23 23:16:49.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/contacts/lib/hooks.php 2014-11-10 12:18:04.000000000 -0400
@@ -204,7 +204,7 @@
}
$offset += $limit;
}
- $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*contacts_cards_properties`
+ $stmt = \OCP\DB::prepare('DELETE FROM `*PREFIX*contacts_cards_properties`
WHERE NOT EXISTS(SELECT NULL
FROM `*PREFIX*contacts_cards`
WHERE `*PREFIX*contacts_cards`.id = `*PREFIX*contacts_cards_properties`.contactid)');
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/utils/properties.php owncloud-7.0.3+dfsg/apps/contacts/lib/utils/properties.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/contacts/lib/utils/properties.php 2014-10-23 23:16:49.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/contacts/lib/utils/properties.php 2014-11-10 12:18:04.000000000 -0400
@@ -333,7 +333,6 @@
// Cache as base64 for around a month
$cache->set($key, strval($image), 3000000);
- \OCP\Util::writeLog('contacts', 'Caching ' . $key, \OCP\Util::DEBUG);
return $cache->get($key);
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/ajax/admin.php owncloud-7.0.3+dfsg/apps/documents/ajax/admin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/ajax/admin.php 2014-10-23 23:16:20.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/documents/ajax/admin.php 2014-11-10 12:18:36.000000000 -0400
@@ -16,7 +16,9 @@
Config::setConverterUrl($url);
}
- if (Config::getConverter()!='local'){
+ $currentConverter = Config::getConverter();
+ //echo $currentConverter;
+ if ($currentConverter == 'external'){
if (!Converter::checkConnection()){
Helper::warnLog('Bad response from Format Filter Server');
\OCP\JSON::error(array( 'data'=>
@@ -24,7 +26,7 @@
));
exit();
}
- } else {
+ } elseif ($currentConverter == 'local'){
$targetFilter = 'odt:writer8';
$targetExtension = 'odt';
$input = '0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAOwADAP7/CQAGAAAAAAAAAAAAAAABAAAAKQAAAAAAAAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9//////////7///8hAAAABQAAAAYAAAAHAAAACAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUAAAAWAAAAFwAAABgAAAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAAIAAAAP7///8iAAAAIwAAACQAAAAlAAAAJgAAACcAAAAoAAAA/v///yoAAAD+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////1IAbwBvAHQAIABFAG4AdAByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAUA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAQAAAP7////+////BAAAAAUAAAAGAAAABwAAAAgAAAD+////CgAAAAsAAAAMAAAADQAAAA4AAAAPAAAAEAAAABEAAAASAAAAEwAAABQAAAAVAAAAFgAAABcAAAAYAAAAGQAAABoAAAAbAAAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAkAAAAJQAAACYAAAAnAAAAKAAAACkAAAAqAAAAKwAAACwAAAAtAAAALgAAAC8AAAAwAAAAMQAAADIAAAAzAAAANAAAADUAAAA2AAAANwAAADgAAAA5AAAAOgAAADsAAAA8AAAAPQAAAD4AAAA/AAAAQAAAAEEAAABCAAAAQwAAAP7///9FAAAA/v////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8BAP7/AwoAAP////8GCQIAAAAAAMAAAAAAAABGGAAAAE1pY3Jvc29mdCBXb3JkLURva3VtZW50AAoAAABNU1dvcmREb2MAEAAAAFdvcmQuRG9jdW1lbnQuOAD0ObJxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/wAAAQACAAAAAAAAAAAAAAAAAAAAAAABAAAA4IWf8vlPaBCrkQgAKyez2TAAAAAUAQAACQAAAAEAAABQAAAAAgAAAFgAAAAEAAAAvAAAAAgAAADIAAAACQAAANgAAAAKAAAA5AAAAAsAAADwAAAADAAAAPwAAAANAAAACAEAAAIAAADp/QAAHgAAAFwAAADQkNCy0YLQvtC80LDRgtC40LfQuNGA0L7QstCw0L3QvdCw0Y8g0LHQsNC90LrQvtCy0YHQutCw0Y8g0YHQuNGB0YLQtdC80LAgwqvQodCiLdCR0LDQvdC6wrsgAB4AAAADAAAAUEMAAB4AAAAHAAAAZnN2Y3h2AAAeAAAAAgAAADMAAABAAAAAAAAAAAAAAABAAAAAABzeaCTYywFAAAAAABzXRbJzzAFAAAAAwJREgxIAigAKAAEAWwAPAAIAAAAAAAAAegAAEPH/AgB6AAAABgBOAG8AcgBtAGEAbAAAACwAAAASZGgBAQADJANhJAMxJABehAAAXYQAAGCExQJBJAAqJAE3JAE1JAEzJAEvAEIqAE9KBABRSgQAQ0oYAG1IGQRzSBkEUEoEAF5KBABhShQAX0gBBG5IBAh0SAQIACoAARABAAIAKgAAAAkASABlAGEAZABpAG4AZwAgADEAAAACAAEABABDSiAAQAACEAEAAgBAAAAACQBIAGUAYQBkAGkAbgBnACAAMgAAABMAAgBAJgEKJgELRgEACiYBC0YBAAAIAENKHABhShwAOAADEAEAAgA4AAAACQBIAGUAYQBkAGkAbgBnACAAMwAAABMAAwBAJgIKJgILRgEACiYCC0YBAAAAAEgABBABAAIASAAAAAkASABlAGEAZABpAG4AZwAgADQAAAAcAAQAQCYDCiYDC0YBAAomAwtGAQADJAFhJAEGJAEIAENKJABLSAEAUAAFEAEAAgBQAAAACQBIAGUAYQBkAGkAbgBnACAANQAAABcABQADJAFhJAFehAAAXYQAAGCEAAAGJAEAEwBPSgUAUUoFAENKIAA1CAFeSgUAADoABhABAAIAOgAAAAkASABlAGEAZABpAG4AZwAgADYAAAARAA
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/appinfo/app.php owncloud-7.0.3+dfsg/apps/documents/appinfo/app.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/appinfo/app.php 2014-10-23 23:16:49.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/documents/appinfo/app.php 2014-11-10 12:18:36.000000000 -0400
@@ -42,6 +42,7 @@
//Script for registering file actions
OCP\Util::addScript('documents', 'viewer/viewer');
+if (OCA\Documents\Config::getConverter() !== 'off'){
$docFilter = new OCA\Documents\Filter\Office(
array(
'read' =>
@@ -75,6 +76,7 @@
)
)
);
+}
//Listen to delete file signal
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Documents\Storage", "onDelete");
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/js/admin.js owncloud-7.0.3+dfsg/apps/documents/js/admin.js
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/js/admin.js 2014-10-23 23:16:20.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/documents/js/admin.js 2014-11-10 12:18:09.000000000 -0400
@@ -9,7 +9,7 @@
converter : $('[name="docs_converter"]:checked').val()
};
- if (data.converter !== 'local'){
+ if (data.converter === 'external'){
data.url = $('#docs_url').val();
}
@@ -27,8 +27,8 @@
}
};
- $('#docs_converter_external, #docs_converter_local').on('click', function(){
- $('#docs_extra').toggle($('[name="docs_converter"]:checked').val() !== 'local');
+ $('#docs_converter_external, #docs_converter_local, #docs_converter_off').on('click', function(){
+ $('#docs_extra').toggle($('[name="docs_converter"]:checked').val() === 'external');
});
$('#docs_apply').on('click', documentsSettings.save);
});
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/lib/config.php owncloud-7.0.3+dfsg/apps/documents/lib/config.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/lib/config.php 2014-10-23 23:16:20.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/documents/lib/config.php 2014-11-10 12:18:36.000000000 -0400
@@ -20,7 +20,7 @@
}
public static function getConverter(){
- return self::getAppValue('converter', 'local');
+ return self::getAppValue('converter', 'off');
}
public static function setConverter($value){
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/templates/admin.php owncloud-7.0.3+dfsg/apps/documents/templates/admin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/documents/templates/admin.php 2014-10-23 23:16:20.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/documents/templates/admin.php 2014-11-10 12:18:36.000000000 -0400
@@ -1,22 +1,26 @@
-<?php $isLocal = $_['converter']=='local' ?>
<div class="section" id="documents">
<h2><?php p($l->t('Documents')) ?></h2>
<p><?php p($l->t('MS Word support (requires openOffice/libreOffice)')) ?></p>
<p>
<input type="radio" name="docs_converter" value="local" id="docs_converter_local"
- <?php print_unescaped($isLocal ? 'checked="checked"' : '') ?>
+ <?php print_unescaped($_['converter']=='local' ? 'checked="checked"' : '') ?>
/>
<label for="docs_converter_local"><?php p($l->t('Local')) ?></label><br>
<em><?php p($l->t('openOffice/libreOffice is installed on this server. Path to binary is provided via preview_libreoffice_path in config.php')) ?></em>
</p>
<p>
<input type="radio" name="docs_converter" value="external" id="docs_converter_external"
- <?php print_unescaped(!$isLocal ? 'checked="checked"' : '') ?>
- />
+ <?php print_unescaped($_['converter']=='external' ? 'checked="checked"' : '') ?>
<label for="docs_converter_external"><?php p($l->t('External')) ?></label><br>
<em><?php p($l->t('openOffice/libreOffice is installed on external server running a format filter server')) ?></em>
</p>
- <div id="docs_extra" <?php print_unescaped($isLocal ? 'style="display:none"' : '') ?>>
+ <p>
+ <input type="radio" name="docs_converter" value="off" id="docs_converter_off"
+ <?php print_unescaped($_['converter']=='off' ? 'checked="checked"' : '') ?> />
+ <label for="docs_converter_off"><?php p($l->t('Disabled')) ?></label><br>
+ <em><?php p($l->t('No MS Word support')) ?></em>
+ </p>
+ <div id="docs_extra" <?php print_unescaped($_['converter']!=='external' ? 'style="display:none"' : '') ?>>
<input type="text" name="docs_url" id="docs_url"
value="<?php p($_['converter_url'])?>"
original-title="<?php p($l->t('scheme://domain.tld[:port]')) ?>"
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files/tests/js/filelistSpec.js owncloud-7.0.3+dfsg/apps/files/tests/js/filelistSpec.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_encryption/ajax/updatePrivateKeyPassword.php owncloud-7.0.3+dfsg/apps/files_encryption/ajax/updatePrivateKeyPassword.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_encryption/ajax/updatePrivateKeyPassword.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_encryption/ajax/updatePrivateKeyPassword.php 2014-11-10 12:18:34.000000000 -0400
@@ -18,6 +18,7 @@
$l = OC_L10N::get('core');
$return = false;
+$errorMessage = $l->t('Could not update the private key password.');
$oldPassword = $_POST['oldPassword'];
$newPassword = $_POST['newPassword'];
@@ -26,6 +27,11 @@
$session = new \OCA\Encryption\Session($view);
$user = \OCP\User::getUser();
+// check new password
+$passwordCorrect = \OCP\User::checkPassword($user, $newPassword);
+
+if ($passwordCorrect !== false) {
+
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -42,14 +48,22 @@
$session->setPrivateKey($decryptedKey);
$return = true;
}
+ } else {
+ $result = false;
+ $errorMessage = $l->t('The old password was not correct, please try again.');
}
\OC_FileProxy::$enabled = $proxyStatus;
+} else {
+ $result = false;
+ $errorMessage = $l->t('The current log-in password was not correct, please try again.');
+}
+
// success or failure
if ($return) {
$session->setInitialized(\OCA\Encryption\Session::INIT_SUCCESSFUL);
\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
} else {
- \OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
+ \OCP\JSON::error(array('data' => array('message' => $errorMessage)));
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_encryption/hooks/hooks.php owncloud-7.0.3+dfsg/apps/files_encryption/hooks/hooks.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_encryption/hooks/hooks.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_encryption/hooks/hooks.php 2014-11-10 12:18:34.000000000 -0400
@@ -423,34 +423,18 @@
* @param array $params with the old path and the new path
*/
public static function preRename($params) {
- $user = \OCP\User::getUser();
- $view = new \OC\Files\View('/');
- $util = new Util($view, $user);
- list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
-
- // we only need to rename the keys if the rename happens on the same mountpoint
- // otherwise we perform a stream copy, so we get a new set of keys
- $mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
- $mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
-
- $type = $view->is_dir('/' . $user . '/files/' . $params['oldpath']) ? 'folder' : 'file';
-
- if ($mp1 === $mp2) {
- self::$renamedFiles[$params['oldpath']] = array(
- 'uid' => $ownerOld,
- 'path' => $pathOld,
- 'type' => $type,
- 'operation' => 'rename',
- );
-
- }
+ self::preRenameOrCopy($params, 'rename');
}
/**
- * mark file as renamed so that we know the original source after the file was renamed
+ * mark file as copied so that we know the original source after the file was copied
* @param array $params with the old path and the new path
*/
public static function preCopy($params) {
+ self::preRenameOrCopy($params, 'copy');
+ }
+
+ private static function preRenameOrCopy($params, $operation) {
$user = \OCP\User::getUser();
$view = new \OC\Files\View('/');
$util = new Util($view, $user);
@@ -464,11 +448,27 @@
$type = $view->is_dir('/' . $user . '/files/' . $params['oldpath']) ? 'folder' : 'file';
if ($mp1 === $mp2) {
+ if ($util->isSystemWideMountPoint($pathOld)) {
+ $oldShareKeyPath = 'files_encryption/share-keys/' . $pathOld;
+ } else {
+ $oldShareKeyPath = $ownerOld . '/' . 'files_encryption/share-keys/' . $pathOld;
+ }
+ // gather share keys here because in postRename() the file will be moved already
+ $oldShareKeys = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
+ if (count($oldShareKeys) === 0) {
+ \OC_Log::write(
+ 'Encryption library', 'No share keys found for "' . $pathOld . '"',
+ \OC_Log::WARN
+ );
+ }
self::$renamedFiles[$params['oldpath']] = array(
'uid' => $ownerOld,
'path' => $pathOld,
'type' => $type,
- 'operation' => 'copy');
+ 'operation' => $operation,
+ 'sharekeys' => $oldShareKeys
+ );
+
}
}
@@ -490,6 +490,7 @@
$view = new \OC\Files\View('/');
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
+ $oldShareKeys = null;
if (isset(self::$renamedFiles[$params['oldpath']]['uid']) &&
isset(self::$renamedFiles[$params['oldpath']]['path'])) {
@@ -497,6 +498,7 @@
$pathOld = self::$renamedFiles[$params['oldpath']]['path'];
$type = self::$renamedFiles[$params['oldpath']]['type'];
$operation = self::$renamedFiles[$params['oldpath']]['operation'];
+ $oldShareKeys = self::$renamedFiles[$params['oldpath']]['sharekeys'];
unset(self::$renamedFiles[$params['oldpath']]);
} else {
\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
@@ -536,15 +538,7 @@
$oldKeyfilePath .= '.key';
$newKeyfilePath .= '.key';
- // handle share-keys
- $matches = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
- if (count($matches) === 0) {
- \OC_Log::write(
- 'Encryption library', 'No share keys found for "' . $pathOld . '"',
- \OC_Log::WARN
- );
- }
- foreach ($matches as $src) {
+ foreach ($oldShareKeys as $src) {
$dst = \OC\Files\Filesystem::normalizePath(str_replace($pathOld, $pathNew, $src));
$view->$operation($src, $dst);
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_encryption/tests/share.php owncloud-7.0.3+dfsg/apps/files_encryption/tests/share.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_external/lib/amazons3.php owncloud-7.0.3+dfsg/apps/files_external/lib/amazons3.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_external/lib/amazons3.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_external/lib/amazons3.php 2014-11-10 12:18:34.000000000 -0400
@@ -123,12 +123,29 @@
* @param array $params
*/
public function updateLegacyId (array $params) {
+ $oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+
+ // find by old id or bucket
+ $stmt = \OC::$server->getDatabaseConnection()->prepare(
+ 'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
+ );
+ $stmt->execute(array($oldId, $this->id));
+ while ($row = $stmt->fetch()) {
+ $storages[$row['id']] = $row['numeric_id'];
+ }
+
+ if (isset($storages[$this->id]) && isset($storages[$oldId])) {
+ // if both ids exist, delete the old storage and corresponding filecache entries
+ \OC\Files\Cache\Storage::remove($oldId);
+ } else if (isset($storages[$oldId])) {
+ // if only the old id exists do an update
$stmt = \OC::$server->getDatabaseConnection()->prepare(
'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
);
- $oldId = 'amazon::' . $params['key'] . md5($params['secret']);
$stmt->execute(array($this->id, $oldId));
}
+ // only the bucket based id may exist, do nothing
+ }
/**
* Remove a file or folder
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_external/tests/amazons3migration.php owncloud-7.0.3+dfsg/apps/files_external/tests/amazons3migration.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/lib/external/storage.php owncloud-7.0.3+dfsg/apps/files_sharing/lib/external/storage.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/lib/external/storage.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_sharing/lib/external/storage.php 2014-11-10 12:18:34.000000000 -0400
@@ -193,12 +193,18 @@
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
$path = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt';
+ if (is_readable($path)) {
curl_setopt($ch, CURLOPT_CAINFO, $path);
+ }
$result = curl_exec($ch);
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ $errorMessage = curl_error($ch);
curl_close($ch);
+ if (!empty($errorMessage)) {
+ throw new \Exception($errorMessage);
+ }
switch ($status) {
case 401:
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/lib/sharedstorage.php owncloud-7.0.3+dfsg/apps/files_sharing/lib/sharedstorage.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/lib/sharedstorage.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_sharing/lib/sharedstorage.php 2014-11-10 12:18:34.000000000 -0400
@@ -300,7 +300,7 @@
$pathinfo = pathinfo($relPath1);
// for part files we need to ask for the owner and path from the parent directory because
// the file cache doesn't return any results for part files
- if ($pathinfo['extension'] === 'part') {
+ if (isset($pathinfo['extension']) && $pathinfo['extension'] === 'part') {
list($user1, $path1) = \OCA\Files_Sharing\Helper::getUidAndFilename($pathinfo['dirname']);
$path1 = $path1 . '/' . $pathinfo['basename'];
} else {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/templates/settings-admin.php owncloud-7.0.3+dfsg/apps/files_sharing/templates/settings-admin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_sharing/templates/settings-admin.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_sharing/templates/settings-admin.php 2014-11-10 12:17:24.000000000 -0400
@@ -1,13 +1,21 @@
+<?php
+/** @var OC_L10N $l */
+/** @var array $_ */
+?>
<div class="section" id="fileSharingSettings" >
- <h2><?php p($l->t('Remote Shares'));?></h2>
+ <h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled"
value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
- <label for="outgoingServer2serverShareEnabled"><?php p($l->t('Allow other instances to mount public links shared from this server'));?></label><br/>
+ <label for="outgoingServer2serverShareEnabled">
+ <?php p($l->t('Allow users on this server to send shares to other servers'));?>
+ </label><br/>
<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled"
value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
- <label for="incomingServer2serverShareEnabled"><?php p($l->t('Allow users to mount public link shares'));?></label><br/>
+ <label for="incomingServer2serverShareEnabled">
+ <?php p($l->t('Allow users on this server to receive shares from other servers'));?>
+ </label><br/>
</div>
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_trashbin/lib/trashbin.php owncloud-7.0.3+dfsg/apps/files_trashbin/lib/trashbin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_trashbin/lib/trashbin.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_trashbin/lib/trashbin.php 2014-11-10 12:18:34.000000000 -0400
@@ -886,7 +886,7 @@
//force rescan of versions, local storage may not have updated the cache
/** @var \OC\Files\Storage\Storage $storage */
list($storage, ) = $view->resolvePath('/');
- $storage->getScanner()->scan('');
+ $storage->getScanner()->scan('files_trashbin');
if ($timestamp) {
// fetch for old versions
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_versions/lib/hooks.php owncloud-7.0.3+dfsg/apps/files_versions/lib/hooks.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_versions/lib/hooks.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_versions/lib/hooks.php 2014-11-10 12:17:24.000000000 -0400
@@ -16,12 +16,14 @@
public static function connectHooks() {
// Listen to write signals
- \OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
+ \OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
// Listen to delete and rename signals
- \OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook");
- \OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Versions\Hooks", "pre_remove_hook");
- \OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook");
- \OCP\Util::connectHook('OC_Filesystem', 'copy', "OCA\Files_Versions\Hooks", "copy_hook");
+ \OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
+ \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
+ \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+ \OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
}
/**
@@ -102,4 +104,35 @@
}
}
+ /**
+ * Remember owner and the owner path of the source file.
+ * If the file already exists, then it was a upload of a existing file
+ * over the web interface and we call Storage::store() directly
+ *
+ * @param array $params array with oldpath and newpath
+ *
+ */
+ public static function pre_renameOrCopy_hook($params) {
+ if (\OCP\App::isEnabled('files_versions')) {
+
+ // if we rename a movable mount point, then the versions don't have
+ // to be renamed
+ $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+ $manager = \OC\Files\Filesystem::getMountManager();
+ $mount = $manager->find($absOldPath);
+ $internalPath = $mount->getInternalPath($absOldPath);
+ if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+ return;
+ }
+
+ $view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+ if ($view->file_exists($params['newpath'])) {
+ Storage::store($params['newpath']);
+ } else {
+ Storage::setSourcePathAndUser($params['oldpath']);
+ }
+
+ }
+ }
+
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_versions/lib/versions.php owncloud-7.0.3+dfsg/apps/files_versions/lib/versions.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/files_versions/lib/versions.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/files_versions/lib/versions.php 2014-11-10 12:17:24.000000000 -0400
@@ -24,6 +24,8 @@
// files for which we can remove the versions after the delete operation was successful
private static $deletedFiles = array();
+ private static $sourcePathAndUser = array();
+
private static $max_versions_per_interval = array(
//first 10sec, one version every 2sec
1 => array('intervalEndsAfter' => 10, 'step' => 2),
@@ -51,6 +53,34 @@
}
/**
+ * Remember the owner and the owner path of the source file
+ *
+ * @param string $source source path
+ */
+ public static function setSourcePathAndUser($source) {
+ list($uid, $path) = self::getUidAndFilename($source);
+ self::$sourcePathAndUser[$source] = array('uid' => $uid, 'path' => $path);
+ }
+
+ /**
+ * Gets the owner and the owner path from the source path
+ *
+ * @param string $source source path
+ * @return array with user id and path
+ */
+ public static function getSourcePathAndUser($source) {
+
+ if (isset(self::$sourcePathAndUser[$source])) {
+ $uid = self::$sourcePathAndUser[$source]['uid'];
+ $path = self::$sourcePathAndUser[$source]['path'];
+ unset(self::$sourcePathAndUser[$source]);
+ } else {
+ $uid = $path = false;
+ }
+ return array($uid, $path);
+ }
+
+ /**
* get current size of all versions from a given user
*
* @param string $user user who owns the versions
@@ -180,16 +210,20 @@
* @param string $operation can be 'copy' or 'rename'
*/
public static function renameOrCopy($old_path, $new_path, $operation) {
- list($uid, $oldpath) = self::getUidAndFilename($old_path);
+ list($uid, $oldpath) = self::getSourcePathAndUser($old_path);
+
+ // it was a upload of a existing file if no old path exists
+ // in this case the pre-hook already called the store method and we can
+ // stop here
+ if ($oldpath === false) {
+ return true;
+ }
+
list($uidn, $newpath) = self::getUidAndFilename($new_path);
$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
$files_view = new \OC\Files\View('/'.$uid .'/files');
- // if the file already exists than it was a upload of a existing file
- // over the web interface -> store() is the right function we need here
- if ($files_view->file_exists($newpath)) {
- return self::store($new_path);
- }
+
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->$operation($oldpath, $newpath);
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/files_versions/tests/versions.php owncloud-7.0.3+dfsg/apps/files_versions/tests/versions.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/gallery/js/slideshow.js owncloud-7.0.3+dfsg/apps/gallery/js/slideshow.js
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/gallery/js/slideshow.js 2014-10-23 23:16:49.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/gallery/js/slideshow.js 2014-11-10 12:18:36.000000000 -0400
@@ -6,7 +6,8 @@
settings = jQuery.extend({
'interval': 5000,
'play' : false,
- 'maxScale': 2
+ 'maxScale': 2,
+ 'fallBacks': []
}, options);
var slideShow = $('#slideshow');
if (settings.play){
@@ -30,9 +31,10 @@
}
container.children('img').remove();
container.show();
+ jQuery.fn.slideShow.fallBacks = settings.fallBacks;
jQuery.fn.slideShow.images = images;
jQuery.fn.slideShow.cache = [];
- jQuery.fn.slideShow.showImage(images[start], images[start + 1]);
+ jQuery.fn.slideShow.showImage(images[start], images[start + 1], settings.fallBacks[start], settings.fallBacks[start + 1]);
jQuery.fn.slideShow.progressBar = container.find('.progress');
// hide arrows and play/pause when only one pic
@@ -45,7 +47,10 @@
}
jQuery(window).resize(function () {
- jQuery.fn.slideShow.loadImage(jQuery.fn.slideShow.images[jQuery.fn.slideShow.current]).then(function (image) {
+ jQuery.fn.slideShow.loadImage(
+ jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
+ jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current]
+ ).then(function (image) {
jQuery.fn.slideShow.fitImage(container, image);
});
});
@@ -54,7 +59,8 @@
jQuery.fn.slideShow.progressBar = null;
-jQuery.fn.slideShow.loadImage = function (url) {
+jQuery.fn.slideShow.loadImage = function (url, fallBack) {
+ console.log(fallBack);
if (!jQuery.fn.slideShow.cache[url]) {
jQuery.fn.slideShow.cache[url] = new jQuery.Deferred();
var image = new Image();
@@ -72,7 +78,11 @@
}
};
image.onerror = function () {
- if (jQuery.fn.slideShow.cache[url]) {
+ if (fallBack) {
+ jQuery.fn.slideShow.loadImage(fallBack).then(function (image) {
+ jQuery.fn.slideShow.cache[url].resolve(image);
+ });
+ } else if (jQuery.fn.slideShow.cache[url]) {
jQuery.fn.slideShow.cache[url].reject(url);
}
};
@@ -113,11 +123,14 @@
});
};
-jQuery.fn.slideShow.showImage = function (url, preloadUrl) {
+jQuery.fn.slideShow.showImage = function (url, preloadUrl, fallBack, preloadFallBack) {
var container = jQuery.fn.slideShow.container;
container.css('background-position', 'center');
- jQuery.fn.slideShow.loadImage(url).then(function (image) {
+ jQuery.fn.slideShow.loadImage(
+ url,
+ fallBack
+ ).then(function (image) {
container.css('background-position', '-10000px 0');
if (url === jQuery.fn.slideShow.images[jQuery.fn.slideShow.current]) {
container.children('img').remove();
@@ -127,7 +140,10 @@
jQuery.fn.slideShow.setTimeout();
}
if (preloadUrl) {
- jQuery.fn.slideShow.loadImage(preloadUrl);
+ jQuery.fn.slideShow.loadImage(
+ fallBack,
+ preloadFallBack
+ );
}
}
});
@@ -171,8 +187,10 @@
jQuery.fn.slideShow.current = 0;
}
var image = jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
- nextImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length];
- jQuery.fn.slideShow.showImage(image, nextImage);
+ nextImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length],
+ fallBack= jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current],
+ nextFallBack = jQuery.fn.slideShow.fallBacks[(jQuery.fn.slideShow.current + 1) % jQuery.fn.slideShow.images.length];
+ jQuery.fn.slideShow.showImage(image, nextImage, fallBack, nextFallBack);
}
};
@@ -183,8 +201,10 @@
jQuery.fn.slideShow.current = jQuery.fn.slideShow.images.length - 1;
}
var image = jQuery.fn.slideShow.images[jQuery.fn.slideShow.current],
- previousImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length];
- jQuery.fn.slideShow.showImage(image, previousImage);
+ previousImage = jQuery.fn.slideShow.images[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length],
+ fallBack = jQuery.fn.slideShow.fallBacks[jQuery.fn.slideShow.current],
+ previousFallBack = jQuery.fn.slideShow.fallBacks[(jQuery.fn.slideShow.current - 1 + jQuery.fn.slideShow.images.length) % jQuery.fn.slideShow.images.length];
+ jQuery.fn.slideShow.showImage(image, previousImage, fallBack, previousFallBack);
}
};
@@ -347,20 +367,21 @@
var user = OC.currentUser;
var width = $(document).width() * window.devicePixelRatio;
var height = $(document).height() * window.devicePixelRatio;
+ var fallBacks = [];
for (var i = 0; i < files.length; i++) {
var file = files[i];
if (file.mimetype && file.mimetype.indexOf('image') >= 0) {
if (file.mimetype === 'image/svg+xml') {
imageUrl = OCA.Files.Files.getDownloadUrl(file.name, dir);
} else {
- var imageUrl = OC.generateUrl('/core/preview.png?file={file}&x={x}&y={y}&a=true&scalingup=0', {
+ var imageUrl = OC.generateUrl('/core/preview.png?file={file}&x={x}&y={y}&a=true&scalingup=0&forceIcon=0', {
x: width,
y: height,
file: encodeURIComponent(dir + file.name)
});
if (!user) {
imageUrl = OC.generateUrl(
- '/apps/files_sharing/publicpreview?file={file}&x={x}&y={y}&a=true&t={t}&scalingup=0', {
+ '/apps/files_sharing/publicpreview?file={file}&x={x}&y={y}&a=true&t={t}&scalingup=0&forceIcon=0', {
file: encodeURIComponent(dir + file.name),
x: width,
y: height,
@@ -374,6 +395,7 @@
// use gallery URL instead of download URL
imageUrl: imageUrl
});
+ fallBacks.push(OCA.Files.Files.getDownloadUrl(file.name, dir));
}
}
for (i = 0; i < images.length; i++) {
@@ -381,7 +403,7 @@
start = i;
}
}
- jQuery.fn.slideShow.call(images, $('#slideshow'), start);
+ jQuery.fn.slideShow.call(images, $('#slideshow'), start, {fallBacks: fallBacks});
});
OCA.Files.fileActions.setDefault('image', 'View');
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/templateeditor/templates/settings-admin.php owncloud-7.0.3+dfsg/apps/templateeditor/templates/settings-admin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/templateeditor/templates/settings-admin.php 2014-10-23 23:16:35.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/templateeditor/templates/settings-admin.php 2014-11-10 12:18:23.000000000 -0400
@@ -1,6 +1,6 @@
<div class="section" id="mailTemplateSettings" >
- <h2><?php p($l->t('Mail templates'));?></h2>
+ <h2><?php p($l->t('Mail Templates'));?></h2>
<div class="actions">
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/user_ldap/js/experiencedAdmin.js owncloud-7.0.3+dfsg/apps/user_ldap/js/experiencedAdmin.js
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/user_ldap/js/experiencedAdmin.js 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/user_ldap/js/experiencedAdmin.js 2014-11-10 12:17:24.000000000 -0400
@@ -50,17 +50,9 @@
* switches all LDAP filters from Assisted to Raw mode.
*/
ExperiencedAdmin.prototype.enableRawMode = function() {
- var containers = {
- 'toggleRawGroupFilter': '#rawGroupFilterContainer',
- 'toggleRawLoginFilter': '#rawLoginFilterContainer',
- 'toggleRawUserFilter' : '#rawUserFilterContainer'
- };
-
- for(var method in containers) {
- if($(containers[method]).hasClass('invisible')) {
- this.wizard[method]();
- }
- }
+ LdapWizard._save({id: 'ldapGroupFilterMode'}, LdapWizard.filterModeRaw);
+ LdapWizard._save({id: 'ldapUserFilterMode' }, LdapWizard.filterModeRaw);
+ LdapWizard._save({id: 'ldapLoginFilterMode'}, LdapWizard.filterModeRaw);
};
ExperiencedAdmin.prototype.updateUserTab = function(mode) {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/apps/user_ldap/js/settings.js owncloud-7.0.3+dfsg/apps/user_ldap/js/settings.js
--- owncloud-7.0.3~rc2~20141023+dfsg/apps/user_ldap/js/settings.js 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/apps/user_ldap/js/settings.js 2014-11-10 12:17:24.000000000 -0400
@@ -838,9 +838,10 @@
}
},
- onToggleRawFilterConfirmation: function(currentMode, callback) {
+ onToggleRawFilterConfirmation: function(currentMode, isRawVisible, callback) {
if(!LdapWizard.admin.isExperienced()
|| currentMode === LdapWizard.filterModeAssisted
+ || (LdapWizard.admin.isExperienced() && !isRawVisible)
) {
return callback(true);
}
@@ -855,6 +856,7 @@
toggleRawGroupFilter: function() {
LdapWizard.onToggleRawFilterConfirmation(
LdapWizard.groupFilter.getMode(),
+ !$('#rawGroupFilterContainer').hasClass('invisible'),
function(confirmed) {
if(confirmed !== true) {
return;
@@ -875,6 +877,7 @@
toggleRawLoginFilter: function() {
LdapWizard.onToggleRawFilterConfirmation(
LdapWizard.loginFilter.getMode(),
+ !$('#rawLoginFilterContainer').hasClass('invisible'),
function(confirmed) {
if(confirmed !== true) {
return;
@@ -909,6 +912,7 @@
toggleRawUserFilter: function() {
LdapWizard.onToggleRawFilterConfirmation(
LdapWizard.userFilter.getMode(),
+ !$('#rawUserFilterContainer').hasClass('invisible'),
function(confirmed) {
if(confirmed === true) {
LdapWizard.blacklistRemove('ldap_userlist_filter');
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/config/config.sample.php owncloud-7.0.3+dfsg/config/config.sample.php
--- owncloud-7.0.3~rc2~20141023+dfsg/config/config.sample.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/config/config.sample.php 2014-11-10 12:18:34.000000000 -0400
@@ -120,6 +120,14 @@
'dbtableprefix' => '',
/**
+ * Additional driver options for the database connection, eg. to enable SSL
+ * encryption in MySQL.
+ */
+'dbdriveroptions' => array(
+ PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+),
+
+/**
* Indicates whether the ownCloud instance was installed successfully; ``true``
* indicates a successful installation, and ``false`` indicates an unsuccessful
* installation.
@@ -343,9 +351,10 @@
'overwritecondaddr' => '',
/**
- * Use this configuration parameter to specify the base url for any urls which are
- * generated within ownCloud using any kind of command line tools (cron or occ).
- * The value should contain the full base URL: ``https://www.example.com/owncloud``
+ * Use this configuration parameter to specify the base url for any urls which
+ * are generated within ownCloud using any kind of command line tools (cron or
+ * occ). The value should contain the full base URL:
+ * ``https://www.example.com/owncloud``
*/
'overwrite.cli.url' => '',
@@ -368,8 +377,8 @@
*/
/**
- * When the trash bin app is enabled (default), this is the number of days a file
- * will be kept in the trash bin. Default is 30 days.
+ * When the trash bin app is enabled (default), this is the number of days a
+ * file will be kept in the trash bin. Default is 30 days.
*/
'trashbin_retention_obligation' => 30,
@@ -797,6 +806,24 @@
),
/**
+ * Database types that are supported for installation.
+ *
+ * Available:
+ * - sqlite (SQLite3)
+ * - mysql (MySQL)
+ * - pgsql (PostgreSQL)
+ * - oci (Oracle)
+ * - mssql (Microsoft SQL Server)
+ */
+'supportedDatabases' => array(
+ 'sqlite',
+ 'mysql',
+ 'pgsql',
+ 'oci',
+ 'mssql'
+),
+
+/**
* Custom CSP policy, changing this will overwrite the standard policy
*/
'custom_csp_policy' =>
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/avatar/controller.php owncloud-7.0.3+dfsg/core/avatar/controller.php
--- owncloud-7.0.3~rc2~20141023+dfsg/core/avatar/controller.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/core/avatar/controller.php 2014-11-10 12:17:24.000000000 -0400
@@ -12,6 +12,7 @@
public static function getAvatar($args) {
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
+ \OC::$server->getSession()->close();
$user = stripslashes($args['user']);
$size = (int)$args['size'];
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/configuration/auth_ldap.html owncloud-7.0.3+dfsg/core/doc/admin/configuration/auth_ldap.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/configuration/background_jobs.html owncloud-7.0.3+dfsg/core/doc/admin/configuration/background_jobs.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/configuration/configuration_config_sample_php.html owncloud-7.0.3+dfsg/core/doc/admin/configuration/configuration_config_sample_php.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/contents.html owncloud-7.0.3+dfsg/core/doc/admin/contents.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/installation/installation_source.html owncloud-7.0.3+dfsg/core/doc/admin/installation/installation_source.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/_sources/configuration/auth_ldap.txt owncloud-7.0.3+dfsg/core/doc/admin/_sources/configuration/auth_ldap.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/_sources/configuration/background_jobs.txt owncloud-7.0.3+dfsg/core/doc/admin/_sources/configuration/background_jobs.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/_sources/configuration/configuration_config_sample_php.txt owncloud-7.0.3+dfsg/core/doc/admin/_sources/configuration/configuration_config_sample_php.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/admin/_sources/installation/installation_source.txt owncloud-7.0.3+dfsg/core/doc/admin/_sources/installation/installation_source.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/bookmarks.html owncloud-7.0.3+dfsg/core/doc/user/bookmarks.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/contents.html owncloud-7.0.3+dfsg/core/doc/user/contents.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/documents.html owncloud-7.0.3+dfsg/core/doc/user/documents.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/external_storage/google_drive.html owncloud-7.0.3+dfsg/core/doc/user/external_storage/google_drive.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/configuring_big_file_upload.html owncloud-7.0.3+dfsg/core/doc/user/files/configuring_big_file_upload.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/deletedfiles.html owncloud-7.0.3+dfsg/core/doc/user/files/deletedfiles.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/encryption.html owncloud-7.0.3+dfsg/core/doc/user/files/encryption.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/files.html owncloud-7.0.3+dfsg/core/doc/user/files/files.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/filesweb.html owncloud-7.0.3+dfsg/core/doc/user/files/filesweb.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/index.html owncloud-7.0.3+dfsg/core/doc/user/files/index.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/quota.html owncloud-7.0.3+dfsg/core/doc/user/files/quota.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/server_to_server_using.html owncloud-7.0.3+dfsg/core/doc/user/files/server_to_server_using.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/sync.html owncloud-7.0.3+dfsg/core/doc/user/files/sync.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/files/versioncontrol.html owncloud-7.0.3+dfsg/core/doc/user/files/versioncontrol.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/genindex.html owncloud-7.0.3+dfsg/core/doc/user/genindex.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/index.html owncloud-7.0.3+dfsg/core/doc/user/index.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/installing_apps.html owncloud-7.0.3+dfsg/core/doc/user/installing_apps.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/migration.html owncloud-7.0.3+dfsg/core/doc/user/migration.html
Les fichiers binaires /tmp/dRpEhcSxSJ/owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/objects.inv et /tmp/wtTnU1lVNc/owncloud-7.0.3+dfsg/core/doc/user/objects.inv sont différents
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/calendar.html owncloud-7.0.3+dfsg/core/doc/user/pim/calendar.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/contacts.html owncloud-7.0.3+dfsg/core/doc/user/pim/contacts.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/index.html owncloud-7.0.3+dfsg/core/doc/user/pim/index.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/sync_ios.html owncloud-7.0.3+dfsg/core/doc/user/pim/sync_ios.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/sync_kde.html owncloud-7.0.3+dfsg/core/doc/user/pim/sync_kde.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/sync_osx.html owncloud-7.0.3+dfsg/core/doc/user/pim/sync_osx.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/sync_thunderbird.html owncloud-7.0.3+dfsg/core/doc/user/pim/sync_thunderbird.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/pim/troubleshooting.html owncloud-7.0.3+dfsg/core/doc/user/pim/troubleshooting.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/search.html owncloud-7.0.3+dfsg/core/doc/user/search.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/_sources/contents.txt owncloud-7.0.3+dfsg/core/doc/user/_sources/contents.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/_sources/files/quota.txt owncloud-7.0.3+dfsg/core/doc/user/_sources/files/quota.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/_sources/index.txt owncloud-7.0.3+dfsg/core/doc/user/_sources/index.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/_sources/installing_apps.txt owncloud-7.0.3+dfsg/core/doc/user/_sources/installing_apps.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/_sources/migration.txt owncloud-7.0.3+dfsg/core/doc/user/_sources/migration.txt
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/userpreferences.html owncloud-7.0.3+dfsg/core/doc/user/userpreferences.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/webinterface.html owncloud-7.0.3+dfsg/core/doc/user/webinterface.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/doc/user/whats_new.html owncloud-7.0.3+dfsg/core/doc/user/whats_new.html
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/bg_BG.php owncloud-7.0.3+dfsg/core/l10n/bg_BG.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/cs_CZ.php owncloud-7.0.3+dfsg/core/l10n/cs_CZ.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/da.php owncloud-7.0.3+dfsg/core/l10n/da.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/de_DE.php owncloud-7.0.3+dfsg/core/l10n/de_DE.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/de.php owncloud-7.0.3+dfsg/core/l10n/de.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/es.php owncloud-7.0.3+dfsg/core/l10n/es.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/fi_FI.php owncloud-7.0.3+dfsg/core/l10n/fi_FI.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/it.php owncloud-7.0.3+dfsg/core/l10n/it.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/nl.php owncloud-7.0.3+dfsg/core/l10n/nl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/pt_BR.php owncloud-7.0.3+dfsg/core/l10n/pt_BR.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/sl.php owncloud-7.0.3+dfsg/core/l10n/sl.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/l10n/tr.php owncloud-7.0.3+dfsg/core/l10n/tr.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/setup/controller.php owncloud-7.0.3+dfsg/core/setup/controller.php
--- owncloud-7.0.3~rc2~20141023+dfsg/core/setup/controller.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/core/setup/controller.php 2014-11-10 12:18:34.000000000 -0400
@@ -1,6 +1,7 @@
<?php
/**
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
@@ -8,7 +9,19 @@
namespace OC\Core\Setup;
+use OCP\IConfig;
+
class Controller {
+ /** @var \OCP\IConfig */
+ protected $config;
+
+ /**
+ * @param IConfig $config
+ */
+ function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
public function run($post) {
// Check for autosetup:
$post = $this->loadAutoConfig($post);
@@ -87,28 +100,10 @@
* in case of errors/warnings
*/
public function getSystemInfo() {
- $hasSQLite = class_exists('SQLite3');
- $hasMySQL = is_callable('mysql_connect');
- $hasPostgreSQL = is_callable('pg_connect');
- $hasOracle = is_callable('oci_connect');
- $hasMSSQL = is_callable('sqlsrv_connect');
- $databases = array();
- if ($hasSQLite) {
- $databases['sqlite'] = 'SQLite';
- }
- if ($hasMySQL) {
- $databases['mysql'] = 'MySQL/MariaDB';
- }
- if ($hasPostgreSQL) {
- $databases['pgsql'] = 'PostgreSQL';
- }
- if ($hasOracle) {
- $databases['oci'] = 'Oracle';
- }
- if ($hasMSSQL) {
- $databases['mssql'] = 'MS SQL';
- }
- $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
+ $setup = new \OC_Setup($this->config);
+ $databases = $setup->getSupportedDatabases();
+
+ $datadir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
$vulnerableToNullByte = false;
if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
$vulnerableToNullByte = true;
@@ -150,11 +145,11 @@
}
return array(
- 'hasSQLite' => $hasSQLite,
- 'hasMySQL' => $hasMySQL,
- 'hasPostgreSQL' => $hasPostgreSQL,
- 'hasOracle' => $hasOracle,
- 'hasMSSQL' => $hasMSSQL,
+ 'hasSQLite' => isset($databases['sqlite']),
+ 'hasMySQL' => isset($databases['mysql']),
+ 'hasPostgreSQL' => isset($databases['pgsql']),
+ 'hasOracle' => isset($databases['oci']),
+ 'hasMSSQL' => isset($databases['mssql']),
'databases' => $databases,
'directory' => $datadir,
'secureRNG' => \OC_Util::secureRNGAvailable(),
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/core/templates/layout.user.php owncloud-7.0.3+dfsg/core/templates/layout.user.php
--- owncloud-7.0.3~rc2~20141023+dfsg/core/templates/layout.user.php 2014-10-23 23:16:47.000000000 -0400
+++ owncloud-7.0.3+dfsg/core/templates/layout.user.php 2014-11-10 12:18:34.000000000 -0400
@@ -53,7 +53,7 @@
if(OC_Util::getEditionString() === '') {
p(!empty($_['application'])?$_['application']: $l->t('Apps'));
} else {
- p($theme->getName());
+ print_unescaped($theme->getHTMLName());
}
?>
</div>
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/changelog owncloud-7.0.3+dfsg/debian/changelog
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/changelog 2014-10-24 10:03:56.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/changelog 2014-11-13 13:50:08.000000000 -0400
@@ -1,3 +1,61 @@
+owncloud (7.0.3+dfsg-1) unstable; urgency=medium
+
+ [ David Prévot ]
+ * Restrict php-aws-sdk version
+ * Update documentation from Jessie+1 to Stretch
+ * Update upstream changelog
+
+ [ Frank Karlitschek ]
+ * 7.0.3
+
+ [ Vincent Petry ]
+ * Convert StorageNotAvailableException to SabreDAV exception
+
+ [ Lukas Reschke ]
+ * Use proper array key
+
+ [ Thomas Müller ]
+ * Ensure there is a connection object within \OC_DB::enableCaching()
+
+ -- David Prévot <taffit@debian.org> Thu, 13 Nov 2014 13:49:51 -0400
+
+owncloud (7.0.3~rc3+dfsg-1) unstable; urgency=medium
+
+ * Upload to unstable in order to gather as much testing as possible before
+ proposing the final version (to the release team) for Jessie
+
+ [ Jörn Friedrich Dreyer ]
+ * fix files_external storage id migration
+ * allow passing driver options, fixes #11718
+ * add driver options to config samples
+
+ [ Vincent Petry ]
+ * Properly register sharing hooks and proxies
+ * Check for cert bundle existence before using it
+ * Store curl error message directly
+
+ [ Frank Karlitschek ]
+ * 7.0.3 RC3
+
+ [ David Prévot ]
+ * Refresh patches
+ * Drop new JSON and JavaScript translation sources
+
+ -- David Prévot <taffit@debian.org> Fri, 07 Nov 2014 06:49:19 -0400
+
+owncloud (7.0.3~rc2+dfsg-1) experimental; urgency=medium
+
+ * Upload to experimental not to prevent the migration of the previous
+ version into testing
+
+ [ Frank Karlitschek ]
+ * 7.0.3RC1
+
+ [ David Prévot ]
+ * Refresh patches
+
+ -- David Prévot <taffit@debian.org> Thu, 30 Oct 2014 15:36:06 -0400
+
owncloud (7.0.3~rc2~20141023+dfsg-1) unstable; urgency=medium
[ Vincent Petry ]
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/control owncloud-7.0.3+dfsg/debian/control
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/control 2014-10-24 09:55:35.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/control 2014-11-11 10:17:33.000000000 -0400
@@ -50,7 +50,7 @@
zendframework,
${misc:Depends}
Recommends: exim4 | mail-transport-agent,
- php-aws-sdk,
+ php-aws-sdk (<< 3),
php-crypt-blowfish (>= 1.1.0~RC2-2~),
php-dropbox,
php-google-api-php-client (<< 1),
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0001-Disable-the-appstore.patch owncloud-7.0.3+dfsg/debian/patches/0001-Disable-the-appstore.patch
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0001-Disable-the-appstore.patch 2014-10-24 10:01:26.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/patches/0001-Disable-the-appstore.patch 2014-11-11 10:17:42.000000000 -0400
@@ -23,10 +23,10 @@
8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 9b70ede..66c7a02 100644
+index a7f92d9..fb48959 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -512,8 +512,9 @@ $CONFIG = array(
+@@ -521,8 +521,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
@@ -37,7 +37,7 @@
/**
* The URL of the appstore to use.
-@@ -527,12 +528,13 @@ $CONFIG = array(
+@@ -536,12 +537,13 @@ $CONFIG = array(
* file system path to the app folder. The key ``url`` defines the HTTP web path
* to that folder, starting from the ownCloud web root. The key ``writable``
* indicates if a web server can write files to that folder.
@@ -54,7 +54,7 @@
),
diff --git a/lib/base.php b/lib/base.php
-index 7335be0..4bace86 100644
+index 4cd9203..d39432a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -93,10 +93,10 @@
}
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 2ad569c..5d27e371 100644
+index 2d6cede..b4b9f0d 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
-@@ -85,6 +85,8 @@ class OC_Setup {
+@@ -186,6 +186,8 @@ class OC_Setup {
OC_Config::setValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
@@ -106,10 +106,10 @@
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 502cf8b..3324fa4 100644
+index 08de46b..484b84c 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -444,7 +444,7 @@ class OC_Util {
+@@ -442,7 +442,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0002-Fix-displayed-version.patch owncloud-7.0.3+dfsg/debian/patches/0002-Fix-displayed-version.patch
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0002-Fix-displayed-version.patch 2014-10-24 10:01:26.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/patches/0002-Fix-displayed-version.patch 2014-11-11 10:17:42.000000000 -0400
@@ -18,10 +18,10 @@
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 66c7a02..362c790 100644
+index fb48959..df81faa 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -397,7 +397,7 @@ $CONFIG = array(
+@@ -406,7 +406,7 @@ $CONFIG = array(
* Check if ownCloud is up-to-date and shows a notification if a new version is
* available.
*/
@@ -44,10 +44,10 @@
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
$this->assign('updateAvailable', true);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 3324fa4..9a22244 100644
+index 484b84c..360b170 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1311,7 +1311,7 @@ class OC_Util {
+@@ -1309,7 +1309,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0003-Improve-logfile-handling.patch owncloud-7.0.3+dfsg/debian/patches/0003-Improve-logfile-handling.patch
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/0003-Improve-logfile-handling.patch 2014-10-24 10:01:27.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/patches/0003-Improve-logfile-handling.patch 2014-11-11 10:17:42.000000000 -0400
@@ -14,10 +14,10 @@
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 362c790..cd5ab36 100644
+index df81faa..dfb774a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -433,8 +433,9 @@ $CONFIG = array(
+@@ -442,8 +442,9 @@ $CONFIG = array(
/**
* Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,7 +29,7 @@
/**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
diff --git a/lib/base.php b/lib/base.php
-index 4bace86..32224f9 100644
+index d39432a..25992b2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -615,7 +615,7 @@ class OC {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch owncloud-7.0.3+dfsg/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch 2014-10-24 10:01:27.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch 2014-11-11 10:17:43.000000000 -0400
@@ -14,7 +14,7 @@
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 32224f9..1e77f4d8 100644
+index 25992b2..93eb6a6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -431,12 +431,12 @@ class OC {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/path/0007-Adapt-aws-sdk-path.patch owncloud-7.0.3+dfsg/debian/patches/path/0007-Adapt-aws-sdk-path.patch
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/patches/path/0007-Adapt-aws-sdk-path.patch 2014-10-24 10:01:27.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/patches/path/0007-Adapt-aws-sdk-path.patch 2014-11-11 10:17:43.000000000 -0400
@@ -12,7 +12,7 @@
1 file changed, 4 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 77c5f82..cd2bab5 100644
+index a3fe183..7f88c4a 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -24,10 +24,6 @@
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/README.Debian owncloud-7.0.3+dfsg/debian/README.Debian
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/README.Debian 2014-10-24 09:55:35.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/README.Debian 2014-11-11 10:17:33.000000000 -0400
@@ -6,9 +6,9 @@
Since upstream support of ownCloud 7 will end during Jessie’s lifetime,
security support will be provided on a best effort basis with upstream help.
-Eventually, this package may be removed from once Jessie+1 is released if the
-security support becomes too complicated or time-consuming, so ownCloud users
-will be advised to upgrade their servers to the new stable release.
+Eventually, this package may be removed from Jessie once Stretch is released
+if the security support becomes too complicated or time-consuming, so ownCloud
+users will be advised to upgrade their servers to the new stable release.
Database
--------
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/rules owncloud-7.0.3+dfsg/debian/rules
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/rules 2014-10-24 09:55:35.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/rules 2014-11-11 10:17:33.000000000 -0400
@@ -25,6 +25,7 @@
# Remove other unused sources
find debian/owncloud/usr/share/owncloud/apps/*/l10n \
-mindepth 1 -type d | xargs rm -r
+ rm debian/owncloud/usr/share/owncloud/apps/*/l10n/*.js*
# Minify JavaScript files.
rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/debian/upstream/changelog owncloud-7.0.3+dfsg/debian/upstream/changelog
--- owncloud-7.0.3~rc2~20141023+dfsg/debian/upstream/changelog 2014-10-24 09:55:35.000000000 -0400
+++ owncloud-7.0.3+dfsg/debian/upstream/changelog 2014-11-13 13:49:45.000000000 -0400
@@ -1,4 +1,4 @@
-Version 7.0.3 October 22nd 2014
+Version 7.0.3 November 13th 2014
Some OS X server fixes
Several external storage fixes and improvements
@@ -22,6 +22,7 @@
Do only follow http and https redirects
Properly delete old previews
Prevent upgrades between more than one major versions
+ Several security fixes
Lots of smaller improvements
Version 7.0.2 August 28th 2014
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/base.php owncloud-7.0.3+dfsg/lib/base.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/base.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/base.php 2014-11-10 12:18:34.000000000 -0400
@@ -681,7 +681,7 @@
// Check if ownCloud is installed or in maintenance (update) mode
if (!OC_Config::getValue('installed', false)) {
- $controller = new OC\Core\Setup\Controller();
+ $controller = new OC\Core\Setup\Controller(\OC::$server->getConfig());
$controller->run($_POST);
exit();
}
@@ -921,7 +921,9 @@
return false;
}
- OC_JSON::callCheck();
+ if(!OC_Util::isCallRegistered()) {
+ return false;
+ }
OC_App::loadApps();
//setup extra user backends
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/directory.php owncloud-7.0.3+dfsg/lib/private/connector/sabre/directory.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/directory.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/connector/sabre/directory.php 2014-11-10 12:18:34.000000000 -0400
@@ -51,6 +51,7 @@
*/
public function createFile($name, $data = null) {
+ try {
// for chunked upload also updating a existing file is a "createFile"
// because we create all the chunks before re-assemble them to the existing file.
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
@@ -74,6 +75,9 @@
$info = new \OC\Files\FileInfo($path, null, null, array());
$node = new OC_Connector_Sabre_File($this->fileView, $info);
return $node->put($data);
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
/**
@@ -84,6 +88,7 @@
* @return void
*/
public function createDirectory($name) {
+ try {
if (!$this->fileView->isCreatable($this->path)) {
throw new \Sabre\DAV\Exception\Forbidden();
}
@@ -92,7 +97,9 @@
if(!$this->fileView->mkdir($newPath)) {
throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
}
-
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
/**
@@ -104,10 +111,13 @@
* @return \Sabre\DAV\INode
*/
public function getChild($name, $info = null) {
-
$path = $this->path . '/' . $name;
if (is_null($info)) {
+ try {
$info = $this->fileView->getFileInfo($path);
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
if (!$info) {
@@ -205,13 +215,17 @@
* @return array
*/
public function getQuotaInfo() {
+ try {
$path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath());
$storageInfo = OC_Helper::getStorageInfo($path);
return array(
$storageInfo['used'],
$storageInfo['free']
);
-
+ }
+ catch (\OCP\Files\StorageNotAvailableException $e) {
+ return array(0, 0);
+ }
}
/**
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/file.php owncloud-7.0.3+dfsg/lib/private/connector/sabre/file.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/file.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/connector/sabre/file.php 2014-11-10 12:18:34.000000000 -0400
@@ -50,10 +50,14 @@
* @return string|null
*/
public function put($data) {
+ try {
if ($this->info && $this->fileView->file_exists($this->path) &&
!$this->info->isUpdateable()) {
throw new \Sabre\DAV\Exception\Forbidden();
}
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
// throw an exception if encryption was disabled but the files are still encrypted
if (\OC_Util::encryptedFiles()) {
@@ -100,8 +104,11 @@
} catch (\OCP\Files\LockNotAcquiredException $e) {
// the file is currently being written to by another process
throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
}
+ try {
// double check if the file was fully received
// compare expected and actual size
if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] !== 'LOCK') {
@@ -136,6 +143,9 @@
}
}
$this->refreshInfo();
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
return '"' . $this->info->getEtag() . '"';
}
@@ -151,7 +161,11 @@
if (\OC_Util::encryptedFiles()) {
throw new \Sabre\DAV\Exception\ServiceUnavailable();
} else {
+ try {
return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
}
@@ -167,10 +181,14 @@
throw new \Sabre\DAV\Exception\Forbidden();
}
+ try {
if (!$this->fileView->unlink($this->path)) {
// assume it wasn't possible to delete due to permissions
throw new \Sabre\DAV\Exception\Forbidden();
}
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
// remove properties
$this->removeProperties();
@@ -243,6 +261,7 @@
if ($chunk_handler->isComplete()) {
+ try {
// we first assembly the target file as a part file
$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
$chunk_handler->file_assemble($partFile);
@@ -270,6 +289,9 @@
$info = $this->fileView->getFileInfo($targetPath);
return $info->getEtag();
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
return null;
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/objecttree.php owncloud-7.0.3+dfsg/lib/private/connector/sabre/objecttree.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/objecttree.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/connector/sabre/objecttree.php 2014-11-10 12:17:24.000000000 -0400
@@ -138,6 +138,7 @@
$isMovableMount = true;
}
+ try {
// check update privileges
if (!$this->fileView->isUpdatable($sourcePath) && !$isMovableMount) {
throw new \Sabre\DAV\Exception\Forbidden();
@@ -160,6 +161,9 @@
if (!$renameOkay) {
throw new \Sabre\DAV\Exception\Forbidden('');
}
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
// update properties
$query = \OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertypath` = ?'
@@ -188,6 +192,7 @@
throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
}
+ try {
if ($this->fileView->is_file($source)) {
$this->fileView->copy($source, $destination);
} else {
@@ -202,6 +207,9 @@
}
}
}
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
list($destinationDir,) = \Sabre\DAV\URLUtil::splitPath($destination);
$this->markDirty($destinationDir);
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/quotaplugin.php owncloud-7.0.3+dfsg/lib/private/connector/sabre/quotaplugin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/connector/sabre/quotaplugin.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/connector/sabre/quotaplugin.php 2014-11-10 12:18:34.000000000 -0400
@@ -102,7 +102,11 @@
* @return mixed
*/
public function getFreeSpace($parentUri) {
+ try {
$freeSpace = $this->view->free_space($parentUri);
return $freeSpace;
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+ }
}
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptermysql.php owncloud-7.0.3+dfsg/lib/private/db/adaptermysql.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptermysql.php 1969-12-31 20:00:00.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/adaptermysql.php 2014-11-10 12:17:24.000000000 -0400
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterMySQL extends Adapter {
+ public function fixupStatement($statement) {
+ $statement = str_replace(' ILIKE ', ' COLLATE utf8_general_ci LIKE ', $statement);
+ return $statement;
+ }
+}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adapteroci8.php owncloud-7.0.3+dfsg/lib/private/db/adapteroci8.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adapteroci8.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/adapteroci8.php 2014-11-10 12:17:24.000000000 -0400
@@ -19,7 +19,9 @@
}
const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+
public function fixupStatement($statement) {
+ $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
$statement = str_replace( '`', '"', $statement );
$statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptersqlite.php owncloud-7.0.3+dfsg/lib/private/db/adaptersqlite.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptersqlite.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/adaptersqlite.php 2014-11-10 12:18:34.000000000 -0400
@@ -11,6 +11,7 @@
class AdapterSqlite extends Adapter {
public function fixupStatement($statement) {
+ $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
$statement = str_replace( '`', '"', $statement );
$statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement );
$statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement );
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptersqlsrv.php owncloud-7.0.3+dfsg/lib/private/db/adaptersqlsrv.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/adaptersqlsrv.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/adaptersqlsrv.php 2014-11-10 12:17:24.000000000 -0400
@@ -11,6 +11,7 @@
class AdapterSQLSrv extends Adapter {
public function fixupStatement($statement) {
+ $statement = str_replace(' ILIKE ', ' COLLATE Latin1_General_CI_AS LIKE ', $statement);
$statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement );
$statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
$statement = str_replace( 'LENGTH(', 'LEN(', $statement );
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/connectionfactory.php owncloud-7.0.3+dfsg/lib/private/db/connectionfactory.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/connectionfactory.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/connectionfactory.php 2014-11-10 12:18:34.000000000 -0400
@@ -26,7 +26,7 @@
'wrapperClass' => 'OC\DB\Connection',
),
'mysql' => array(
- 'adapter' => '\OC\DB\Adapter',
+ 'adapter' => '\OC\DB\AdapterMySQL',
'charset' => 'UTF8',
'driver' => 'pdo_mysql',
'wrapperClass' => 'OC\DB\Connection',
@@ -89,6 +89,9 @@
case 'oci':
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
break;
+ case 'sqlite3':
+ $eventManager->addEventSubscriber(new SQLiteSessionInit);
+ break;
}
$connection = \Doctrine\DBAL\DriverManager::getConnection(
array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/sqlitesessioninit.php owncloud-7.0.3+dfsg/lib/private/db/sqlitesessioninit.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db/sqlitesessioninit.php 1969-12-31 20:00:00.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db/sqlitesessioninit.php 2014-11-10 12:17:24.000000000 -0400
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+use Doctrine\DBAL\Event\ConnectionEventArgs;
+use Doctrine\DBAL\Events;
+use Doctrine\Common\EventSubscriber;
+
+class SQLiteSessionInit implements EventSubscriber {
+ /**
+ * @var bool
+ */
+ private $caseSensitiveLike;
+
+ /**
+ * Configure case sensitive like for each connection
+ *
+ * @param bool $caseSensitiveLike
+ */
+ public function __construct($caseSensitiveLike = true) {
+ $this->caseSensitiveLike = $caseSensitiveLike;
+ }
+
+ /**
+ * @param ConnectionEventArgs $args
+ * @return void
+ */
+ public function postConnect(ConnectionEventArgs $args) {
+ $sensitive = ($this->caseSensitiveLike) ? 'true' : 'false';
+ $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+ }
+
+ public function getSubscribedEvents() {
+ return array(Events::postConnect);
+ }
+}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db.php owncloud-7.0.3+dfsg/lib/private/db.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/db.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/db.php 2014-11-10 12:18:34.000000000 -0400
@@ -89,6 +89,12 @@
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_');
+ //additional driver options, eg. for mysql ssl
+ $driverOptions = OC_Config::getValue('dbdriveroptions', null);
+ if ($driverOptions) {
+ $connectionParams['driverOptions'] = $driverOptions;
+ }
+
try {
self::$connection = $factory->getConnection($type, $connectionParams);
} catch(\Doctrine\DBAL\DBALException $e) {
@@ -417,10 +423,11 @@
* @param bool $enabled
*/
static public function enableCaching($enabled) {
+ $connection = self::getConnection();
if ($enabled) {
- self::$connection->enableQueryStatementCaching();
+ $connection->enableQueryStatementCaching();
} else {
- self::$connection->disableQueryStatementCaching();
+ $connection->disableQueryStatementCaching();
}
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/defaults.php owncloud-7.0.3+dfsg/lib/private/defaults.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/defaults.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/defaults.php 2014-11-10 12:18:34.000000000 -0400
@@ -143,6 +143,18 @@
}
/**
+ * Returns the short name of the software containing HTML strings
+ * @return string title
+ */
+ public function getHTMLName() {
+ if ($this->themeExist('getHTMLName')) {
+ return $this->theme->getHTMLName();
+ } else {
+ return $this->defaultName;
+ }
+ }
+
+ /**
* Returns entity (e.g. company name) - used for footer, copyright
* @return string entity name
*/
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/files/cache/cache.php owncloud-7.0.3+dfsg/lib/private/files/cache/cache.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/files/cache/cache.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/files/cache/cache.php 2014-11-10 12:18:34.000000000 -0400
@@ -464,19 +464,7 @@
`mimetype`, `mimepart`, `size`, `mtime`, `encrypted`,
`unencrypted_size`, `etag`, `permissions`
FROM `*PREFIX*filecache`
- WHERE `storage` = ? AND ';
- $dbtype = \OC_Config::getValue( 'dbtype', 'sqlite' );
- if($dbtype === 'oci') {
- //remove starting and ending % from the pattern
- $pattern = '^'.str_replace('%', '.*', $pattern).'$';
- $sql .= 'REGEXP_LIKE(`name`, ?, \'i\')';
- } else if($dbtype === 'pgsql') {
- $sql .= '`name` ILIKE ?';
- } else if ($dbtype === 'mysql') {
- $sql .= '`name` COLLATE utf8_general_ci LIKE ?';
- } else {
- $sql .= '`name` LIKE ?';
- }
+ WHERE `storage` = ? AND `name` ILIKE ?';
$result = \OC_DB::executeAudited($sql,
array($this->getNumericStorageId(), $pattern)
);
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/setup.php owncloud-7.0.3+dfsg/lib/private/setup.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/setup.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/setup.php 2014-11-10 12:18:34.000000000 -0400
@@ -1,9 +1,27 @@
<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+use OCP\IConfig;
class DatabaseSetupException extends \OC\HintException {
}
class OC_Setup {
+ /** @var IConfig */
+ protected $config;
+
+ /**
+ * @param IConfig $config
+ */
+ function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
static $dbSetupClasses = array(
'mysql' => '\OC\Setup\MySQL',
'pgsql' => '\OC\Setup\PostgreSQL',
@@ -13,10 +31,93 @@
'sqlite3' => '\OC\Setup\Sqlite',
);
+ /**
+ * @return OC_L10N
+ */
public static function getTrans(){
return OC_L10N::get('lib');
}
+ /**
+ * Wrapper around the "class_exists" PHP function to be able to mock it
+ * @param string $name
+ * @return bool
+ */
+ public function class_exists($name) {
+ return class_exists($name);
+ }
+
+ /**
+ * Wrapper around the "is_callable" PHP function to be able to mock it
+ * @param string $name
+ * @return bool
+ */
+ public function is_callable($name) {
+ return is_callable($name);
+ }
+
+ /**
+ * Get the available and supported databases of this instance
+ *
+ * @throws Exception
+ * @return array
+ */
+ public function getSupportedDatabases() {
+ $availableDatabases = array(
+ 'sqlite' => array(
+ 'type' => 'class',
+ 'call' => 'SQLite3',
+ 'name' => 'SQLite'
+ ),
+ 'mysql' => array(
+ 'type' => 'function',
+ 'call' => 'mysql_connect',
+ 'name' => 'MySQL/MariaDB'
+ ),
+ 'pgsql' => array(
+ 'type' => 'function',
+ 'call' => 'pg_connect',
+ 'name' => 'PostgreSQL'
+ ),
+ 'oci' => array(
+ 'type' => 'function',
+ 'call' => 'oci_connect',
+ 'name' => 'Oracle'
+ ),
+ 'mssql' => array(
+ 'type' => 'function',
+ 'call' => 'sqlsrv_connect',
+ 'name' => 'MS SQL'
+ )
+ );
+ $configuredDatabases = $this->config->getSystemValue('supportedDatabases', array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
+ if(!is_array($configuredDatabases)) {
+ throw new Exception('Supported databases are not properly configured.');
+ }
+
+ $supportedDatabases = array();
+
+ foreach($configuredDatabases as $database) {
+ if(array_key_exists($database, $availableDatabases)) {
+ $working = false;
+ if($availableDatabases[$database]['type'] === 'class') {
+ $working = $this->class_exists($availableDatabases[$database]['call']);
+ } elseif ($availableDatabases[$database]['type'] === 'function') {
+ $working = $this->is_callable($availableDatabases[$database]['call']);
+ }
+ if($working) {
+ $supportedDatabases[$database] = $availableDatabases[$database]['name'];
+ }
+ }
+ }
+
+ return $supportedDatabases;
+ }
+
+ /**
+ * @param $options
+ * @return array
+ */
public static function install($options) {
$l = self::getTrans();
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/user.php owncloud-7.0.3+dfsg/lib/private/user.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/user.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/user.php 2014-11-10 12:18:34.000000000 -0400
@@ -231,6 +231,9 @@
* Log in a user and regenerate a new session - if the password is ok
*/
public static function login($loginname, $password) {
+ $loginname = str_replace("\0", '', $loginname);
+ $password = str_replace("\0", '', $password);
+
session_regenerate_id(true);
$result = self::getUserSession()->login($loginname, $password);
if ($result) {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/private/util.php owncloud-7.0.3+dfsg/lib/private/util.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/private/util.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/private/util.php 2014-11-10 12:18:34.000000000 -0400
@@ -416,11 +416,9 @@
}
$webServerRestart = false;
- //check for database drivers
- if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
- and !is_callable('mysql_connect')
- and !is_callable('pg_connect')
- and !is_callable('oci_connect')) {
+ $setup = new OC_Setup($config);
+ $availableDatabases = $setup->getSupportedDatabases();
+ if (empty($availableDatabases)) {
$errors[] = array(
'error'=> $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
'hint'=>'' //TODO: sane hint
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/public/appframework/http/jsonresponse.php owncloud-7.0.3+dfsg/lib/public/appframework/http/jsonresponse.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/public/appframework/http/jsonresponse.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/public/appframework/http/jsonresponse.php 2014-11-10 12:17:24.000000000 -0400
@@ -49,7 +49,7 @@
public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
$this->data = $data;
$this->setStatus($statusCode);
- $this->addHeader('Content-type', 'application/json; charset=utf-8');
+ $this->addHeader('Content-Type', 'application/json; charset=utf-8');
}
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/lib/public/defaults.php owncloud-7.0.3+dfsg/lib/public/defaults.php
--- owncloud-7.0.3~rc2~20141023+dfsg/lib/public/defaults.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/lib/public/defaults.php 2014-11-10 12:17:24.000000000 -0400
@@ -98,6 +98,14 @@
}
/**
+ * name of your ownCloud instance containing HTML styles
+ * @return string
+ */
+ public function getHTMLName() {
+ return $this->defaults->getHTMLName();
+ }
+
+ /**
* Entity behind your onwCloud instance
* @return string
*/
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/search/ajax/search.php owncloud-7.0.3+dfsg/search/ajax/search.php
--- owncloud-7.0.3~rc2~20141023+dfsg/search/ajax/search.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/search/ajax/search.php 2014-11-10 12:17:24.000000000 -0400
@@ -23,6 +23,7 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
+\OC::$server->getSession()->close();
$query=(isset($_GET['query']))?$_GET['query']:'';
if($query) {
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/settings/l10n/it.php owncloud-7.0.3+dfsg/settings/l10n/it.php
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/settings/templates/admin.php owncloud-7.0.3+dfsg/settings/templates/admin.php
--- owncloud-7.0.3~rc2~20141023+dfsg/settings/templates/admin.php 2014-10-23 23:16:48.000000000 -0400
+++ owncloud-7.0.3+dfsg/settings/templates/admin.php 2014-11-10 12:18:34.000000000 -0400
@@ -169,7 +169,7 @@
}
?>
<div id="postsetupchecks" class="section">
- <h2><?php p($l->t('Connectivity checks'));?></h2>
+ <h2><?php p($l->t('Connectivity Checks'));?></h2>
<div class="loading"></div>
<div class="success hidden"><?php p($l->t('No problems found'));?></div>
<div class="errors hidden"></div>
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/settings/templates/users/part.createuser.php owncloud-7.0.3+dfsg/settings/templates/users/part.createuser.php
--- owncloud-7.0.3~rc2~20141023+dfsg/settings/templates/users/part.createuser.php 2014-10-23 23:15:40.000000000 -0400
+++ owncloud-7.0.3+dfsg/settings/templates/users/part.createuser.php 2014-11-10 12:17:25.000000000 -0400
@@ -1,7 +1,7 @@
<div id="controls">
<form id="newuser" autocomplete="off">
<input id="newusername" type="text"
- placeholder="<?php p($l->t('Login Name'))?>"
+ placeholder="<?php p($l->t('Username'))?>"
autocomplete="off" autocapitalize="off" autocorrect="off" />
<input
type="password" id="newuserpassword"
diff -Nru -w owncloud-7.0.3~rc2~20141023+dfsg/version.php owncloud-7.0.3+dfsg/version.php
--- owncloud-7.0.3~rc2~20141023+dfsg/version.php 2014-10-23 23:17:43.000000000 -0400
+++ owncloud-7.0.3+dfsg/version.php 2014-11-10 12:19:38.000000000 -0400
@@ -1,6 +1,6 @@
<?php
-$OC_Version = array(7,0,3,0);
-$OC_VersionString = '7.0.3 RC1';
+$OC_Version = array(7,0,3,4);
+$OC_VersionString = '7.0.3';
$OC_Edition = '';
-$OC_Channel = 'daily';
-$OC_Build = '2014-10-24T03:17:43+00:00';
+$OC_Channel = 'stable';
+$OC_Build = '2014-11-10T16:19:38+00:00';
Attachment:
signature.asc
Description: Digital signature