diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 15:08:59 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 15:08:59 +0400 |
| commit | 14daec98be5220a2371e7eeca9a31c3d3115f64c (patch) | |
| tree | 476593a04707720cd89aa1b43d01734a3fd08182 /settings | |
| parent | 57d94580e911e31a92bdbbf1196873e5d19eb211 (diff) | |
Squashed commit of the following:
commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun Jul 14 21:58:08 2013 +0200
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 21:34:38 2013 +0200
change anonymous to public
commit c3bda8654d911383ae0acf9e41adda7117cb79f8
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:51:01 2013 +0200
fixing Undefined index: publicUploadEnabled
commit 98861afde443c12a2ef5290c83c63fd12b7b196d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:05:58 2013 +0200
in case the encryption app is enabled we cannot yet allow anonymous upload
commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 12 17:03:51 2013 +0200
new admin setting added which allows to turn off anonymous uploads
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 3 | ||||
| -rw-r--r-- | settings/templates/admin.php | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index c7848803095..06b6a3dd224 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -43,9 +43,10 @@ if (OC_Request::serverProtocol() == 'https') { $connectedHTTPS = false; } $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS); -$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); +$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); +$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); $tmpl->assign('forms', array()); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a44db6e6d8d..76d00283f5d 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -140,11 +140,21 @@ if (!$_['internetconnectionworking']) { <tr> <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> <input type="checkbox" name="shareapi_allow_links" id="allowLinks" - value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> /> + value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/> <em><?php p($l->t('Allow users to share items to the public with links')); ?></em> </td> </tr> + <?php if (!\OCP\App::isEnabled('files_encryption')) { ?> + <tr> + <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> + <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" + value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/> + <em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em> + </td> + </tr> + <?php } ?> <tr> <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" |