aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-05-09 16:36:20 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-05-13 11:28:25 +0200
commitd56d03e230a20a621113a2b90064f331b3952f1b (patch)
treeafc4e1a6a5cf1ec77b96bef43a8181293102949f /core
parentec045b251c5e42ce3762f3aefc0936581fd21030 (diff)
downloadnextcloud-server-d56d03e230a20a621113a2b90064f331b3952f1b.tar.gz
nextcloud-server-d56d03e230a20a621113a2b90064f331b3952f1b.zip
add information about default expire date to the share dialog
Diffstat (limited to 'core')
-rw-r--r--core/css/share.css2
-rw-r--r--core/js/config.php15
-rw-r--r--core/js/share.js14
3 files changed, 29 insertions, 2 deletions
diff --git a/core/css/share.css b/core/css/share.css
index 4ae3b77757e..ccd1bd65c73 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -11,7 +11,7 @@
margin-right:112px;
position:absolute;
right:0;
- width:320px;
+ width:380px;
z-index:500;
padding:16px;
}
diff --git a/core/js/config.php b/core/js/config.php
index 7e23f3e2e41..9169cc14a7b 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -25,6 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) {
$apps_paths[$app] = OC_App::getAppWebPath($app);
}
+$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$defaultExpireDate = $enforceDefaultExpireDate = null;
+if ($defaultExpireDateEnabled === 'yes') {
+ $defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
+ $enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+}
+
$array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
@@ -67,6 +74,14 @@ $array = array(
'versionstring' => OC_Util::getVersionString(),
)
),
+ "oc_appconfig" => json_encode(
+ array("core" => array(
+ 'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+ 'defaultExpireDate' => $defaultExpireDate,
+ 'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+ )
+ )
+ ),
"oc_defaults" => json_encode(
array(
'entity' => $defaults->getEntity(),
diff --git a/core/js/share.js b/core/js/share.js
index 2813570f718..2d9de62694b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -219,7 +219,18 @@ OC.Share={
html += '<div id="link">';
html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
html += '<br />';
+
+ var defaultExpireMessage = '';
+ if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled === 'yes') {
+ if (oc_appconfig.core.defaultExpireDateEnforced === 'yes') {
+ defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+ } else {
+ defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+ }
+ }
+ html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>';
html += '<input id="linkText" type="text" readonly="readonly" />';
+
html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
html += '<div id="linkPass">';
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
@@ -490,19 +501,20 @@ OC.Share={
$('#linkPassText').attr('placeholder', '**********');
}
$('#expiration').show();
+ $('#defaultExpireMessage').show();
$('#emailPrivateLink #email').show();
$('#emailPrivateLink #emailButton').show();
$('#allowPublicUploadWrapper').show();
},
hideLink:function() {
$('#linkText').hide('blind');
+ $('#defaultExpireMessage').hide();
$('#showPassword').hide();
$('#showPassword+label').hide();
$('#linkPass').hide();
$('#emailPrivateLink #email').hide();
$('#emailPrivateLink #emailButton').hide();
$('#allowPublicUploadWrapper').hide();
- $('#expirationDate').hide();
},
dirname:function(path) {
return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');