Fix share default expiration date calculation

Now using UTC dates with moment js to accurately add the number of days

1 files changed, 6 insertions, 7 deletions

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 64f18558267..5494feaf7fa 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -8,6 +8,8 @@
  *
  */
 
+/* global moment */
+
 (function() {
 	if (!OC.Share) {
 		OC.Share = {};
@@ -73,13 +75,10 @@
 		getDefaultExpirationDateString: function () {
 			var expireDateString = '';
 			if (this.get('isDefaultExpireDateEnabled')) {
-				var date = new Date().getTime();
-				var expireAfterMs = this.get('defaultExpireDate') * 24 * 60 * 60 * 1000;
-				var expireDate = new Date(date + expireAfterMs);
-				var month = expireDate.getMonth() + 1;
-				var year = expireDate.getFullYear();
-				var day = expireDate.getDate();
-				expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
+				var date = moment.utc();
+				var expireAfterDays = this.get('defaultExpireDate');
+				date.add(expireAfterDays, 'days');
+				expireDateString = date.format('YYYY-MM-DD 00:00:00');
 			}
 			return expireDateString;
 		}