diff options
| -rw-r--r-- | apps/files/css/files.css | 3 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 5 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 7 | ||||
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 2 | ||||
| -rw-r--r-- | core/templates/altmail.php | 3 | ||||
| -rw-r--r-- | core/templates/mail.php | 3 | ||||
| -rw-r--r-- | lib/private/files.php | 2 |
7 files changed, 19 insertions, 6 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 5ad9e389c0a..e96fa648157 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -65,6 +65,9 @@ top: 44px; width: 100%; } +#filestable, #controls { + min-width: 680px; +} #filestable tbody tr { background-color:#fff; height:2.5em; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 6dd28532ccb..4f8623573cb 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -25,7 +25,7 @@ data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" /> <a href="#" class="svg"></a> </div> - <?php if ($_['trash'] ): ?> + <?php if ($_['trash']): ?> <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input> <?php endif; ?> <div id="uploadprogresswrapper"> @@ -111,8 +111,9 @@ <input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" /> <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" /> <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" /> +<?php if (!$_['isPublic']) :?> <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" /> <input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" /> <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" /> <input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" /> - +<?php endif; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index d59f9b7401a..3c902ea9a3a 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -221,6 +221,8 @@ if (isset($path)) { $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path='); $maxUploadFilesize=OCP\Util::maxUploadFilesize($path); + $fileHeader = (!isset($files) or count($files) > 0); + $emptyContent = ($allowPublicUploadEnabled and !$fileHeader); $folder = new OCP\Template('files', 'index', ''); $folder->assign('fileList', $list->fetchPage()); $folder->assign('breadcrumb', $breadcrumbNav->fetchPage()); @@ -234,6 +236,11 @@ if (isset($path)) { $folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $folder->assign('usedSpacePercent', 0); + $folder->assign('fileHeader', $fileHeader); + $folder->assign('disableSharing', true); + $folder->assign('trash', false); + $folder->assign('emptyContent', $emptyContent); + $folder->assign('ajaxLoad', false); $tmpl->assign('folder', $folder->fetchPage()); $maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB')); $allowZip = OCP\Config::getSystemValue('allowZipDownload', true) diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index fb6aca9e961..9286af46bea 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -215,7 +215,7 @@ class Wizard extends LDAPUtility { throw new \Exception('Could not connect to LDAP'); } - $obclasses = array('posixGroup', 'group', '*'); + $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', '*'); $this->determineFeature($obclasses, 'cn', $dbkey, $confkey); if($testMemberOf) { diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 00b67bee456..7776919ea34 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,7 +1,8 @@ <?php print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.\n\n", array($_['expiration']))); + print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); + print_unescaped('\n\n'); } p($l->t("Cheers!")); ?> diff --git a/core/templates/mail.php b/core/templates/mail.php index 40092f5491f..4fa54aa5283 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -14,7 +14,8 @@ <?php print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.<br><br>", array($_['expiration']))); + p($l->t("The share will expire on %s.", array($_['expiration']))); + print_unescaped('<br><br>'); } p($l->t('Cheers!')); ?> diff --git a/lib/private/files.php b/lib/private/files.php index e76dd8644c1..8b8ff81ec5e 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -253,7 +253,7 @@ class OC_Files { header("HTTP/1.0 409 Conflict"); OC_Template::printErrorPage( $l->t('Selected files too large to generate zip file.'), - $l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.') + $l->t('Please download the files separately in smaller chunks or kindly ask your administrator.') .'<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>' ); |